brcm63xx: move MAGIC to dts

[15.05/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 536-board_fast2704.patch

diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
index fd3eaca..d48f38e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
@@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -664,6 +664,122 @@ static struct board_info __initdata boar
+@@ -395,6 +395,44 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -53,89 +53,11 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 +                      },
 +              },
 +      },
-+
-+      .leds = {
-+              /* front LEDs */
-+              {
-+                      .name                   = "F@ST2704V2:green:power",
-+                      .gpio                   = 4,
-+                      .active_low             = 1,
-+                      .default_trigger        = "default-on",
-+              },
-+              {
-+                      .name                   = "F@ST2704V2:red:power",
-+                      .gpio                   = 5,
-+                      .active_low             = 1,
-+              },
-+              {
-+                      .name                   = "F@ST2704V2:red:inet",
-+                      .gpio                   = 2,
-+                      .active_low             = 1,
-+              },
-+              {
-+                      .name                   = "F@ST2704V2:green:dsl",
-+                      .gpio                   = 3,
-+                      .active_low             = 1,
-+              },
-+              {
-+                      .name                   = "F@ST2704V2:green:inet",
-+                      .gpio                   = 11,
-+                      .active_low             = 1,
-+              },
-+              {
-+                      .name                   = "F@ST2704V2:green:usb",
-+                      .gpio                   = 1,
-+                      .active_low             = 1,
-+              },
-+
-+              /* side button LEDs */
-+              {
-+                      .name                   = "F@ST2704V2:green:wps",
-+                      .gpio                   = 10,
-+                      .active_low             = 1,
-+              },
-+
-+              /* FIXME: can't control gpio0 line in "out" state, needs further investigation */
-+              /*
-+              {
-+                      .name                   = "F@ST2704V2:green:rfkill",
-+                      .gpio                   = 0,
-+                      .active_low             = 1,
-+              },
-+              */
-+
-+      },
-+      .buttons = {
-+              {
-+                      .desc                   = "reset",
-+                      .gpio                   = 23,
-+                      .active_low             = 1,
-+                      .type                   = EV_KEY,
-+                      .code                   = KEY_RESTART,
-+                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+              },
-+              {
-+                      .desc                   = "wps",
-+                      .gpio                   = 24,
-+                      .active_low             = 1,
-+                      .type                   = EV_KEY,
-+                      .code                   = KEY_WPS_BUTTON,
-+                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+              },
-+              {
-+                      .desc                   = "rfkill",
-+                      .gpio                   = 15,
-+                      .active_low             = 1,
-+                      .type                   = EV_KEY,
-+                      .code                   = KEY_WLAN,
-+                      .debounce_interval      = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+              },
-+      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -3916,6 +4032,7 @@ static const struct board_info __initcon
+@@ -1847,6 +1885,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
@@ -143,3 +65,11 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
+@@ -1922,6 +1961,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
+       { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
+       { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
++      { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6338
+       { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },