brcm63xx: move board compatible strings into a table

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

diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
index e2dced703e7cec5cd36bc2b053c428c804b7c717..7132a509c88597515ab02685a7607a7780c7e84d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1946,6 +1946,86 @@ static struct board_info __initdata boar
+@@ -1920,6 +1920,85 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -19,7 +19,6 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +#ifdef CONFIG_BCM63XX_CPU_6368
 +static struct board_info __initdata board_96368mvwg = {
 +      .name                           = "96368MVWG",
-+      .of_board_id                    = "brcm,bcm96368mvwg",
 +      .expected_cpu_id                = 0x6368,
 +
 +      .has_uart0                      = 1,
@@ -97,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1997,6 +2077,10 @@ static const struct board_info __initcon
+@@ -1971,6 +2050,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -107,7 +106,15 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +#endif
  };
  
- /*
+ static struct of_device_id const bcm963xx_boards_dt[] = {
+@@ -2014,6 +2097,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,bcm96368mvwg", .data = &board_96368mvwg, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268
+       { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
 @@ -88,12 +88,25 @@ void __init board_early_setup(const stru