brcm63xx: move CPVA502+ to dts

[15.05/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 564-board_P870HW-51a_v2.patch

diff --git a/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
index c6f3d19..1a61b59 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
+++ b/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4154,6 +4154,96 @@ static struct sprom_fixup __initdata vr3
+@@ -1911,6 +1911,49 @@ static struct sprom_fixup __initdata vr3
        { .offset = 115, .value = 0xfad9 },
  };
  
@@ -40,53 +40,6 @@
 +              },
 +      },
 +
-+      .leds = {
-+              {
-+                      .name           = "P870HW-51a:green:power",
-+                      .gpio           = 0,
-+                      .default_trigger = "default-on",
-+              },
-+              {
-+                      .name           = "P870HW-51a:green:dsl",
-+                      .gpio           = 2,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "P870HW-51a:green:inet",
-+                      .gpio           = 22,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "P870HW-51a:orange:wps",
-+                      .gpio           = 24,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "P870HW-51a:red:inet",
-+                      .gpio           = 33,
-+                      .active_low     = 1,
-+              },
-+      },
-+
-+      .buttons = {
-+              {
-+                      .desc           = "reset",
-+                      .gpio           = 34,
-+                      .type           = EV_KEY,
-+                      .code           = KEY_RESTART,
-+                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .desc           = "wps",
-+                      .gpio           = 35,
-+                      .type           = EV_KEY,
-+                      .code           = KEY_WPS_BUTTON,
-+                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+                      .active_low     = 1,
-+              },
-+      },
-+
 +      .fallback_sprom = {
 +              .type                           = SPROM_BCM4318,
 +              .pci_bus                        = 0,
@@ -97,7 +50,7 @@
  static struct board_info __initdata board_VR3025u = {
        .name                                   = "96368M-1541N",
        .expected_cpu_id                = 0x6368,
-@@ -4854,6 +4944,7 @@ static const struct board_info __initcon
+@@ -2382,6 +2425,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -105,11 +58,11 @@
        &board_VR3025u,
        &board_VR3025un,
        &board_WAP5813n,
-@@ -4940,6 +5031,7 @@ static struct of_device_id const bcm963x
+@@ -2472,6 +2516,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
        { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
        { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
 +      { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-       { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
+       { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },