brcm63xx: move MAGIC to dts

[15.05/openwrt.git] / target / linux / brcm63xx / patches-3.14 / 514-board_ct536_ct5621.patch

diff --git a/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
index 8e8a64c..41e9620 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -531,6 +531,51 @@ static struct board_info __initdata boar
+@@ -426,6 +426,34 @@ static struct board_info __initdata boar
  };
  
  
@@ -12,6 +12,7 @@
 +      .has_enet0                      = 0,
 +      .has_enet1                      = 1,
 +      .has_pci                        = 1,
++      .use_fallback_sprom             = 1,
 +
 +      .enet1 = {
 +              .has_phy                = 1,
@@ -24,35 +25,17 @@
 +      .has_pccard = 1,
 +      .has_ehci0 = 1,
 +
-+      .leds = {
-+              {
-+                      .name           = "CT536_CT5621:green:adsl-fail",
-+                      .gpio           = 2,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "CT536_CT5621:green:power",
-+                      .gpio           = 0,
-+                      .active_low     = 1,
-+                      .default_trigger = "default-on",
-+              },
-+      },
-+      .buttons = {
-+              {
-+                      .desc           = "reset",
-+                      .gpio           = 33,
-+                      .active_low     = 1,
-+                      .type           = EV_KEY,
-+                      .code           = KEY_RESTART,
-+                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+              },
++      .fallback_sprom = {
++              .type                           = SPROM_BCM4318,
++              .pci_bus                        = 0,
++              .pci_dev                        = 1,
 +      },
 +};
 +
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2106,6 +2151,7 @@ static const struct board_info __initcon
+@@ -1068,6 +1096,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,
@@ -60,3 +43,12 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
+@@ -1108,6 +1137,8 @@ static struct of_device_id const bcm963x
+       { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
+       { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
+       { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
++      { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },
++      { .compatible = "comtrend,ct-5621", .data = &board_ct536_ct5621, },
+       { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
+       { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
+       { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },