X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F528-board_nb6.patch;h=bdb77c40f4862aeab4e2ea54b41575ae4f67df81;hb=ff19b1763205aa8f262a37c0c3fe88ff90721c55;hp=9754c00fdf140a7146f2f0ce398936a77918d5c6;hpb=180d41e8c40b0c2cd0f2480eac313fce259f9057;p=openwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
index 9754c00fdf..bdb77c40f4 100644
--- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
@@ -8,7 +8,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -46,6 +47,8 @@
+@@ -42,6 +43,8 @@
  #define NB4_SPI_GPIO_MOSI	7
  #define NB4_SPI_GPIO_CLK	6
  #define NB4_74HC64_GPIO(X)	(NB4_74X164_GPIO_BASE + (X))
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET		0xff80
  #define CT6373_74X164_GPIO_BASE	64
-@@ -2717,6 +2720,105 @@ static struct board_info __initdata boar
+@@ -2370,6 +2373,104 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -56,7 +56,6 @@
 +
 +static struct board_info __initdata board_nb6 = {
 +	.name				= "NB6",
-+	.of_board_id			= "sfr,nb6-ser-r0",
 +	.expected_cpu_id		= 0x6362,
 +
 +	.has_uart0			= 1,
@@ -123,7 +122,7 @@
  /*
   * known 6368 boards
   */
-@@ -2923,6 +3025,10 @@ static const struct board_info __initcon
+@@ -2573,6 +2674,10 @@ static const struct board_info __initcon
  	&board_DVAG3810BN,
  #endif
  
@@ -134,3 +133,13 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
+@@ -2628,6 +2733,9 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
+ 	{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
+ #endif
++#ifdef CONFIG_BCM63XX_CPU_6362
++	{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
++#endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
+ 	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+ 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },