brcm63xx: move dg834g v4 to dts

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 563-board_VR-3025un.patch

diff --git a/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
index c68f8e9aef4a50118f4b3dd580cc4484ecc82951..e63b5e22203e1c382847993231a66385344348c6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
+++ b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
@@ -1,15 +1,25 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4578,6 +4578,98 @@ static struct board_info __initdata boar
+@@ -1956,6 +1956,60 @@ static struct board_info __initdata boar
        },
  };
  
++static struct sprom_fixup __initdata vr3025un_fixups[] = {
++      { .offset = 97, .value = 0xfeb3 },
++      { .offset = 98, .value = 0x1618 },
++      { .offset = 99, .value = 0xfab0 },
++      { .offset = 113, .value = 0xfed1 },
++      { .offset = 114, .value = 0x1609 },
++      { .offset = 115, .value = 0xfad9 },
++};
++
 +static struct board_info __initdata board_VR3025un = {
 +      .name                                   = "96368M-1341N",
 +      .expected_cpu_id                = 0x6368,
 +
 +      .has_uart0                              = 1,
 +      .has_pci                                = 1,
++      .use_fallback_sprom                     = 1,
 +      .has_ohci0                              = 1,
 +      .has_ehci0                              = 1,
 +
@@ -39,67 +49,19 @@
 +              },
 +      },
 +
-+      .leds = {
-+              {
-+                      .name           = "VR-3025un:green:dsl",
-+                      .gpio           = 2,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "VR-3025un:green:inet",
-+                      .gpio           = 5,
-+              },
-+              {
-+                      .name           = "VR-3025un:green:lan1",
-+                      .gpio           = 6,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "VR-3025un:green:lan2",
-+                      .gpio           = 7,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "VR-3025un:green:lan3",
-+                      .gpio           = 8,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "VR-3025un:green:iptv",
-+                      .gpio           = 9,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "VR-3025un:green:power",
-+                      .gpio           = 22,
-+                      .default_trigger = "default-on",
-+              },
-+              {
-+                      .name           = "VR-3025un:red:power",
-+                      .gpio           = 24,
-+              },
-+              {
-+                      .name           = "VR-3025un:red:inet",
-+                      .gpio           = 31,
-+              },
-+      },
-+
-+      .buttons = {
-+              {
-+                      .desc                   = "reset",
-+                      .gpio                   = 34,
-+                      .type                   = EV_KEY,
-+                      .code                   = KEY_RESTART,
-+                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+                      .active_low             = 1,
-+              },
++      .fallback_sprom = {
++              .type                           = SPROM_BCM43222,
++              .pci_bus                        = 0,
++              .pci_dev                        = 1,
++              .board_fixups                   = vr3025un_fixups,
++              .num_board_fixups               = ARRAY_SIZE(vr3025un_fixups),
 +      },
 +};
 +
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -5054,6 +5146,7 @@ static const struct board_info __initcon
+@@ -2329,6 +2383,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
@@ -107,3 +69,11 @@
        &board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
+@@ -2414,6 +2469,7 @@ static struct of_device_id const bcm963x
+       { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+       { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+       { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
++      { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
+       { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268