brcm63xx: move board compatible strings into a table

[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 fa485d5..f028de8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
@@ -13,9 +13,9 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -35,6 +41,12 @@
- #define CFE_OFFSET_64K                        0x10000
- #define CFE_OFFSET_128K                       0x20000
+@@ -31,6 +37,12 @@
+ #define BCM963XX_KEYS_POLL_INTERVAL   20
+ #define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
  
 +#define NB4_PID_OFFSET                0xff80
 +#define NB4_74X164_GPIO_BASE  64
@@ -26,7 +26,7 @@
  /*
   * known 3368 boards
   */
-@@ -768,6 +780,270 @@ static struct board_info __initdata boar
+@@ -747,6 +759,268 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -72,7 +72,6 @@
 +
 +static struct board_info __initdata board_nb4_ser_r0 = {
 +      .name                           = "NB4-SER-r0",
-+      .of_board_id                    = "sfr,nb4-ser-r0",
 +      .expected_cpu_id                = 0x6358,
 +
 +      .has_uart0                      = 1,
@@ -187,7 +186,6 @@
 +
 +static struct board_info __initdata board_nb4_fxc_r1 = {
 +      .name                           = "NB4-FXC-r1",
-+      .of_board_id                    = "sfr,nb4-fxc-r1",
 +      .expected_cpu_id                = 0x6358,
 +
 +      .has_uart0                      = 1,
@@ -297,7 +295,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -804,6 +1080,8 @@ static const struct board_info __initcon
+@@ -783,6 +1057,8 @@ static const struct board_info __initcon
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -306,3 +304,12 @@
  #endif
  };
  
+@@ -815,6 +1091,8 @@ static struct of_device_id const bcm963x
+       { .compatible = "pirelli,a226g", .data = &board_DWVS0, },
+       { .compatible = "pirelli,a226m", .data = &board_DWVS0, },
+       { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
++      { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
++      { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
+ #endif