brcm63xx: move MAGIC to dts

[15.05/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 519_board_CPVA502plus.patch

diff --git a/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
index 98086c9..1eed2c1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
@@ -1,10 +1,9 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1153,6 +1153,46 @@ static struct board_info __initdata boar
-               },
+@@ -425,6 +425,27 @@ static struct board_info __initdata boar
        },
  };
-+
+ 
 +static struct board_info __initdata board_CPVA502plus = {
 +      .name                           = "CPVA502+",
 +      .expected_cpu_id                = 0x6348,
@@ -21,33 +20,15 @@
 +      .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
-+              .force_speed_100        = 1,
-+              .force_duplex_full      = 1,
 +      },
 +
-+      .leds = {
-+              {
-+                      .name           = "CPVA502+:green:phone",
-+                      .gpio           = 0,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "CPVA502+:green:link",
-+                      .gpio           = 5,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "CPVA502+:green:feth1", /* FIXME:does gpio4 enable eth1 phy? */
-+                      .gpio           = 4,
-+                      .active_low     = 1,
-+              },
-+      },
++      .ephy_reset_gpio                = 4,
++      .ephy_reset_gpio_flags          = GPIO_ACTIVE_LOW,
 +};
-+
- #endif
  
- /*
-@@ -2234,6 +2274,7 @@ static const struct board_info __initcon
+ static struct board_info __initdata board_ct536_ct5621 = {
+       .name                           = "CT536_CT5621",
+@@ -1127,6 +1148,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,
@@ -55,3 +36,11 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
+@@ -1178,6 +1200,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "t-com,spw500v", .data = &board_spw500v, },
+       { .compatible = "tecom,gw6000", .data = &board_gw6000, },
+       { .compatible = "tecom,gw6200", .data = &board_gw6200, },
++      { .compatible = "telsey,cpva502+", .data = &board_CPVA502plus, },
+       { .compatible = "telsey,magic", .data = &board_96348sv, },
+       { .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, },
+       { .compatible = "usr,9108", .data = &board_96348gw_a, },