brcm63xx: allow bcm963xx and livebox support at the same time

[openwrt.git] / target / linux / brcm63xx / patches-3.14 / 501-board-NB4.patch

diff --git a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
index 3a7fee1..ca32c79 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
@@ -1,9 +1,11 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -15,6 +15,10 @@
+@@ -12,6 +12,12 @@
+ #include <linux/string.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
- #include <linux/spi/spi.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
 +#include <linux/spi/spi_gpio.h>
 +#if 0 /* FIXME: 3.14 removed non-DT support */
 +#include <linux/spi/74x164.h>
@@ -11,7 +13,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -49,6 +53,12 @@
+@@ -343,6 +349,12 @@ static struct board_info __initdata boar
  #define CFE_OFFSET_64K                        0x10000
  #define CFE_OFFSET_128K                       0x20000
  
@@ -21,10 +23,10 @@
 +#define NB4_SPI_GPIO_CLK      6
 +#define NB4_74HC64_GPIO(X)    (NB4_74X164_GPIO_BASE + (X))
 +
- static struct board_info board;
  
- /*
-@@ -755,6 +765,605 @@ static struct board_info __initdata boar
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+@@ -739,6 +751,605 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -630,7 +632,7 @@
  #endif
  
  /*
-@@ -791,6 +1400,11 @@ static const struct board_info __initcon
+@@ -775,6 +1386,11 @@ static const struct board_info __initcon
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -642,7 +644,7 @@
  #endif
  };
  
-@@ -845,6 +1459,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -783,6 +1399,16 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();