Also build image again(?).
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 44988
"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"
;;
local board_name
case "$1" in
- 96338W2_E7T)
- board_name="dsl-2640u"
- ;;
96348W3)
board_name="dg834g_v4"
;;
--- /dev/null
+/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>;
+ };
+};
$(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
--- 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
},
},
};
+ .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,
#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, },
--- 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
},
};
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,
&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, },
--- 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,
};
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,
&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, },
--- 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,
},
};
#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,
#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, },
--- 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
},
};
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,
&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, },
--- 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),
},
};
#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,
--- 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,
};
#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,
#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, },
--- 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,
},
};
+
#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,
#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, },
--- 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,
},
};
#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,
#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, },
--- 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
},
},
};
#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,
#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, },
{ .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);
--- 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
},
};
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,
--- 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
};
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,
#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, },
--- 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,
.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,
--- 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
},
};
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,
#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, },
--- 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,
--- 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
},
};
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,
--- 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 */
/*
* 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
};
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
--- 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,
};
#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,
#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
#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,
#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
#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,
#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, },
--- 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,
};
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,
--- 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,
};
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,
&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, },
--- 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,
},
};
#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,
#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, },
/*
* 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 */
/*
* 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
#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
--- 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,
};
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,
&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, },
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,
&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
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,
&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, },
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,
&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, },
--- 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,
};
#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,
#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
},
};
/* 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,
&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, },
--- 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
},
},
};
#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,
#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,
#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, },
---
--- 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),
};
#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,
#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
};
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,
},
};
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,
},
};
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,
};
-@@ -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,
},
};
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,
};
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,
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
* 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
#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,
--- 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 */
/*
* 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
---
--- 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,
};
/* 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,
#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
--- 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
},
},
};
#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,
--- 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
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
&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
#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,
};
#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,
#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, },
--- 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,
};
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,
&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, },
--- 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
},
};
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,
&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, },
--- 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 },
};
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,
&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, },
--- 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
},
};
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,
&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, },
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,
&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
#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,
--- 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,
};
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,
&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, },
--- 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
},
},
};
+ .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,
#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, },
--- 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
},
};
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,
&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, },
--- 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,
};
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,
&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, },
--- 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,
},
};
#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,
#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, },
--- 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
},
};
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,
&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, },
--- 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),
},
};
#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,
--- 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,
};
#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,
#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, },
--- 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,
},
};
+
#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,
#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, },
--- 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,
},
};
#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,
#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, },
--- 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
},
},
};
#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,
#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, },
{ .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);
--- 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
},
};
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,
--- 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
};
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,
#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, },
--- 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,
.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,
--- 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
},
};
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,
#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, },
--- 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,
--- 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
},
};
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,
--- 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 */
/*
* 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
};
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
--- 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,
};
#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,
#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
#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,
#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
#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,
#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, },
--- 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,
};
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,
--- 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,
};
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,
&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, },
--- 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,
},
};
#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,
#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, },
/*
* 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 */
/*
* 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
#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
--- 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,
};
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,
&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, },
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,
&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
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,
&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, },
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,
&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, },
--- 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,
};
#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,
#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
},
};
/* 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,
&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, },
--- 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
},
},
};
#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,
#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,
#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, },
---
--- 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),
};
#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,
#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
};
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,
},
};
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,
},
};
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,
};
-@@ -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,
},
};
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,
};
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,
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
.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 = {
* 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
#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,
--- 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 */
/*
* 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
---
--- 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,
};
/* 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,
#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
--- 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
},
},
};
#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,
--- 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
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
&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
#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,
};
#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,
#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, },
--- 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,
};
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,
&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, },
--- 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
},
};
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,
&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, },
--- 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 },
};
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,
&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, },
--- 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
},
};
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,
&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, },
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,
&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
#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,
--- 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,
};
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,
&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, },
--- 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
},
};
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,
&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, },
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\
projects / openwrt / openwrt.git / commitdiff