brcm63xx: move MAGIC to dts

[15.05/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 523-MIPS-BCM63XX-add-963281TAN-reference-board.patch

diff --git a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index ec7b95b..9cc3762 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -9,14 +9,13 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -156,6 +156,77 @@ static struct board_info __initdata boar
+@@ -137,6 +137,41 @@ static struct board_info __initdata boar
                },
        },
  };
 +
 +static struct board_info __initdata board_963281TAN = {
 +      .name                           = "963281TAN",
-+      .of_board_id                    = "brcm,bcm963281TAN",
 +      .expected_cpu_id                = 0x6328,
 +
 +      .has_uart0                      = 1,
@@ -48,46 +47,11 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 +                      },
 +              },
 +      },
-+
-+      .leds = {
-+              {
-+                      .name           = "963281TAN::internet",
-+                      .gpio           = 1,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "963281TAN::power",
-+                      .gpio           = 4,
-+                      .active_low     = 1,
-+                      .default_trigger = "default-on",
-+              },
-+              {
-+                      .name           = "963281TAN::internet-fail",
-+                      .gpio           = 7,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "963281TAN::power-fail",
-+                      .gpio           = 8,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "963281TAN::wps",
-+                      .gpio           = 9,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "963281TAN::dsl",
-+                      .gpio           = 11,
-+                      .active_low     = 1,
-+              },
-+
-+      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2122,6 +2193,7 @@ static const struct board_info __initcon
+@@ -1240,6 +1275,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -95,3 +59,11 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
+@@ -1296,6 +1332,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6328
++      { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
+       { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6338