All boards with EHCI enabled should also have OHCI enabled.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -50,6 +50,52 @@ static struct board_info __initdata boar
+@@ -50,6 +50,53 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_3368 */
/*
+ .expected_cpu_id = 0x6318,
+
+ .has_pci = 1,
++ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+ .num_usbh_ports = 1,
+
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1427,6 +1473,9 @@ static const struct board_info __initcon
+@@ -1427,6 +1474,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif /* CONFIG_BCM63XX_CPU_3368 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5381u,
-@@ -1501,6 +1550,9 @@ static struct of_device_id const bcm963x
+@@ -1501,6 +1551,9 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_3368
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -93,6 +93,47 @@ static struct board_info __initdata boar
+@@ -94,6 +94,48 @@ static struct board_info __initdata boar
},
},
};
+ .expected_cpu_id = 0x6318,
+
+ .has_pci = 1,
++ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+ .num_usbh_ports = 1,
+
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -1475,6 +1516,7 @@ static const struct board_info __initcon
+@@ -1476,6 +1518,7 @@ static const struct board_info __initcon
#endif /* CONFIG_BCM63XX_CPU_3368 */
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
#endif /* CONFIG_BCM63XX_CPU_6318 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -1552,6 +1594,7 @@ static struct of_device_id const bcm963x
+@@ -1553,6 +1596,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1508,6 +1508,45 @@ static struct board_info __initdata boar
+@@ -1510,6 +1510,46 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
+ .expected_cpu_id = 0x63268,
+
+ .has_pci = 1,
++ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+
+ .has_enetsw = 1,
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1585,6 +1624,9 @@ static const struct board_info __initcon
+@@ -1587,6 +1627,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif /* CONFIG_BCM63XX_CPU_6368 */
};
static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1672,6 +1714,7 @@ static struct of_device_id const bcm963x
+@@ -1674,6 +1717,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -633,6 +633,21 @@ static struct board_info __initdata boar
+@@ -635,6 +635,21 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
/* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = {
.name = "V2110",
-@@ -1598,6 +1613,7 @@ static const struct board_info __initcon
+@@ -1601,6 +1616,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
#endif /* CONFIG_BCM63XX_CPU_6348 */
#ifdef CONFIG_BCM63XX_CPU_6358
&board_96358vw,
-@@ -1659,6 +1675,7 @@ static struct of_device_id const bcm963x
+@@ -1662,6 +1678,7 @@ static struct of_device_id const bcm963x
{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1559,6 +1559,48 @@ static struct board_info __initdata boar
+@@ -1562,6 +1562,48 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
-@@ -1642,6 +1684,7 @@ static const struct board_info __initcon
+@@ -1645,6 +1687,7 @@ static const struct board_info __initcon
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
#endif /* CONFIG_BCM63XX_CPU_63268 */
};
-@@ -1732,6 +1775,7 @@ static struct of_device_id const bcm963x
+@@ -1735,6 +1778,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1526,6 +1526,65 @@ static struct board_info __initdata boar
+@@ -1528,6 +1528,65 @@ 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,
-@@ -1683,6 +1742,7 @@ static const struct board_info __initcon
+@@ -1686,6 +1745,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
&board_vw6339gu,
#endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -1774,6 +1834,7 @@ static struct of_device_id const bcm963x
+@@ -1777,6 +1837,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>
-@@ -1520,6 +1522,47 @@ static struct board_info __initdata boar
+@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
-@@ -1740,6 +1783,7 @@ static const struct board_info __initcon
+@@ -1743,6 +1786,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
-@@ -1832,6 +1876,7 @@ static struct of_device_id const bcm963x
+@@ -1835,6 +1879,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
-@@ -1523,6 +1523,59 @@ static struct board_info __initdata boar
+@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -1783,6 +1836,7 @@ static const struct board_info __initcon
+@@ -1786,6 +1839,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_WAP5813n,
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1876,6 +1930,7 @@ static struct of_device_id const bcm963x
+@@ -1879,6 +1933,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
-@@ -1576,6 +1576,59 @@ static struct board_info __initdata boar
+@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -1837,6 +1890,7 @@ static const struct board_info __initcon
+@@ -1840,6 +1893,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
&board_WAP5813n,
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1931,6 +1985,7 @@ static struct of_device_id const bcm963x
+@@ -1934,6 +1988,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
-@@ -1532,6 +1532,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3
{ .offset = 115, .value = 0xfad9 },
};
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -1889,6 +1931,7 @@ static const struct board_info __initcon
+@@ -1892,6 +1934,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
-@@ -1987,6 +2030,7 @@ static struct of_device_id const bcm963x
+@@ -1990,6 +2033,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
-@@ -1234,6 +1234,36 @@ static struct board_info __initdata boar
+@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -1917,6 +1947,7 @@ static const struct board_info __initcon
+@@ -1920,6 +1950,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,
-@@ -2007,6 +2038,7 @@ static struct of_device_id const bcm963x
+@@ -2010,6 +2041,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, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -341,6 +341,49 @@ static struct board_info __initdata boar
+@@ -343,6 +343,49 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
-@@ -1899,6 +1942,7 @@ static const struct board_info __initcon
+@@ -1902,6 +1945,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
-@@ -1984,6 +2028,7 @@ static struct of_device_id const bcm963x
+@@ -1987,6 +2031,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -136,6 +136,72 @@ static struct board_info __initdata boar
+@@ -138,6 +138,72 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -1936,6 +2002,7 @@ static const struct board_info __initcon
+@@ -1939,6 +2005,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
#endif /* CONFIG_BCM63XX_CPU_6318 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2026,6 +2093,7 @@ static struct of_device_id const bcm963x
+@@ -2029,6 +2096,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1662,6 +1662,30 @@ static struct board_info __initdata boar
+@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2073,6 +2097,7 @@ static const struct board_info __initcon
+@@ -2076,6 +2100,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2175,6 +2200,7 @@ static struct of_device_id const bcm963x
+@@ -2178,6 +2203,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
-@@ -1343,6 +1343,31 @@ static struct board_info __initdata boar
+@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_HW520 = {
.name = "HW6358GW_B",
.expected_cpu_id = 0x6358,
-@@ -2082,6 +2107,7 @@ static const struct board_info __initcon
+@@ -2085,6 +2110,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,
-@@ -2189,6 +2215,7 @@ static struct of_device_id const bcm963x
+@@ -2192,6 +2218,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1711,6 +1711,52 @@ static struct board_info __initdata boar
+@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2124,6 +2170,7 @@ static const struct board_info __initcon
+@@ -2127,6 +2173,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2227,6 +2274,7 @@ static struct of_device_id const bcm963x
+@@ -2230,6 +2277,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
-@@ -202,6 +202,44 @@ static struct board_info __initdata boar
+@@ -204,6 +204,44 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
},
};
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2098,6 +2136,7 @@ static const struct board_info __initcon
+@@ -2101,6 +2139,7 @@ static const struct board_info __initcon
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
#endif /* CONFIG_BCM63XX_CPU_6318 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2192,6 +2231,7 @@ static struct of_device_id const bcm963x
+@@ -2195,6 +2234,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1943,6 +1943,59 @@ static struct board_info __initdata boar
+@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -2213,6 +2266,7 @@ static const struct board_info __initcon
+@@ -2216,6 +2269,7 @@ static const struct board_info __initcon
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2313,6 +2367,7 @@ static struct of_device_id const bcm963x
+@@ -2316,6 +2370,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -610,6 +610,50 @@ static struct board_info __initdata boar
+@@ -612,6 +612,50 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -2200,6 +2244,7 @@ static const struct board_info __initcon
+@@ -2203,6 +2247,7 @@ static const struct board_info __initcon
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
#endif /* CONFIG_BCM63XX_CPU_6328 */
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -2295,6 +2340,7 @@ static struct of_device_id const bcm963x
+@@ -2298,6 +2343,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-f1", .data = &board_dsl_274xb_f1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1839,6 +1839,52 @@ static struct board_info __initdata boar
+@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2307,6 +2353,7 @@ static const struct board_info __initcon
+@@ -2310,6 +2356,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
-@@ -2415,6 +2462,7 @@ static struct of_device_id const bcm963x
+@@ -2418,6 +2465,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1793,6 +1793,43 @@ static struct board_info __initdata boar
+@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_HG655b = {
.name = "HW65x",
.expected_cpu_id = 0x6368,
-@@ -2353,6 +2390,7 @@ static const struct board_info __initcon
+@@ -2356,6 +2393,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
-@@ -2465,6 +2503,7 @@ static struct of_device_id const bcm963x
+@@ -2468,6 +2506,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,echolife-hg622", .data = &board_HG622, },
{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1693,6 +1693,48 @@ static struct board_info __initdata boar
+@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar
* known 6368 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6368
static struct board_info __initdata board_96368mvwg = {
.name = "96368MVWG",
.expected_cpu_id = 0x6368,
-@@ -2387,6 +2429,7 @@ static const struct board_info __initcon
+@@ -2390,6 +2432,7 @@ static const struct board_info __initcon
&board_fast2504n,
#endif /* CONFIG_BCM63XX_CPU_6362 */
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
-@@ -2494,6 +2537,7 @@ static struct of_device_id const bcm963x
+@@ -2497,6 +2540,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2165,6 +2165,106 @@ static struct board_info __initdata boar
+@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -2437,6 +2537,7 @@ static const struct board_info __initcon
+@@ -2440,6 +2540,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
&board_VR3026e,
-@@ -2548,6 +2649,7 @@ static struct of_device_id const bcm963x
+@@ -2551,6 +2652,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2015,6 +2015,29 @@ static struct board_info __initdata boar
+@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -2537,6 +2560,7 @@ static const struct board_info __initcon
+@@ -2540,6 +2563,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
&board_VH4032N,
&board_VR3025u,
&board_VR3025un,
-@@ -2638,6 +2662,7 @@ static struct of_device_id const bcm963x
+@@ -2641,6 +2665,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -137,6 +137,65 @@ static struct board_info __initdata boar
+@@ -139,6 +139,65 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
{ .offset = 96, .value = 0x2046 },
{ .offset = 97, .value = 0xfe9d },
-@@ -2480,6 +2539,7 @@ static const struct board_info __initcon
+@@ -2483,6 +2542,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
&board_FAST2704N,
#endif /* CONFIG_BCM63XX_CPU_6318 */
-@@ -2582,6 +2642,7 @@ static struct of_device_id const bcm963x
+@@ -2585,6 +2645,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -345,6 +345,71 @@ static struct board_info __initdata boar
+@@ -347,6 +347,71 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata ar5381u_fixups[] = {
{ .offset = 97, .value = 0xfee5 },
{ .offset = 98, .value = 0x157c },
-@@ -2545,6 +2610,7 @@ static const struct board_info __initcon
+@@ -2548,6 +2613,7 @@ static const struct board_info __initcon
#endif /* CONFIG_BCM63XX_CPU_6318 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
-@@ -2656,6 +2722,8 @@ static struct of_device_id const bcm963x
+@@ -2659,6 +2725,8 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
{ .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, },
{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2592,6 +2592,42 @@ static struct board_info __initdata boar
+@@ -2595,6 +2595,42 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
-@@ -2697,6 +2733,7 @@ static const struct board_info __initcon
+@@ -2700,6 +2736,7 @@ static const struct board_info __initcon
&board_963268bu_p300,
&board_963269bhr,
&board_vw6339gu,
#endif /* CONFIG_BCM63XX_CPU_63268 */
};
-@@ -2810,6 +2847,7 @@ static struct of_device_id const bcm963x
+@@ -2813,6 +2850,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2551,6 +2551,41 @@ static struct board_info __initdata boar
+@@ -2554,6 +2554,41 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_vw6339gu = {
.name = "VW6339GU",
.expected_cpu_id = 0x63268,
-@@ -2732,6 +2767,7 @@ static const struct board_info __initcon
+@@ -2735,6 +2770,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
&board_963269bhr,
&board_vw6339gu,
&board_BSKYB_63168,
#endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -2846,6 +2882,7 @@ static struct of_device_id const bcm963x
+@@ -2849,6 +2885,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1781,6 +1781,30 @@ static struct board_info __initdata boar
+@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_fast2504n = {
.name = "F@ST2504n",
.expected_cpu_id = 0x6362,
-@@ -2746,6 +2770,7 @@ static const struct board_info __initcon
+@@ -2749,6 +2773,7 @@ static const struct board_info __initcon
#endif /* CONFIG_BCM63XX_CPU_6358 */
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
&board_fast2504n,
#endif /* CONFIG_BCM63XX_CPU_6362 */
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2860,6 +2885,7 @@ static struct of_device_id const bcm963x
+@@ -2863,6 +2888,7 @@ static struct of_device_id const bcm963x
{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2575,6 +2575,31 @@ static struct board_info __initdata boar
+@@ -2578,6 +2578,31 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_VR3032u = {
.name = "963168M-1841N1",
.expected_cpu_id = 0x63268,
-@@ -2792,6 +2817,7 @@ static const struct board_info __initcon
+@@ -2795,6 +2820,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
&board_963269bhr,
&board_VR3032u,
&board_vw6339gu,
&board_BSKYB_63168,
-@@ -2908,6 +2934,7 @@ static struct of_device_id const bcm963x
+@@ -2911,6 +2937,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1835,6 +1835,37 @@ static struct board_info __initdata boar
+@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
-@@ -2797,6 +2828,7 @@ static const struct board_info __initcon
+@@ -2800,6 +2831,7 @@ static const struct board_info __initcon
&board_nb6,
&board_dgnd3700v2,
&board_fast2504n,
#endif /* CONFIG_BCM63XX_CPU_6362 */
#ifdef CONFIG_BCM63XX_CPU_6368
&board_AV4202N,
-@@ -2911,6 +2943,7 @@ static struct of_device_id const bcm963x
+@@ -2914,6 +2946,7 @@ static struct of_device_id const bcm963x
{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -612,6 +612,49 @@ static struct board_info __initdata boar
+@@ -614,6 +614,49 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
-@@ -2766,6 +2809,7 @@ static const struct board_info __initcon
+@@ -2769,6 +2812,7 @@ static const struct board_info __initcon
&board_AR5387un,
&board_963281TAN,
&board_A4001N,
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
-@@ -2871,6 +2915,7 @@ static struct of_device_id const bcm963x
+@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6328
{ .compatible = "adb,a4001n", .data = &board_A4001N, },
{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2786,6 +2786,36 @@ static struct board_info __initdata boar
+@@ -2789,6 +2789,36 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
-@@ -2897,6 +2927,7 @@ static const struct board_info __initcon
+@@ -2900,6 +2930,7 @@ static const struct board_info __initcon
&board_VR3032u,
&board_vw6339gu,
&board_BSKYB_63168,
#endif /* CONFIG_BCM63XX_CPU_63268 */
};
-@@ -3015,6 +3046,8 @@ static struct of_device_id const bcm963x
+@@ -3018,6 +3049,8 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vg-8050", .data = &board_VG8050, },
{ .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, },
{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },