brcm63xx: move CPVA502+ to dts

[openwrt/staging/yousong.git] / target / linux / brcm63xx / patches-3.18 / 509-board_rta1320_16m.patch

diff --git a/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch
index 16cc061ae9b4d0615d96cfdf75a92b9c4c792f9b..5d3334903178b026f911ce9ca881f52310429056 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -245,6 +245,45 @@ static struct board_info __initdata boar
-               },
+@@ -213,6 +213,21 @@ static struct board_info __initdata boar
+               .force_duplex_full      = 1,
        },
  };
 +
@@ -18,35 +18,11 @@
 +              .force_speed_100        = 1,
 +              .force_duplex_full      = 1,
 +      },
-+
-+              .leds = {
-+              {
-+                      .name           = "RTA1320_16M:green:adsl",
-+                      .gpio           = 3,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "RTA1320_16M:green:ppp",
-+                      .gpio           = 4,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "RTA1320_16M:green:power",
-+                      .gpio           = 0,
-+                      .active_low     = 1,
-+                      .default_trigger = "default-on",
-+              },
-+              {
-+                      .name           = "RTA1320_16M:green:stop",
-+                      .gpio           = 1,
-+                      .active_low     = 1,
-+              },
-+      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -1551,6 +1590,7 @@ static const struct board_info __initcon
+@@ -1015,6 +1030,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,
@@ -54,11 +30,11 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
-@@ -1595,6 +1635,7 @@ static struct of_device_id const bcm963x
+@@ -1059,6 +1075,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
        { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
        { .compatible = "brcm,bcm96338w", .data = &board_96338w, },
 +      { .compatible = "dynalink,rta1320", .data = &board_rta1320_16m, },
+       { .compatible = "d-link,dsl-2640u", .data = &board_96338w2_e7t, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
-       { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },