brcm63xx: move dsl-2640u to dts

Also build image again(?).

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44988 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index 3b0b667..324ea18 100755 (executable)
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -99,6 +99,9 @@ brcm63xx_dt_detect() {
        "D-Link DSL-2640B rev B2")
                board_name="dsl-2640b-b"
                ;;
+       "D-Link DSL-2640U/BRU/C")
+               board_name="dsl-2640u"
+               ;;
        "D-Link DSL-2650U")
                board_name="dsl-2650u"
                ;;
@@ -210,9 +213,6 @@ brcm63xx_legacy_detect() {
        local board_name
 
        case "$1" in
-       96338W2_E7T)
-               board_name="dsl-2640u"
-               ;;
        96348W3)
                board_name="dg834g_v4"
                ;;

diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts
new file mode 100644 (file)
index 0000000..c2b3daf
--- /dev/null
+++ b/target/linux/brcm63xx/dts/dsl-2640u.dts
@@ -0,0 +1,50 @@
+/dts-v1/;
+
+/include/ "bcm6338.dtsi"
+
+/ {
+       model = "D-Link DSL-2640U/BRU/C";
+       compatible = "d-link,dsl-2640u", "brcm,bcm6338";
+
+       gpio-leds {
+               compatible = "gpio-leds";
+
+               green_power {
+                       label = "96338W2_E7T:green:power";
+                       gpios = <&gpio0 0 1>;
+                       default-state = "on";
+               };
+
+               green_stop {
+                       label = "96338W2_E7T:green:ppp";
+                       gpios = <&gpio0 4 1>;
+               };
+
+               green_adsl {
+                       label = "96338W2_E7T:green:ppp-fail";
+                       gpios = <&gpio0 5 1>;
+               };
+       };
+};
+
+&pflash {
+       status = "ok";
+
+       linux,part-probe = "bcm63xxpart";
+
+       cfe@0 {
+               label = "CFE";
+               reg = <0x000000 0x010000>;
+               read-only;
+       };
+
+       linux@10000 {
+               label = "linux";
+               reg = <0x010000 0x3e0000>;
+       };
+
+       nvram@3f0000 {
+               label = "nvram";
+               reg = <0x3f0000 0x010000>;
+       };
+};

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 8e423e5..bc633a7 100755 (executable)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -299,6 +299,8 @@ $(eval $(call ImageDTB,CFEDTB,VR3025un,VR-3025un,vr-3025un,96368M-1341N,6368,--p
 $(eval $(call ImageDTB,CFEDTB,WAP5813n,WAP-5813n,wap-5813n,96369R-1231N,6368,--pad 4))
 # D-Link DSL-2640B, rev B2
 $(eval $(call ImageDTB,CFEDTB,DSL2640B-B2,DSL2640B_B,dsl-2640b-b,D-4P-W,6348))
+# D-Link DSL-2640U, rev C1
+$(eval $(call ImageDTB,CFEDTB,DSL2640U,DSL2640U,dsl-2640u,96338W2_E7T,6338))
 # D-Link DSL-2650U
 $(eval $(call ImageDTB,CFEDTB,DSL2650U,DSL2650U,dsl-2650u,96358VW2,6358))
 # D-Link DSL-2740B/DSL-2741B, rev C2

diff --git a/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch
index 29d68a3..cfdf03e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -199,6 +199,40 @@ static struct board_info __initdata boar
+@@ -199,6 +199,20 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -17,31 +17,11 @@
 +              .force_speed_100        = 1,
 +              .force_duplex_full      = 1,
 +      },
-+
-+              .leds = {
-+              {
-+                      .name           = "96338W2_E7T:green:ppp",
-+                      .gpio           = 4,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96338W2_E7T:green:ppp-fail",
-+                      .gpio           = 5,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96338W2_E7T:green:power",
-+                      .gpio           = 0,
-+                      .active_low     = 1,
-+                      .default_trigger = "default-on",
-+
-+              },
-+      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -764,6 +798,7 @@ static const struct board_info __initcon
+@@ -764,6 +778,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,
@@ -49,3 +29,11 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
+@@ -801,6 +816,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 = "d-link,dsl-2640u", .data = &board_96338w2_e7t, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6345
+       { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },

diff --git a/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch
index 5229ba8..c17b8e4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.14/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -683,6 +683,26 @@ static struct board_info __initdata boar
+@@ -663,6 +663,26 @@ static struct board_info __initdata boar
        },
  };
  
@@ -27,7 +27,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -819,6 +839,7 @@ static const struct board_info __initcon
+@@ -799,6 +819,7 @@ static const struct board_info __initcon
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
@@ -35,7 +35,7 @@
        &board_DWVS0,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
-@@ -865,6 +886,7 @@ static struct of_device_id const bcm963x
+@@ -846,6 +867,7 @@ static struct of_device_id const bcm963x
        { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
        { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
        { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },

diff --git a/target/linux/brcm63xx/patches-3.14/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.14/504-board_dsl_274xb_rev_c.patch
index 199321a..63c891b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.14/504-board_dsl_274xb_rev_c.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -748,6 +748,23 @@ static struct board_info __initdata boar
+@@ -728,6 +728,23 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_nb4_ser_r0 = {
        .name                           = "NB4-SER-r0",
        .expected_cpu_id                = 0x6358,
-@@ -841,6 +858,7 @@ static const struct board_info __initcon
+@@ -821,6 +838,7 @@ static const struct board_info __initcon
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,
@@ -32,7 +32,7 @@
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
  #endif
-@@ -879,6 +897,7 @@ static struct of_device_id const bcm963x
+@@ -860,6 +878,7 @@ static struct of_device_id const bcm963x
        { .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
        { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch
index 8d36615..8919e88 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -574,6 +574,45 @@ static struct board_info __initdata boar
+@@ -554,6 +554,45 @@ static struct board_info __initdata boar
                .force_duplex_full      = 1,
        },
  };
@@ -46,7 +46,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -850,6 +889,7 @@ static const struct board_info __initcon
+@@ -830,6 +869,7 @@ static const struct board_info __initcon
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,
@@ -54,7 +54,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -890,6 +930,7 @@ static struct of_device_id const bcm963x
+@@ -871,6 +911,7 @@ static struct of_device_id const bcm963x
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
        { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
        { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

diff --git a/target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch
index 144775d..8785db7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -471,6 +471,66 @@ static struct board_info __initdata boar
+@@ -451,6 +451,66 @@ static struct board_info __initdata boar
        },
  };
  
@@ -67,7 +67,7 @@
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .expected_cpu_id                = 0x6348,
-@@ -882,6 +942,8 @@ static const struct board_info __initcon
+@@ -862,6 +922,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,
@@ -76,7 +76,7 @@
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
-@@ -931,6 +993,8 @@ static struct of_device_id const bcm963x
+@@ -912,6 +974,8 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
        { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
        { .compatible = "t-com,spw500v", .data = &board_spw500v, },

diff --git a/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
index b0fd613..627ffc9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -673,6 +673,78 @@ static struct board_info __initdata boar
+@@ -653,6 +653,78 @@ static struct board_info __initdata boar
                .num_board_fixups       = ARRAY_SIZE(spw500v_fixups),
        },
  };
@@ -79,7 +79,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -952,6 +1024,7 @@ static const struct board_info __initcon
+@@ -932,6 +1004,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,

diff --git a/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
index 02196cb..d24c5f1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -991,6 +991,34 @@ static struct board_info __initdata boar
+@@ -971,6 +971,34 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
        .num_usbh_ports                 = 2,
  };
@@ -35,7 +35,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1036,6 +1064,7 @@ static const struct board_info __initcon
+@@ -1016,6 +1044,7 @@ static const struct board_info __initcon
        &board_dsl_274xb_rev_c,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
@@ -43,7 +43,7 @@
  #endif
  };
  
-@@ -1077,6 +1106,7 @@ static struct of_device_id const bcm963x
+@@ -1058,6 +1087,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
index 1597f60..5d33349 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.14/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
-@@ -233,6 +233,21 @@ static struct board_info __initdata boar
-               },
+@@ -213,6 +213,21 @@ static struct board_info __initdata boar
+               .force_duplex_full      = 1,
        },
  };
 +
@@ -22,7 +22,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -1035,6 +1050,7 @@ static const struct board_info __initcon
+@@ -1015,6 +1030,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,
@@ -30,11 +30,11 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
-@@ -1079,6 +1095,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, },

diff --git a/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
index 61aa2e9..24c1fbd 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1034,6 +1034,21 @@ static struct board_info __initdata boar
+@@ -1014,6 +1014,21 @@ static struct board_info __initdata boar
                .pci_dev                        = 1,
        },
  };
@@ -22,7 +22,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1081,6 +1096,7 @@ static const struct board_info __initcon
+@@ -1061,6 +1076,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_HW553,
@@ -30,7 +30,7 @@
  #endif
  };
  
-@@ -1130,6 +1146,7 @@ static struct of_device_id const bcm963x
+@@ -1111,6 +1127,7 @@ static struct of_device_id const bcm963x
        { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
        { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
        { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },

diff --git a/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
index 692fba7..9f61cc9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -760,6 +760,27 @@ static struct board_info __initdata boar
+@@ -740,6 +740,27 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1084,6 +1105,7 @@ static const struct board_info __initcon
+@@ -1064,6 +1085,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -36,7 +36,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1122,6 +1144,7 @@ static struct of_device_id const bcm963x
+@@ -1103,6 +1125,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
        { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
        { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -44,7 +44,7 @@
        { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
        { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -1180,6 +1203,22 @@ void __init board_bcm963xx_init(void)
+@@ -1161,6 +1184,22 @@ void __init board_bcm963xx_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);

diff --git a/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
index 889d002..97901aa 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -427,6 +427,25 @@ static struct board_info __initdata boar
+@@ -407,6 +407,25 @@ static struct board_info __initdata boar
        },
  };
  
@@ -26,7 +26,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1106,6 +1125,7 @@ static const struct board_info __initcon
+@@ -1086,6 +1105,7 @@ static const struct board_info __initcon
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,

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 0db568c..0cf686b 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
-@@ -446,6 +446,34 @@ static struct board_info __initdata boar
+@@ -426,6 +426,34 @@ static struct board_info __initdata boar
  };
  
  
@@ -35,7 +35,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1126,6 +1154,7 @@ static const struct board_info __initcon
+@@ -1106,6 +1134,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,
@@ -43,7 +43,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1165,6 +1194,8 @@ static struct of_device_id const bcm963x
+@@ -1146,6 +1175,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, },

diff --git a/target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch
index 5a73805..a855f79 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -984,6 +984,8 @@ static struct board_info __initdata boar
+@@ -964,6 +964,8 @@ static struct board_info __initdata boar
        .name                           = "DWV-S0",
        .expected_cpu_id                = 0x6358,
  
@@ -9,7 +9,7 @@
        .has_enet0                      = 1,
        .has_enet1                      = 1,
        .has_pci                        = 1,
-@@ -1000,6 +1002,7 @@ static struct board_info __initdata boar
+@@ -980,6 +982,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
index b4b1476..0e96dd1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -474,6 +474,31 @@ static struct board_info __initdata boar
+@@ -454,6 +454,31 @@ static struct board_info __initdata boar
        },
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1158,6 +1183,7 @@ static const struct board_info __initcon
+@@ -1138,6 +1163,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,
@@ -40,7 +40,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1198,6 +1224,7 @@ static struct of_device_id const bcm963x
+@@ -1179,6 +1205,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
        { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
        { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },

diff --git a/target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch
index 7fac28f..af5b483 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -647,6 +647,7 @@ static struct board_info __initdata boar
+@@ -627,6 +627,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  

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 b0233a1..94a53e7 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,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -445,6 +445,27 @@ static struct board_info __initdata boar
+@@ -425,6 +425,27 @@ static struct board_info __initdata boar
        },
  };
  
@@ -28,7 +28,7 @@
  
  static struct board_info __initdata board_ct536_ct5621 = {
        .name                           = "CT536_CT5621",
-@@ -1185,6 +1206,7 @@ static const struct board_info __initcon
+@@ -1165,6 +1186,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,

diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
index f98c437..f9c3b73 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1170,6 +1170,59 @@ static struct board_info __initdata boar
+@@ -1150,6 +1150,59 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -70,7 +70,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1221,6 +1274,10 @@ static const struct board_info __initcon
+@@ -1201,6 +1254,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -81,7 +81,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1277,6 +1334,7 @@ static struct of_device_id const bcm963x
+@@ -1258,6 +1315,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

diff --git a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 1df1188..0979de7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1220,6 +1220,46 @@ static struct board_info __initdata boar
+@@ -1200,6 +1200,46 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -56,7 +56,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1277,6 +1317,7 @@ static const struct board_info __initcon
+@@ -1257,6 +1297,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
@@ -64,7 +64,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  };
  
-@@ -1334,6 +1375,7 @@ static struct of_device_id const bcm963x
+@@ -1315,6 +1356,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

diff --git a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 6b5d7d2..a4f55fb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -51,7 +51,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1298,6 +1333,7 @@ static const struct board_info __initcon
+@@ -1278,6 +1313,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -59,7 +59,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -1354,6 +1390,7 @@ static struct of_device_id const bcm963x
+@@ -1334,6 +1370,7 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

diff --git a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
index a5c726d..1b2e236 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
@@ -62,7 +62,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1334,6 +1379,7 @@ static const struct board_info __initcon
+@@ -1314,6 +1359,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
@@ -70,7 +70,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -1392,6 +1438,7 @@ static struct of_device_id const bcm963x
+@@ -1372,6 +1418,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
        { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

diff --git a/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
index eb7a53f..676f704 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -835,6 +835,25 @@ static struct board_info __initdata boar
+@@ -815,6 +815,25 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
  };
  
@@ -26,7 +26,7 @@
  static struct board_info __initdata board_96348_D4PW = {
        .name                           = "D-4P-W",
        .expected_cpu_id                = 0x6348,
-@@ -1409,6 +1428,7 @@ static const struct board_info __initcon
+@@ -1389,6 +1408,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,

diff --git a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
index ac24ebd..6b296ee 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1251,6 +1251,31 @@ static struct board_info __initdata boar
+@@ -1231,6 +1231,31 @@ static struct board_info __initdata boar
        .num_usbh_ports                 = 2,
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -1440,6 +1465,7 @@ static const struct board_info __initcon
+@@ -1420,6 +1445,7 @@ static const struct board_info __initcon
        &board_dsl_274xb_rev_c,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
@@ -40,7 +40,7 @@
        &board_HW553,
        &board_spw303v,
  #endif
-@@ -1493,6 +1519,7 @@ static struct of_device_id const bcm963x
+@@ -1474,6 +1500,7 @@ static struct of_device_id const bcm963x
        { .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
        { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
index b83a966..d1c703c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1318,6 +1318,36 @@ static struct board_info __initdata boar
+@@ -1298,6 +1298,36 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
  };
@@ -37,7 +37,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1468,6 +1498,7 @@ static const struct board_info __initcon
+@@ -1448,6 +1478,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
@@ -45,7 +45,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1522,6 +1553,7 @@ static struct of_device_id const bcm963x
+@@ -1503,6 +1534,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
index cf82d94..7788622 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
@@ -19,7 +19,7 @@
  /*
   * known 3368 boards
   */
-@@ -1350,6 +1355,69 @@ static struct board_info __initdata boar
+@@ -1330,6 +1335,69 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -89,7 +89,7 @@
  /*
   * known 6368 boards
   */
-@@ -1501,6 +1569,10 @@ static const struct board_info __initcon
+@@ -1481,6 +1549,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
@@ -100,7 +100,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -1564,6 +1636,9 @@ static struct of_device_id const bcm963x
+@@ -1545,6 +1617,9 @@ static struct of_device_id const bcm963x
        { .compatible = "t-com,spw303v", .data = &board_spw303v, },
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif

diff --git a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
index 0c19a6e..ae81e31 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -776,6 +776,23 @@ static struct board_info __initdata boar
+@@ -756,6 +756,23 @@ static struct board_info __initdata boar
        .has_ehci0                      = 1,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -1540,6 +1557,7 @@ static const struct board_info __initcon
+@@ -1520,6 +1537,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
@@ -32,7 +32,7 @@
        &board_DV201AMR,
        &board_96348gw_a,
        &board_rta1025w_16,
-@@ -1612,6 +1630,7 @@ static struct of_device_id const bcm963x
+@@ -1593,6 +1611,7 @@ static struct of_device_id const bcm963x
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
        { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
        { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

diff --git a/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
index 40ff98b..623df6b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
+++ b/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
@@ -51,7 +51,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -1538,6 +1582,7 @@ static const struct board_info __initcon
+@@ -1518,6 +1562,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
@@ -59,7 +59,7 @@
        &board_dsl_274xb_f1,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1603,6 +1648,7 @@ static struct of_device_id const bcm963x
+@@ -1583,6 +1628,7 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

diff --git a/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
index 9598ceb..d26acd8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
+++ b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
@@ -80,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -1581,6 +1654,7 @@ static const struct board_info __initcon
+@@ -1561,6 +1634,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -88,7 +88,7 @@
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
-@@ -1651,6 +1725,7 @@ static struct of_device_id const bcm963x
+@@ -1631,6 +1705,7 @@ static struct of_device_id const bcm963x
        { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
        { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

diff --git a/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
index c1984c4..959bbdf 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
+++ b/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
@@ -62,7 +62,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
        { .offset = 2, .value = 0x05bb },
        { .offset = 65, .value = 0x1204 },
-@@ -1654,6 +1709,7 @@ static const struct board_info __initcon
+@@ -1634,6 +1689,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -70,7 +70,7 @@
        &board_AR5387un,
        &board_963281TAN,
        &board_A4001N1,
-@@ -1725,6 +1781,7 @@ static struct of_device_id const bcm963x
+@@ -1705,6 +1761,7 @@ static struct of_device_id const bcm963x
        { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
        { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

diff --git a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
index a402340..15b1e98 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -544,6 +544,55 @@ static struct board_info __initdata boar
+@@ -524,6 +524,55 @@ static struct board_info __initdata boar
  
        .has_uart0                      = 1,
  };
@@ -56,7 +56,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1723,6 +1772,7 @@ static const struct board_info __initcon
+@@ -1703,6 +1752,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,

diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index f1664a4..7ea7297 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/rtl8367.h>
  #include <asm/addrspace.h>
-@@ -1547,6 +1548,93 @@ static struct board_info __initdata boar
+@@ -1527,6 +1528,93 @@ static struct board_info __initdata boar
        },
  };
  
@@ -102,7 +102,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -1808,6 +1896,9 @@ static const struct board_info __initcon
+@@ -1788,6 +1876,9 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_ct6373_1,
        &board_HW553,
@@ -112,7 +112,7 @@
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -1874,6 +1965,9 @@ static struct of_device_id const bcm963x
+@@ -1855,6 +1946,9 @@ static struct of_device_id const bcm963x
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
        { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
        { .compatible = "huawei,hg553", .data = &board_HW553, },

diff --git a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
index eb2d0c3..510ee05 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -594,6 +594,60 @@ static struct board_info __initdata boar
+@@ -574,6 +574,60 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -61,7 +61,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1861,6 +1915,7 @@ static const struct board_info __initcon
+@@ -1841,6 +1895,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,

diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
index adef676..765dbc4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
@@ -57,7 +57,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1905,6 +1943,7 @@ static const struct board_info __initcon
+@@ -1885,6 +1923,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
@@ -65,7 +65,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -1980,6 +2019,7 @@ static struct of_device_id const bcm963x
+@@ -1960,6 +1999,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
        { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
        { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },

diff --git a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
index 55c754a..7c87752 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1834,6 +1834,43 @@ static struct board_info __initdata boar
+@@ -1814,6 +1814,43 @@ static struct board_info __initdata boar
        .devs = nb6_devices,
        .num_devs = ARRAY_SIZE(nb6_devices),
  };
@@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1999,6 +2036,7 @@ static const struct board_info __initcon
+@@ -1979,6 +2016,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
@@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2073,6 +2111,7 @@ static struct of_device_id const bcm963x
+@@ -2054,6 +2092,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362

diff --git a/target/linux/brcm63xx/patches-3.14/550-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-3.14/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
index d4365f9..4ab0033 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
+++ b/target/linux/brcm63xx/patches-3.14/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
@@ -132,7 +132,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96338w2_e7t = {
-@@ -705,36 +610,6 @@ static struct board_info __initdata boar
+@@ -685,36 +590,6 @@ static struct board_info __initdata boar
                .has_phy                = 1,
                .use_internal_phy       = 1,
        },
@@ -169,7 +169,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw_10 = {
-@@ -767,35 +642,6 @@ static struct board_info __initdata boar
+@@ -747,35 +622,6 @@ static struct board_info __initdata boar
                .cs                     = 2,
                .ext_irq                = 2,
        },
@@ -205,7 +205,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw_11 = {
-@@ -822,35 +668,6 @@ static struct board_info __initdata boar
+@@ -802,35 +648,6 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
@@ -241,7 +241,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  
-@@ -974,35 +791,6 @@ static struct board_info __initdata boar
+@@ -954,35 +771,6 @@ static struct board_info __initdata boar
                .ext_irq                = 2,
                .cs                     = 2,
        },
@@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_gw6200 = {
-@@ -1367,33 +1155,6 @@ static struct board_info __initdata boar
+@@ -1347,33 +1135,6 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
@@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96358vw2 = {
-@@ -1421,29 +1182,6 @@ static struct board_info __initdata boar
+@@ -1401,29 +1162,6 @@ static struct board_info __initdata boar
        .has_pccard = 1,
        .has_ehci0 = 1,
        .num_usbh_ports                 = 2,

diff --git a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
index 6442761..9c68988 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
@@ -11,7 +11,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -627,6 +631,8 @@ static struct board_info __initdata boar
+@@ -607,6 +611,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -20,7 +20,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -660,6 +666,8 @@ static struct board_info __initdata boar
+@@ -640,6 +646,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -29,7 +29,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -807,6 +815,8 @@ static struct board_info __initdata boar
+@@ -787,6 +795,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -38,7 +38,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -869,6 +879,8 @@ static struct board_info __initdata boar
+@@ -849,6 +859,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -47,7 +47,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -910,6 +922,8 @@ static struct board_info __initdata boar
+@@ -890,6 +902,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -56,7 +56,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -932,6 +946,8 @@ static struct board_info __initdata boar
+@@ -912,6 +926,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -65,7 +65,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -952,6 +968,8 @@ static struct board_info __initdata boar
+@@ -932,6 +948,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -74,7 +74,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1147,6 +1165,8 @@ static struct board_info __initdata boar
+@@ -1127,6 +1145,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -83,7 +83,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1219,6 +1239,8 @@ static struct board_info __initdata boar
+@@ -1199,6 +1219,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -92,7 +92,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1244,6 +1266,10 @@ static struct board_info __initdata boar
+@@ -1224,6 +1246,10 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {

diff --git a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
index c179bba..9aff643 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1737,6 +1824,9 @@ static const struct board_info __initcon
+@@ -1717,6 +1804,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif

diff --git a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
index 83eaa29..7554305 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
@@ -95,7 +95,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1826,6 +1914,7 @@ static const struct board_info __initcon
+@@ -1806,6 +1894,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,

diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
index f0465ab..9cb5cd6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1906,6 +1906,75 @@ static struct board_info __initdata boar
+@@ -1886,6 +1886,75 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1986,6 +2055,9 @@ static const struct board_info __initcon
+@@ -1966,6 +2035,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif

diff --git a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
index d72974e..0f66d0c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
@@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -853,6 +853,22 @@ static struct board_info __initdata boar
+@@ -833,6 +833,22 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -31,7 +31,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -2026,6 +2042,7 @@ static const struct board_info __initcon
+@@ -2006,6 +2022,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
@@ -39,7 +39,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2083,6 +2100,7 @@ static struct of_device_id const bcm963x
+@@ -2064,6 +2081,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348

diff --git a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
index fb356f5..f3274a8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1988,6 +1988,108 @@ static struct board_info __initdata boar
+@@ -1968,6 +1968,108 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -109,7 +109,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2074,6 +2176,7 @@ static const struct board_info __initcon
+@@ -2054,6 +2156,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,

diff --git a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
index 7dfc7ab..986f85b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1925,6 +1925,66 @@ static struct board_info __initdata boar
+@@ -1905,6 +1905,66 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -67,7 +67,7 @@
  static struct board_info __initdata board_963269bhr = {
        .name                           = "963269BHR",
        .expected_cpu_id                = 0x63268,
-@@ -2175,6 +2235,7 @@ static const struct board_info __initcon
+@@ -2155,6 +2215,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -75,7 +75,7 @@
        &board_963269bhr,
        &board_vw6339gu,
  #endif
-@@ -2255,6 +2316,7 @@ static struct of_device_id const bcm963x
+@@ -2236,6 +2297,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

diff --git a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
index eabf468..56a620d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
@@ -10,7 +10,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1919,6 +1921,65 @@ static struct board_info __initdata boar
+@@ -1899,6 +1901,65 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -76,7 +76,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -2233,6 +2294,7 @@ static const struct board_info __initcon
+@@ -2213,6 +2274,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -84,7 +84,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963268bu_p300,
-@@ -2314,6 +2376,7 @@ static struct of_device_id const bcm963x
+@@ -2295,6 +2357,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
        { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

diff --git a/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
index cfdeab8..67f7bae 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
+++ b/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1922,6 +1922,60 @@ static struct board_info __initdata boar
+@@ -1902,6 +1902,60 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -2294,6 +2348,7 @@ static const struct board_info __initcon
+@@ -2274,6 +2328,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -69,7 +69,7 @@
        &board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2376,6 +2431,7 @@ static struct of_device_id const bcm963x
+@@ -2357,6 +2412,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
        { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

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 0bacc8c..5745e7b 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,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1976,6 +1976,60 @@ static struct board_info __initdata boar
+@@ -1956,6 +1956,60 @@ static struct board_info __initdata boar
        },
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -2349,6 +2403,7 @@ static const struct board_info __initcon
+@@ -2329,6 +2383,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
@@ -69,7 +69,7 @@
        &board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2432,6 +2487,7 @@ static struct of_device_id const bcm963x
+@@ -2413,6 +2468,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, },

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 89cb5d3..ba95950 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
-@@ -1931,6 +1931,49 @@ static struct sprom_fixup __initdata vr3
+@@ -1911,6 +1911,49 @@ static struct sprom_fixup __initdata vr3
        { .offset = 115, .value = 0xfad9 },
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_VR3025u = {
        .name                                   = "96368M-1541N",
        .expected_cpu_id                = 0x6368,
-@@ -2402,6 +2445,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,
@@ -58,7 +58,7 @@
        &board_VR3025u,
        &board_VR3025un,
        &board_WAP5813n,
-@@ -2489,6 +2533,7 @@ static struct of_device_id const bcm963x
+@@ -2470,6 +2514,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, },

diff --git a/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch b/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
index 01e1118..2d135b4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
+++ b/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1569,6 +1569,37 @@ static struct board_info __initdata boar
+@@ -1549,6 +1549,37 @@ static struct board_info __initdata boar
        },
  };
  
@@ -38,7 +38,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2429,6 +2460,7 @@ static const struct board_info __initcon
+@@ -2409,6 +2440,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_ct6373_1,
@@ -46,7 +46,7 @@
        &board_HW553,
        &board_HW556_A,
        &board_HW556_B,
-@@ -2510,6 +2542,7 @@ static struct of_device_id const bcm963x
+@@ -2491,6 +2523,7 @@ static struct of_device_id const bcm963x
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
        { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },

diff --git a/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch b/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
index b538678..91c140a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
+++ b/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
@@ -51,7 +51,7 @@
  static struct board_info __initdata board_A4001N1 = {
        .name                                   = "963281T_TEF",
        .expected_cpu_id                        = 0x6328,
-@@ -2411,6 +2455,7 @@ static const struct board_info __initcon
+@@ -2391,6 +2435,7 @@ static const struct board_info __initcon
        &board_AR5381u,
        &board_AR5387un,
        &board_963281TAN,
@@ -59,7 +59,7 @@
        &board_A4001N1,
        &board_dsl_274xb_f1,
        &board_FAST2704V2,
-@@ -2495,6 +2540,7 @@ static struct of_device_id const bcm963x
+@@ -2475,6 +2520,7 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

diff --git a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
index d7a6dfc..37c9713 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
+++ b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
@@ -142,7 +142,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2449,6 +2584,7 @@ static const struct board_info __initcon
+@@ -2429,6 +2564,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
        &board_96318ref_p300,

diff --git a/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch
index de0b20d..5ae9ec5 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch
+++ b/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2132,6 +2132,48 @@ static struct board_info __initdata boar
+@@ -2112,6 +2112,48 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -49,7 +49,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
        { .offset = 97, .value = 0xfeb3 },
        { .offset = 98, .value = 0x1618 },
-@@ -2658,6 +2700,7 @@ static const struct board_info __initcon
+@@ -2638,6 +2680,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -57,7 +57,7 @@
        &board_P870HW51A_V2,
        &board_VR3025u,
        &board_VR3025un,
-@@ -2748,6 +2791,7 @@ static struct of_device_id const bcm963x
+@@ -2729,6 +2772,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, },

diff --git a/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch
index 29d68a3..cfdf03e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -199,6 +199,40 @@ static struct board_info __initdata boar
+@@ -199,6 +199,20 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -17,31 +17,11 @@
 +              .force_speed_100        = 1,
 +              .force_duplex_full      = 1,
 +      },
-+
-+              .leds = {
-+              {
-+                      .name           = "96338W2_E7T:green:ppp",
-+                      .gpio           = 4,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96338W2_E7T:green:ppp-fail",
-+                      .gpio           = 5,
-+                      .active_low     = 1,
-+              },
-+              {
-+                      .name           = "96338W2_E7T:green:power",
-+                      .gpio           = 0,
-+                      .active_low     = 1,
-+                      .default_trigger = "default-on",
-+
-+              },
-+      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -764,6 +798,7 @@ static const struct board_info __initcon
+@@ -764,6 +778,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,
@@ -49,3 +29,11 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
+@@ -801,6 +816,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 = "d-link,dsl-2640u", .data = &board_96338w2_e7t, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6345
+       { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },

diff --git a/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch
index 5229ba8..c17b8e4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -683,6 +683,26 @@ static struct board_info __initdata boar
+@@ -663,6 +663,26 @@ static struct board_info __initdata boar
        },
  };
  
@@ -27,7 +27,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -819,6 +839,7 @@ static const struct board_info __initcon
+@@ -799,6 +819,7 @@ static const struct board_info __initcon
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
@@ -35,7 +35,7 @@
        &board_DWVS0,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
-@@ -865,6 +886,7 @@ static struct of_device_id const bcm963x
+@@ -846,6 +867,7 @@ static struct of_device_id const bcm963x
        { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
        { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
        { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },

diff --git a/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch
index 199321a..63c891b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -748,6 +748,23 @@ static struct board_info __initdata boar
+@@ -728,6 +728,23 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_nb4_ser_r0 = {
        .name                           = "NB4-SER-r0",
        .expected_cpu_id                = 0x6358,
-@@ -841,6 +858,7 @@ static const struct board_info __initcon
+@@ -821,6 +838,7 @@ static const struct board_info __initcon
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,
@@ -32,7 +32,7 @@
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
  #endif
-@@ -879,6 +897,7 @@ static struct of_device_id const bcm963x
+@@ -860,6 +878,7 @@ static struct of_device_id const bcm963x
        { .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
        { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch
index 8d36615..8919e88 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -574,6 +574,45 @@ static struct board_info __initdata boar
+@@ -554,6 +554,45 @@ static struct board_info __initdata boar
                .force_duplex_full      = 1,
        },
  };
@@ -46,7 +46,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -850,6 +889,7 @@ static const struct board_info __initcon
+@@ -830,6 +869,7 @@ static const struct board_info __initcon
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,
@@ -54,7 +54,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -890,6 +930,7 @@ static struct of_device_id const bcm963x
+@@ -871,6 +911,7 @@ static struct of_device_id const bcm963x
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
        { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
        { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

diff --git a/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
index 144775d..8785db7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -471,6 +471,66 @@ static struct board_info __initdata boar
+@@ -451,6 +451,66 @@ static struct board_info __initdata boar
        },
  };
  
@@ -67,7 +67,7 @@
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .expected_cpu_id                = 0x6348,
-@@ -882,6 +942,8 @@ static const struct board_info __initcon
+@@ -862,6 +922,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,
@@ -76,7 +76,7 @@
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
-@@ -931,6 +993,8 @@ static struct of_device_id const bcm963x
+@@ -912,6 +974,8 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
        { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
        { .compatible = "t-com,spw500v", .data = &board_spw500v, },

diff --git a/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch
index b0fd613..627ffc9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -673,6 +673,78 @@ static struct board_info __initdata boar
+@@ -653,6 +653,78 @@ static struct board_info __initdata boar
                .num_board_fixups       = ARRAY_SIZE(spw500v_fixups),
        },
  };
@@ -79,7 +79,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -952,6 +1024,7 @@ static const struct board_info __initcon
+@@ -932,6 +1004,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,

diff --git a/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch
index 02196cb..d24c5f1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -991,6 +991,34 @@ static struct board_info __initdata boar
+@@ -971,6 +971,34 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
        .num_usbh_ports                 = 2,
  };
@@ -35,7 +35,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1036,6 +1064,7 @@ static const struct board_info __initcon
+@@ -1016,6 +1044,7 @@ static const struct board_info __initcon
        &board_dsl_274xb_rev_c,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
@@ -43,7 +43,7 @@
  #endif
  };
  
-@@ -1077,6 +1106,7 @@ static struct of_device_id const bcm963x
+@@ -1058,6 +1087,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

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 1597f60..5d33349 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
-@@ -233,6 +233,21 @@ static struct board_info __initdata boar
-               },
+@@ -213,6 +213,21 @@ static struct board_info __initdata boar
+               .force_duplex_full      = 1,
        },
  };
 +
@@ -22,7 +22,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -1035,6 +1050,7 @@ static const struct board_info __initcon
+@@ -1015,6 +1030,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,
@@ -30,11 +30,11 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
-@@ -1079,6 +1095,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, },

diff --git a/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch
index 61aa2e9..24c1fbd 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1034,6 +1034,21 @@ static struct board_info __initdata boar
+@@ -1014,6 +1014,21 @@ static struct board_info __initdata boar
                .pci_dev                        = 1,
        },
  };
@@ -22,7 +22,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1081,6 +1096,7 @@ static const struct board_info __initcon
+@@ -1061,6 +1076,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_HW553,
@@ -30,7 +30,7 @@
  #endif
  };
  
-@@ -1130,6 +1146,7 @@ static struct of_device_id const bcm963x
+@@ -1111,6 +1127,7 @@ static struct of_device_id const bcm963x
        { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
        { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
        { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },

diff --git a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
index 692fba7..9f61cc9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -760,6 +760,27 @@ static struct board_info __initdata boar
+@@ -740,6 +740,27 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1084,6 +1105,7 @@ static const struct board_info __initcon
+@@ -1064,6 +1085,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -36,7 +36,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1122,6 +1144,7 @@ static struct of_device_id const bcm963x
+@@ -1103,6 +1125,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
        { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
        { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -44,7 +44,7 @@
        { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
        { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -1180,6 +1203,22 @@ void __init board_bcm963xx_init(void)
+@@ -1161,6 +1184,22 @@ void __init board_bcm963xx_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);

diff --git a/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch
index 889d002..97901aa 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -427,6 +427,25 @@ static struct board_info __initdata boar
+@@ -407,6 +407,25 @@ static struct board_info __initdata boar
        },
  };
  
@@ -26,7 +26,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1106,6 +1125,7 @@ static const struct board_info __initcon
+@@ -1086,6 +1105,7 @@ static const struct board_info __initcon
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,

diff --git a/target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch
index 0db568c..0cf686b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.18/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
-@@ -446,6 +446,34 @@ static struct board_info __initdata boar
+@@ -426,6 +426,34 @@ static struct board_info __initdata boar
  };
  
  
@@ -35,7 +35,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1126,6 +1154,7 @@ static const struct board_info __initcon
+@@ -1106,6 +1134,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,
@@ -43,7 +43,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1165,6 +1194,8 @@ static struct of_device_id const bcm963x
+@@ -1146,6 +1175,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, },

diff --git a/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch
index 5a73805..a855f79 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -984,6 +984,8 @@ static struct board_info __initdata boar
+@@ -964,6 +964,8 @@ static struct board_info __initdata boar
        .name                           = "DWV-S0",
        .expected_cpu_id                = 0x6358,
  
@@ -9,7 +9,7 @@
        .has_enet0                      = 1,
        .has_enet1                      = 1,
        .has_pci                        = 1,
-@@ -1000,6 +1002,7 @@ static struct board_info __initdata boar
+@@ -980,6 +982,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch
index b4b1476..0e96dd1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -474,6 +474,31 @@ static struct board_info __initdata boar
+@@ -454,6 +454,31 @@ static struct board_info __initdata boar
        },
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1158,6 +1183,7 @@ static const struct board_info __initcon
+@@ -1138,6 +1163,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,
@@ -40,7 +40,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1198,6 +1224,7 @@ static struct of_device_id const bcm963x
+@@ -1179,6 +1205,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
        { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
        { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },

diff --git a/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch
index 7fac28f..af5b483 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -647,6 +647,7 @@ static struct board_info __initdata boar
+@@ -627,6 +627,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  

diff --git a/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch
index b0233a1..94a53e7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -445,6 +445,27 @@ static struct board_info __initdata boar
+@@ -425,6 +425,27 @@ static struct board_info __initdata boar
        },
  };
  
@@ -28,7 +28,7 @@
  
  static struct board_info __initdata board_ct536_ct5621 = {
        .name                           = "CT536_CT5621",
-@@ -1185,6 +1206,7 @@ static const struct board_info __initcon
+@@ -1165,6 +1186,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,

diff --git a/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch
index f98c437..f9c3b73 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1170,6 +1170,59 @@ static struct board_info __initdata boar
+@@ -1150,6 +1150,59 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -70,7 +70,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1221,6 +1274,10 @@ static const struct board_info __initcon
+@@ -1201,6 +1254,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -81,7 +81,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1277,6 +1334,7 @@ static struct of_device_id const bcm963x
+@@ -1258,6 +1315,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

diff --git a/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 1df1188..0979de7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1220,6 +1220,46 @@ static struct board_info __initdata boar
+@@ -1200,6 +1200,46 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -56,7 +56,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1277,6 +1317,7 @@ static const struct board_info __initcon
+@@ -1257,6 +1297,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
@@ -64,7 +64,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  };
  
-@@ -1334,6 +1375,7 @@ static struct of_device_id const bcm963x
+@@ -1315,6 +1356,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

diff --git a/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 6b5d7d2..a4f55fb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -51,7 +51,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1298,6 +1333,7 @@ static const struct board_info __initcon
+@@ -1278,6 +1313,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -59,7 +59,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -1354,6 +1390,7 @@ static struct of_device_id const bcm963x
+@@ -1334,6 +1370,7 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

diff --git a/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch
index a5c726d..1b2e236 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch
@@ -62,7 +62,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1334,6 +1379,7 @@ static const struct board_info __initcon
+@@ -1314,6 +1359,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
@@ -70,7 +70,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -1392,6 +1438,7 @@ static struct of_device_id const bcm963x
+@@ -1372,6 +1418,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
        { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

diff --git a/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch
index eb7a53f..676f704 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -835,6 +835,25 @@ static struct board_info __initdata boar
+@@ -815,6 +815,25 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
  };
  
@@ -26,7 +26,7 @@
  static struct board_info __initdata board_96348_D4PW = {
        .name                           = "D-4P-W",
        .expected_cpu_id                = 0x6348,
-@@ -1409,6 +1428,7 @@ static const struct board_info __initcon
+@@ -1389,6 +1408,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,

diff --git a/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch
index ac24ebd..6b296ee 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1251,6 +1251,31 @@ static struct board_info __initdata boar
+@@ -1231,6 +1231,31 @@ static struct board_info __initdata boar
        .num_usbh_ports                 = 2,
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -1440,6 +1465,7 @@ static const struct board_info __initcon
+@@ -1420,6 +1445,7 @@ static const struct board_info __initcon
        &board_dsl_274xb_rev_c,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
@@ -40,7 +40,7 @@
        &board_HW553,
        &board_spw303v,
  #endif
-@@ -1493,6 +1519,7 @@ static struct of_device_id const bcm963x
+@@ -1474,6 +1500,7 @@ static struct of_device_id const bcm963x
        { .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
        { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch
index b83a966..d1c703c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1318,6 +1318,36 @@ static struct board_info __initdata boar
+@@ -1298,6 +1298,36 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
  };
@@ -37,7 +37,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1468,6 +1498,7 @@ static const struct board_info __initcon
+@@ -1448,6 +1478,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
@@ -45,7 +45,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1522,6 +1553,7 @@ static struct of_device_id const bcm963x
+@@ -1503,6 +1534,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

diff --git a/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch
index cf82d94..7788622 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch
@@ -19,7 +19,7 @@
  /*
   * known 3368 boards
   */
-@@ -1350,6 +1355,69 @@ static struct board_info __initdata boar
+@@ -1330,6 +1335,69 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -89,7 +89,7 @@
  /*
   * known 6368 boards
   */
-@@ -1501,6 +1569,10 @@ static const struct board_info __initcon
+@@ -1481,6 +1549,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
@@ -100,7 +100,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -1564,6 +1636,9 @@ static struct of_device_id const bcm963x
+@@ -1545,6 +1617,9 @@ static struct of_device_id const bcm963x
        { .compatible = "t-com,spw303v", .data = &board_spw303v, },
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif

diff --git a/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch
index 0c19a6e..ae81e31 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -776,6 +776,23 @@ static struct board_info __initdata boar
+@@ -756,6 +756,23 @@ static struct board_info __initdata boar
        .has_ehci0                      = 1,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -1540,6 +1557,7 @@ static const struct board_info __initcon
+@@ -1520,6 +1537,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
@@ -32,7 +32,7 @@
        &board_DV201AMR,
        &board_96348gw_a,
        &board_rta1025w_16,
-@@ -1612,6 +1630,7 @@ static struct of_device_id const bcm963x
+@@ -1593,6 +1611,7 @@ static struct of_device_id const bcm963x
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
        { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
        { .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

diff --git a/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch
index 40ff98b..623df6b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch
+++ b/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch
@@ -51,7 +51,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -1538,6 +1582,7 @@ static const struct board_info __initcon
+@@ -1518,6 +1562,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
@@ -59,7 +59,7 @@
        &board_dsl_274xb_f1,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1603,6 +1648,7 @@ static struct of_device_id const bcm963x
+@@ -1583,6 +1628,7 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

diff --git a/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch
index 9598ceb..d26acd8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch
+++ b/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch
@@ -80,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -1581,6 +1654,7 @@ static const struct board_info __initcon
+@@ -1561,6 +1634,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -88,7 +88,7 @@
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
-@@ -1651,6 +1725,7 @@ static struct of_device_id const bcm963x
+@@ -1631,6 +1705,7 @@ static struct of_device_id const bcm963x
        { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
        { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

diff --git a/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch
index c1984c4..959bbdf 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch
+++ b/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch
@@ -62,7 +62,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
        { .offset = 2, .value = 0x05bb },
        { .offset = 65, .value = 0x1204 },
-@@ -1654,6 +1709,7 @@ static const struct board_info __initcon
+@@ -1634,6 +1689,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -70,7 +70,7 @@
        &board_AR5387un,
        &board_963281TAN,
        &board_A4001N1,
-@@ -1725,6 +1781,7 @@ static struct of_device_id const bcm963x
+@@ -1705,6 +1761,7 @@ static struct of_device_id const bcm963x
        { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
        { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

diff --git a/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch
index a402340..15b1e98 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -544,6 +544,55 @@ static struct board_info __initdata boar
+@@ -524,6 +524,55 @@ static struct board_info __initdata boar
  
        .has_uart0                      = 1,
  };
@@ -56,7 +56,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1723,6 +1772,7 @@ static const struct board_info __initcon
+@@ -1703,6 +1752,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,

diff --git a/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch
index f1664a4..7ea7297 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/rtl8367.h>
  #include <asm/addrspace.h>
-@@ -1547,6 +1548,93 @@ static struct board_info __initdata boar
+@@ -1527,6 +1528,93 @@ static struct board_info __initdata boar
        },
  };
  
@@ -102,7 +102,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -1808,6 +1896,9 @@ static const struct board_info __initcon
+@@ -1788,6 +1876,9 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_ct6373_1,
        &board_HW553,
@@ -112,7 +112,7 @@
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -1874,6 +1965,9 @@ static struct of_device_id const bcm963x
+@@ -1855,6 +1946,9 @@ static struct of_device_id const bcm963x
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
        { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
        { .compatible = "huawei,hg553", .data = &board_HW553, },

diff --git a/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch
index eb2d0c3..510ee05 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -594,6 +594,60 @@ static struct board_info __initdata boar
+@@ -574,6 +574,60 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -61,7 +61,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1861,6 +1915,7 @@ static const struct board_info __initcon
+@@ -1841,6 +1895,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,

diff --git a/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch
index adef676..765dbc4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch
@@ -57,7 +57,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1905,6 +1943,7 @@ static const struct board_info __initcon
+@@ -1885,6 +1923,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
@@ -65,7 +65,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -1980,6 +2019,7 @@ static struct of_device_id const bcm963x
+@@ -1960,6 +1999,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
        { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
        { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },

diff --git a/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch
index 55c754a..7c87752 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch
@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1834,6 +1834,43 @@ static struct board_info __initdata boar
+@@ -1814,6 +1814,43 @@ static struct board_info __initdata boar
        .devs = nb6_devices,
        .num_devs = ARRAY_SIZE(nb6_devices),
  };
@@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1999,6 +2036,7 @@ static const struct board_info __initcon
+@@ -1979,6 +2016,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
@@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2073,6 +2111,7 @@ static struct of_device_id const bcm963x
+@@ -2054,6 +2092,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362

diff --git a/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
index d4365f9..4ab0033 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
+++ b/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
@@ -132,7 +132,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96338w2_e7t = {
-@@ -705,36 +610,6 @@ static struct board_info __initdata boar
+@@ -685,36 +590,6 @@ static struct board_info __initdata boar
                .has_phy                = 1,
                .use_internal_phy       = 1,
        },
@@ -169,7 +169,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw_10 = {
-@@ -767,35 +642,6 @@ static struct board_info __initdata boar
+@@ -747,35 +622,6 @@ static struct board_info __initdata boar
                .cs                     = 2,
                .ext_irq                = 2,
        },
@@ -205,7 +205,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw_11 = {
-@@ -822,35 +668,6 @@ static struct board_info __initdata boar
+@@ -802,35 +648,6 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
@@ -241,7 +241,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  
-@@ -974,35 +791,6 @@ static struct board_info __initdata boar
+@@ -954,35 +771,6 @@ static struct board_info __initdata boar
                .ext_irq                = 2,
                .cs                     = 2,
        },
@@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_gw6200 = {
-@@ -1367,33 +1155,6 @@ static struct board_info __initdata boar
+@@ -1347,33 +1135,6 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
@@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96358vw2 = {
-@@ -1421,29 +1182,6 @@ static struct board_info __initdata boar
+@@ -1401,29 +1162,6 @@ static struct board_info __initdata boar
        .has_pccard = 1,
        .has_ehci0 = 1,
        .num_usbh_ports                 = 2,

diff --git a/target/linux/brcm63xx/patches-3.18/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.18/553-boards_probe_switch.patch
index 7bff76a..433a0d9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.18/553-boards_probe_switch.patch
@@ -11,7 +11,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -627,6 +631,8 @@ static struct board_info __initdata boar
+@@ -607,6 +611,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -20,7 +20,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -660,6 +666,8 @@ static struct board_info __initdata boar
+@@ -640,6 +646,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -29,7 +29,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -807,6 +815,8 @@ static struct board_info __initdata boar
+@@ -787,6 +795,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -38,7 +38,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -869,6 +879,8 @@ static struct board_info __initdata boar
+@@ -849,6 +859,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -47,7 +47,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -910,6 +922,8 @@ static struct board_info __initdata boar
+@@ -890,6 +902,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -56,7 +56,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -932,6 +946,8 @@ static struct board_info __initdata boar
+@@ -912,6 +926,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -65,7 +65,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -952,6 +968,8 @@ static struct board_info __initdata boar
+@@ -932,6 +948,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -74,7 +74,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1173,6 +1191,8 @@ static struct board_info __initdata boar
+@@ -1153,6 +1171,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -83,7 +83,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1244,6 +1264,12 @@ static struct board_info __initdata boar
+@@ -1224,6 +1244,12 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {

diff --git a/target/linux/brcm63xx/patches-3.18/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.18/555-board_96318ref.patch
index c179bba..9aff643 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.18/555-board_96318ref.patch
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1737,6 +1824,9 @@ static const struct board_info __initcon
+@@ -1717,6 +1804,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif

diff --git a/target/linux/brcm63xx/patches-3.18/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.18/556-board_96318ref_p300.patch
index 83eaa29..7554305 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.18/556-board_96318ref_p300.patch
@@ -95,7 +95,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1826,6 +1914,7 @@ static const struct board_info __initcon
+@@ -1806,6 +1894,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,

diff --git a/target/linux/brcm63xx/patches-3.18/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.18/557-board_bcm963269bhr.patch
index f0465ab..9cb5cd6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.18/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1906,6 +1906,75 @@ static struct board_info __initdata boar
+@@ -1886,6 +1886,75 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1986,6 +2055,9 @@ static const struct board_info __initcon
+@@ -1966,6 +2035,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif

diff --git a/target/linux/brcm63xx/patches-3.18/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.18/558-board_AR1004G.patch
index d72974e..0f66d0c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-3.18/558-board_AR1004G.patch
@@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -853,6 +853,22 @@ static struct board_info __initdata boar
+@@ -833,6 +833,22 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -31,7 +31,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -2026,6 +2042,7 @@ static const struct board_info __initcon
+@@ -2006,6 +2022,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
@@ -39,7 +39,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2083,6 +2100,7 @@ static struct of_device_id const bcm963x
+@@ -2064,6 +2081,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348

diff --git a/target/linux/brcm63xx/patches-3.18/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.18/559-board_vw6339gu.patch
index fb356f5..f3274a8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-3.18/559-board_vw6339gu.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1988,6 +1988,108 @@ static struct board_info __initdata boar
+@@ -1968,6 +1968,108 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -109,7 +109,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2074,6 +2176,7 @@ static const struct board_info __initcon
+@@ -2054,6 +2156,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,

diff --git a/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
index 7dfc7ab..986f85b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1925,6 +1925,66 @@ static struct board_info __initdata boar
+@@ -1905,6 +1905,66 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -67,7 +67,7 @@
  static struct board_info __initdata board_963269bhr = {
        .name                           = "963269BHR",
        .expected_cpu_id                = 0x63268,
-@@ -2175,6 +2235,7 @@ static const struct board_info __initcon
+@@ -2155,6 +2215,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -75,7 +75,7 @@
        &board_963269bhr,
        &board_vw6339gu,
  #endif
-@@ -2255,6 +2316,7 @@ static struct of_device_id const bcm963x
+@@ -2236,6 +2297,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

diff --git a/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch
index eabf468..56a620d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch
@@ -10,7 +10,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1919,6 +1921,65 @@ static struct board_info __initdata boar
+@@ -1899,6 +1901,65 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -76,7 +76,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -2233,6 +2294,7 @@ static const struct board_info __initcon
+@@ -2213,6 +2274,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -84,7 +84,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963268bu_p300,
-@@ -2314,6 +2376,7 @@ static struct of_device_id const bcm963x
+@@ -2295,6 +2357,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
        { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

diff --git a/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch
index cfdeab8..67f7bae 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch
+++ b/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1922,6 +1922,60 @@ static struct board_info __initdata boar
+@@ -1902,6 +1902,60 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -2294,6 +2348,7 @@ static const struct board_info __initcon
+@@ -2274,6 +2328,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -69,7 +69,7 @@
        &board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2376,6 +2431,7 @@ static struct of_device_id const bcm963x
+@@ -2357,6 +2412,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
        { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

diff --git a/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch
index 0bacc8c..5745e7b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch
+++ b/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1976,6 +1976,60 @@ static struct board_info __initdata boar
+@@ -1956,6 +1956,60 @@ static struct board_info __initdata boar
        },
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -2349,6 +2403,7 @@ static const struct board_info __initcon
+@@ -2329,6 +2383,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
@@ -69,7 +69,7 @@
        &board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2432,6 +2487,7 @@ static struct of_device_id const bcm963x
+@@ -2413,6 +2468,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, },

diff --git a/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch
index 89cb5d3..ba95950 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch
+++ b/target/linux/brcm63xx/patches-3.18/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
-@@ -1931,6 +1931,49 @@ static struct sprom_fixup __initdata vr3
+@@ -1911,6 +1911,49 @@ static struct sprom_fixup __initdata vr3
        { .offset = 115, .value = 0xfad9 },
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_VR3025u = {
        .name                                   = "96368M-1541N",
        .expected_cpu_id                = 0x6368,
-@@ -2402,6 +2445,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,
@@ -58,7 +58,7 @@
        &board_VR3025u,
        &board_VR3025un,
        &board_WAP5813n,
-@@ -2489,6 +2533,7 @@ static struct of_device_id const bcm963x
+@@ -2470,6 +2514,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, },

diff --git a/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch b/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch
index 01e1118..2d135b4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch
+++ b/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1569,6 +1569,37 @@ static struct board_info __initdata boar
+@@ -1549,6 +1549,37 @@ static struct board_info __initdata boar
        },
  };
  
@@ -38,7 +38,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2429,6 +2460,7 @@ static const struct board_info __initcon
+@@ -2409,6 +2440,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_ct6373_1,
@@ -46,7 +46,7 @@
        &board_HW553,
        &board_HW556_A,
        &board_HW556_B,
-@@ -2510,6 +2542,7 @@ static struct of_device_id const bcm963x
+@@ -2491,6 +2523,7 @@ static struct of_device_id const bcm963x
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
        { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },

diff --git a/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch b/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch
index b538678..91c140a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch
+++ b/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch
@@ -51,7 +51,7 @@
  static struct board_info __initdata board_A4001N1 = {
        .name                                   = "963281T_TEF",
        .expected_cpu_id                        = 0x6328,
-@@ -2411,6 +2455,7 @@ static const struct board_info __initcon
+@@ -2391,6 +2435,7 @@ static const struct board_info __initcon
        &board_AR5381u,
        &board_AR5387un,
        &board_963281TAN,
@@ -59,7 +59,7 @@
        &board_A4001N1,
        &board_dsl_274xb_f1,
        &board_FAST2704V2,
-@@ -2495,6 +2540,7 @@ static struct of_device_id const bcm963x
+@@ -2475,6 +2520,7 @@ static struct of_device_id const bcm963x
        { .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

diff --git a/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch
index d7a6dfc..37c9713 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch
+++ b/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch
@@ -142,7 +142,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2449,6 +2584,7 @@ static const struct board_info __initcon
+@@ -2429,6 +2564,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
        &board_96318ref_p300,

diff --git a/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch
index de0b20d..5ae9ec5 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch
+++ b/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2132,6 +2132,48 @@ static struct board_info __initdata boar
+@@ -2112,6 +2112,48 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -49,7 +49,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
        { .offset = 97, .value = 0xfeb3 },
        { .offset = 98, .value = 0x1618 },
-@@ -2658,6 +2700,7 @@ static const struct board_info __initcon
+@@ -2638,6 +2680,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -57,7 +57,7 @@
        &board_P870HW51A_V2,
        &board_VR3025u,
        &board_VR3025un,
-@@ -2748,6 +2791,7 @@ static struct of_device_id const bcm963x
+@@ -2729,6 +2772,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, },

diff --git a/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch b/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch
index 62b06d9..429d0be 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch
+++ b/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1748,6 +1748,32 @@ static struct board_info __initdata boar
+@@ -1728,6 +1728,32 @@ static struct board_info __initdata boar
        },
  };
  
@@ -33,7 +33,7 @@
  static struct board_info __initdata board_HW520 = {
        .name                           = "HW6358GW_B",
        .expected_cpu_id                = 0x6358,
-@@ -2683,6 +2709,7 @@ static const struct board_info __initcon
+@@ -2663,6 +2689,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_ct6373_1,
@@ -41,7 +41,7 @@
        &board_HW520,
        &board_HW553,
        &board_HW556_A,
-@@ -2780,6 +2807,7 @@ static struct of_device_id const bcm963x
+@@ -2761,6 +2788,7 @@ static struct of_device_id const bcm963x
        { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
        { .compatible = "t-com,spw303v", .data = &board_spw303v, },
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },

diff --git a/target/linux/brcm63xx/profiles/d-link.mk b/target/linux/brcm63xx/profiles/d-link.mk
index 71f6421..ede72b2 100644 (file)
--- a/target/linux/brcm63xx/profiles/d-link.mk
+++ b/target/linux/brcm63xx/profiles/d-link.mk
@@ -14,6 +14,15 @@ define Profile/DSL2640B_B/Description
 endef
 $(eval $(call Profile,DSL2640B_B))
 
+define Profile/DSL2640U
+  NAME:=D-Link DSL-2640U/BRU/C
+  PACKAGES:=kmod-b43 wpad-mini
+endef
+define Profile/DSL2640U/Description
+  Package set optimized for DSL-2640U
+endef
+$(eval $(call Profile,DSL2640U))
+
 define Profile/DSL2650U
   NAME:=D-Link DSL-2650U
   PACKAGES:=kmod-b43 wpad-mini\