brcm63xx: move buttons and leds to dts files

[openwrt.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 42d3ac0..2d144e5 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,8 +10,8 @@ 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
-@@ -2232,6 +2232,85 @@ static struct board_info __initdata boar
- #endif
+@@ -1170,6 +1170,59 @@ static struct board_info __initdata boar
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
 + * known 6368 boards
@@ -61,42 +61,16 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +              },
 +      },
 +
-+      .leds = {
-+              {
-+                      .name           = "96368MVWG:green:adsl",
-+                      .gpio           = 2,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96368MVWG:green:ppp",
-+                      .gpio           = 5,
-+              },
-+              {
-+                      .name           = "96368MVWG:green:power",
-+                      .gpio           = 22,
-+                      .default_trigger = "default-on",
-+              },
-+              {
-+                      .name           = "96368MVWG:green:wps",
-+                      .gpio           = 23,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96368MVWG:red:ppp-fail",
-+                      .gpio           = 31,
-+              },
-+      },
-+
 +      .has_ohci0 = 1,
 +      .has_ehci0 = 1,
 +};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6368 */
 +
 +/*
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2286,6 +2365,10 @@ static const struct board_info __initcon
+@@ -1221,6 +1274,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -106,10 +80,18 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +#endif
  };
  
- static void __init boardid_fixup(u8 *boot_addr)
+ static struct of_device_id const bcm963xx_boards_dt[] = {
+@@ -1277,6 +1334,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
+ #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
-@@ -85,12 +85,25 @@ void __init board_early_setup(const stru
+@@ -88,12 +88,25 @@ void __init board_early_setup(const stru
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;