brcm63xx: probe gpio controllers through DT

[openwrt.git] / target / linux / brcm63xx / patches-3.14 / 528-board_nb6.patch

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 7e4f6eb..94ad4c9 100644 (file)
--- 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,9 +17,9 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2696,6 +2699,104 @@ static struct board_info __initdata boar
+@@ -2370,6 +2373,104 @@ static struct board_info __initdata boar
  };
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  
 +#ifdef CONFIG_BCM63XX_CPU_6362
 +static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = {
@@ -117,12 +117,12 @@
 +      .devs = nb6_devices,
 +      .num_devs = ARRAY_SIZE(nb6_devices),
 +};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6362 */
 +
  /*
   * known 6368 boards
   */
-@@ -2902,6 +3003,10 @@ static const struct board_info __initcon
+@@ -2573,6 +2674,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
@@ -133,15 +133,13 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2923,6 +3028,11 @@ static void __init boardid_fixup(u8 *boo
-               }
-       }
- 
-+      if (BCMCPU_IS_6362() && (!strncmp(board_name, "NB6-", sizeof("NB6-") - 1))) {
-+              board_name[sizeof("NB6") - 1] = '\0';
-+              return ;
-+      }
-+
-       /* check if bcm_tag is at 64k offset */
-       if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
-               /* else try 128k */
+@@ -2636,6 +2741,9 @@ static struct of_device_id const bcm963x
+       { .compatible = "t-com,spw303v", .data = &board_spw303v, },
+       { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
+ #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, },