brcm63xx: move board compatible strings into a table

[openwrt/staging/yousong.git] / target / linux / brcm63xx / patches-3.14 / 521-bcm63xx-add-support-for-96368MVNgr-board.patch

diff --git a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 784308e69afd89986be7b593da3686be2a34be51..c347129d7eab05fc3548bd70952968acc873a6a2 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,14 +9,13 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2023,6 +2023,73 @@ static struct board_info __initdata boar
+@@ -1996,6 +1996,72 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
 +
 +static struct board_info __initdata board_96368mvngr = {
 +      .name                           = "96368MVNgr",
-+      .of_board_id                    = "brcm,bcm96368mvngr",
 +      .expected_cpu_id                = 0x6368,
 +
 +      .has_uart0                      = 1,
@@ -83,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -2080,6 +2147,7 @@ static const struct board_info __initcon
+@@ -2053,6 +2119,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
@@ -91,3 +90,11 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  };
  
+@@ -2097,6 +2164,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
++      { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+       { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268