brcm63xx: move MAGIC to dts

[15.05/openwrt.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 af5c467..433fdb6 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,7 +9,7 @@ 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
-@@ -2322,6 +2322,72 @@ static struct board_info __initdata boar
+@@ -1162,6 +1162,46 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -50,39 +50,13 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 +              },
 +      },
 +
-+      .leds = {
-+              {
-+                      .name           = "96368MVNgr:green:adsl",
-+                      .gpio           = 2,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96368MVNgr:green:inet",
-+                      .gpio           = 5,
-+              },
-+              {
-+                      .name           = "96368MVNgr:green:power",
-+                      .gpio           = 22,
-+                      .default_trigger = "default-on",
-+              },
-+              {
-+                      .name           = "96368MVNgr:green:wps",
-+                      .gpio           = 23,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96368MVNgr:green:inet-fail",
-+                      .gpio           = 3,
-+              },
-+      },
-+
 +      .has_ohci0 = 1,
 +      .has_ehci0 = 1,
 +};
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -2382,6 +2448,7 @@ static const struct board_info __initcon
+@@ -1219,6 +1259,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
@@ -90,3 +64,11 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  };
  
+@@ -1279,6 +1320,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6368
++      { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+       { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268