D-Link DSL-274XB rev F1 has an active high ath9k LED.
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
-@@ -168,6 +168,51 @@ static struct board_info __initdata boar
+@@ -168,6 +168,52 @@ static struct board_info __initdata boar
},
},
};
+ .caldata_offset = 0x7d1000,
+ .slot = 0,
+ .led_pin = -1,
++ .led_active_high = 1,
+ },
+ },
+
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -1298,6 +1343,7 @@ static const struct board_info __initcon
+@@ -1298,6 +1344,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -1356,6 +1402,7 @@ static struct of_device_id const bcm963x
+@@ -1356,6 +1403,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
-@@ -829,6 +829,25 @@ static struct board_info __initdata boar
+@@ -830,6 +830,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,
-@@ -1373,6 +1392,7 @@ static const struct board_info __initcon
+@@ -1374,6 +1393,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1428,6 +1448,7 @@ static struct of_device_id const bcm963x
+@@ -1429,6 +1449,7 @@ static struct of_device_id const bcm963x
{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1215,6 +1215,31 @@ static struct board_info __initdata boar
+@@ -1216,6 +1216,31 @@ static struct board_info __initdata boar
.num_usbh_ports = 2,
};
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -1404,6 +1429,7 @@ static const struct board_info __initcon
+@@ -1405,6 +1430,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
-@@ -1462,6 +1488,7 @@ static struct of_device_id const bcm963x
+@@ -1463,6 +1489,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
-@@ -1282,6 +1282,36 @@ static struct board_info __initdata boar
+@@ -1283,6 +1283,36 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
};
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
-@@ -1432,6 +1462,7 @@ static const struct board_info __initcon
+@@ -1433,6 +1463,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1491,6 +1522,7 @@ static struct of_device_id const bcm963x
+@@ -1492,6 +1523,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
*/
-@@ -1314,6 +1319,69 @@ static struct board_info __initdata boar
+@@ -1315,6 +1320,69 @@ static struct board_info __initdata boar
};
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
* known 6368 boards
*/
-@@ -1465,6 +1533,10 @@ static const struct board_info __initcon
+@@ -1466,6 +1534,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -1533,6 +1605,9 @@ static struct of_device_id const bcm963x
+@@ -1534,6 +1606,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
-@@ -764,6 +764,23 @@ static struct board_info __initdata boar
+@@ -765,6 +765,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,
-@@ -1504,6 +1521,7 @@ static const struct board_info __initcon
+@@ -1505,6 +1522,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
-@@ -1579,6 +1597,7 @@ static struct of_device_id const bcm963x
+@@ -1580,6 +1598,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -1502,6 +1546,7 @@ static const struct board_info __initcon
+@@ -1503,6 +1547,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
-@@ -1567,6 +1612,7 @@ static struct of_device_id const bcm963x
+@@ -1568,6 +1613,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,
-@@ -1545,6 +1618,7 @@ static const struct board_info __initcon
+@@ -1546,6 +1619,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
-@@ -1615,6 +1689,7 @@ static struct of_device_id const bcm963x
+@@ -1616,6 +1690,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 },
-@@ -1618,6 +1673,7 @@ static const struct board_info __initcon
+@@ -1619,6 +1674,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5387un,
&board_963281TAN,
&board_A4001N1,
-@@ -1689,6 +1745,7 @@ static struct of_device_id const bcm963x
+@@ -1690,6 +1746,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
-@@ -524,6 +524,22 @@ static struct board_info __initdata boar
+@@ -525,6 +525,22 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
-@@ -1687,6 +1703,7 @@ static const struct board_info __initcon
+@@ -1688,6 +1704,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
-@@ -1757,6 +1774,7 @@ static struct of_device_id const bcm963x
+@@ -1758,6 +1775,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
#include <linux/platform_device.h>
#include <linux/rtl8367.h>
#include <asm/addrspace.h>
-@@ -1478,6 +1479,95 @@ static struct board_info __initdata boar
+@@ -1479,6 +1480,95 @@ static struct board_info __initdata boar
},
};
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -1739,6 +1829,9 @@ static const struct board_info __initcon
+@@ -1740,6 +1830,9 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -1811,6 +1904,9 @@ static struct of_device_id const bcm963x
+@@ -1812,6 +1905,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
-@@ -541,6 +541,27 @@ static struct board_info __initdata boar
+@@ -542,6 +542,27 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
};
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
-@@ -1794,6 +1815,7 @@ static const struct board_info __initcon
+@@ -1795,6 +1816,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
-@@ -1868,6 +1890,7 @@ static struct of_device_id const bcm963x
+@@ -1869,6 +1891,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6345
{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -391,6 +391,44 @@ static struct board_info __initdata boar
+@@ -392,6 +392,44 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -1805,6 +1843,7 @@ static const struct board_info __initcon
+@@ -1806,6 +1844,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -1880,6 +1919,7 @@ static struct of_device_id const bcm963x
+@@ -1881,6 +1920,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
-@@ -1734,6 +1734,43 @@ static struct board_info __initdata boar
+@@ -1735,6 +1735,43 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
-@@ -1899,6 +1936,7 @@ static const struct board_info __initcon
+@@ -1900,6 +1937,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1980,6 +2018,7 @@ static struct of_device_id const bcm963x
+@@ -1981,6 +2019,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362
.has_enetsw = 1,
.enetsw = {
-@@ -449,35 +412,6 @@ static struct board_info __initdata boar
+@@ -450,35 +413,6 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
};
static struct board_info __initdata board_96338w = {
-@@ -492,35 +426,6 @@ static struct board_info __initdata boar
+@@ -493,35 +427,6 @@ static struct board_info __initdata boar
.force_speed_100 = 1,
.force_duplex_full = 1,
},
};
static struct board_info __initdata board_96338w2_e7t = {
-@@ -619,36 +524,6 @@ static struct board_info __initdata boar
+@@ -620,36 +525,6 @@ static struct board_info __initdata boar
.has_phy = 1,
.use_internal_phy = 1,
},
};
static struct board_info __initdata board_96348gw_10 = {
-@@ -683,35 +558,6 @@ static struct board_info __initdata boar
+@@ -684,35 +559,6 @@ static struct board_info __initdata boar
.cs = 2,
.ext_irq = 2,
},
};
static struct board_info __initdata board_96348gw_11 = {
-@@ -740,35 +586,6 @@ static struct board_info __initdata boar
+@@ -741,35 +587,6 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_pccard = 1,
.has_ehci0 = 1,
};
-@@ -894,35 +711,6 @@ static struct board_info __initdata boar
+@@ -895,35 +712,6 @@ static struct board_info __initdata boar
.ext_irq = 2,
.cs = 2,
},
};
static struct board_info __initdata board_gw6200 = {
-@@ -1259,33 +1047,6 @@ static struct board_info __initdata boar
+@@ -1260,33 +1048,6 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_pccard = 1,
.has_ehci0 = 1,
};
static struct board_info __initdata board_96358vw2 = {
-@@ -1315,29 +1076,6 @@ static struct board_info __initdata boar
+@@ -1316,29 +1077,6 @@ static struct board_info __initdata boar
.has_pccard = 1,
.has_ehci0 = 1,
.num_usbh_ports = 2,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1611,6 +1661,9 @@ static const struct board_info __initcon
+@@ -1612,6 +1662,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5381u,
-@@ -1688,6 +1741,9 @@ static struct of_device_id const bcm963x
+@@ -1689,6 +1742,9 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_3368
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -1663,6 +1708,7 @@ static const struct board_info __initcon
+@@ -1664,6 +1709,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -1743,6 +1789,7 @@ static struct of_device_id const bcm963x
+@@ -1744,6 +1790,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
-@@ -1700,6 +1700,52 @@ static struct board_info __initdata boar
+@@ -1701,6 +1701,52 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1780,6 +1826,9 @@ static const struct board_info __initcon
+@@ -1781,6 +1827,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
};
static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1867,6 +1916,7 @@ static struct of_device_id const bcm963x
+@@ -1868,6 +1917,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
-@@ -683,6 +683,22 @@ static struct board_info __initdata boar
+@@ -684,6 +684,22 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
/* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = {
-@@ -1797,6 +1813,7 @@ static const struct board_info __initcon
+@@ -1798,6 +1814,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1861,6 +1878,7 @@ static struct of_device_id const bcm963x
+@@ -1862,6 +1879,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
-@@ -1759,6 +1759,53 @@ static struct board_info __initdata boar
+@@ -1760,6 +1760,53 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
-@@ -1845,6 +1892,7 @@ static const struct board_info __initcon
+@@ -1846,6 +1893,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
#endif
};
-@@ -1935,6 +1983,7 @@ static struct of_device_id const bcm963x
+@@ -1936,6 +1984,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
-@@ -1719,6 +1719,66 @@ static struct board_info __initdata boar
+@@ -1720,6 +1720,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,
-@@ -1891,6 +1951,7 @@ static const struct board_info __initcon
+@@ -1892,6 +1952,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
&board_vw6339gu,
#endif
-@@ -1982,6 +2043,7 @@ static struct of_device_id const bcm963x
+@@ -1983,6 +2044,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>
-@@ -1713,6 +1715,65 @@ static struct board_info __initdata boar
+@@ -1714,6 +1716,65 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
-@@ -1949,6 +2010,7 @@ static const struct board_info __initcon
+@@ -1950,6 +2011,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,
-@@ -2041,6 +2103,7 @@ static struct of_device_id const bcm963x
+@@ -2042,6 +2104,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
-@@ -1716,6 +1716,60 @@ static struct board_info __initdata boar
+@@ -1717,6 +1717,60 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -2010,6 +2064,7 @@ static const struct board_info __initcon
+@@ -2011,6 +2065,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2103,6 +2158,7 @@ static struct of_device_id const bcm963x
+@@ -2104,6 +2159,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
-@@ -1770,6 +1770,60 @@ static struct board_info __initdata boar
+@@ -1771,6 +1771,60 @@ static struct board_info __initdata boar
},
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -2065,6 +2119,7 @@ static const struct board_info __initcon
+@@ -2066,6 +2120,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2159,6 +2214,7 @@ static struct of_device_id const bcm963x
+@@ -2160,6 +2215,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
-@@ -1725,6 +1725,49 @@ static struct sprom_fixup __initdata vr3
+@@ -1726,6 +1726,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,
-@@ -2118,6 +2161,7 @@ static const struct board_info __initcon
+@@ -2119,6 +2162,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
-@@ -2216,6 +2260,7 @@ static struct of_device_id const bcm963x
+@@ -2217,6 +2261,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
-@@ -1361,6 +1361,37 @@ static struct board_info __initdata boar
+@@ -1362,6 +1362,37 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2145,6 +2176,7 @@ static const struct board_info __initcon
+@@ -2146,6 +2177,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,
-@@ -2237,6 +2269,7 @@ static struct of_device_id const bcm963x
+@@ -2238,6 +2270,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,
-@@ -2127,6 +2171,7 @@ static const struct board_info __initcon
+@@ -2128,6 +2172,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
-@@ -2215,6 +2260,7 @@ static struct of_device_id const bcm963x
+@@ -2216,6 +2261,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2165,6 +2234,7 @@ static const struct board_info __initcon
+@@ -2166,6 +2235,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2258,6 +2328,7 @@ static struct of_device_id const bcm963x
+@@ -2259,6 +2329,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
-@@ -1860,6 +1860,48 @@ static struct board_info __initdata boar
+@@ -1861,6 +1861,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 },
-@@ -2308,6 +2350,7 @@ static const struct board_info __initcon
+@@ -2309,6 +2351,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2410,6 +2453,7 @@ static struct of_device_id const bcm963x
+@@ -2411,6 +2454,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
-@@ -1474,6 +1474,32 @@ static struct board_info __initdata boar
+@@ -1475,6 +1475,32 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_HW520 = {
.name = "HW6358GW_B",
.expected_cpu_id = 0x6358,
-@@ -2333,6 +2359,7 @@ static const struct board_info __initcon
+@@ -2334,6 +2360,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,
-@@ -2442,6 +2469,7 @@ static struct of_device_id const bcm963x
+@@ -2443,6 +2470,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, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1928,6 +1928,53 @@ static struct board_info __initdata boar
+@@ -1929,6 +1929,53 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(DGND3700v1_3800B_spi_devices),
};
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2378,6 +2425,7 @@ static const struct board_info __initcon
+@@ -2379,6 +2426,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2481,6 +2529,7 @@ static struct of_device_id const bcm963x
+@@ -2482,6 +2530,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, },
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2350,6 +2390,7 @@ static const struct board_info __initcon
+@@ -2351,6 +2391,7 @@ static const struct board_info __initcon
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2447,6 +2488,7 @@ static struct of_device_id const bcm963x
+@@ -2448,6 +2489,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-d", .data = &board_dsl_2751b_d1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2166,6 +2166,60 @@ static struct board_info __initdata boar
+@@ -2167,6 +2167,60 @@ static struct board_info __initdata boar
},
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -2470,6 +2524,7 @@ static const struct board_info __initcon
+@@ -2471,6 +2525,7 @@ static const struct board_info __initcon
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2570,6 +2625,7 @@ static struct of_device_id const bcm963x
+@@ -2571,6 +2626,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
-@@ -642,6 +642,51 @@ static struct board_info __initdata boar
+@@ -643,6 +643,51 @@ static struct board_info __initdata boar
},
},
};
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -2455,6 +2500,7 @@ static const struct board_info __initcon
+@@ -2456,6 +2501,7 @@ static const struct board_info __initcon
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -2553,6 +2599,7 @@ static struct of_device_id const bcm963x
+@@ -2554,6 +2600,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
-@@ -2060,6 +2060,53 @@ static struct board_info __initdata boar
+@@ -2061,6 +2061,53 @@ static struct board_info __initdata boar
},
};
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2566,6 +2613,7 @@ static const struct board_info __initcon
+@@ -2567,6 +2614,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
-@@ -2674,6 +2722,7 @@ static struct of_device_id const bcm963x
+@@ -2675,6 +2723,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, },