--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1782,6 +1782,76 @@ static struct board_info __initdata boar
+@@ -1782,6 +1782,83 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
+
+ .has_enet1 = 1,
+ .has_pci = 1,
++ .use_fallback_sprom = 1,
+
+ .enet1 = {
+ .has_phy = 1,
+ .active_low = 1,
+ },
+ },
++
++ .fallback_sprom = {
++ .type = SPROM_BCM4318,
++ .pci_bus = 0,
++ .pci_dev = 1,
++ },
+};
#endif
/*
-@@ -1830,6 +1900,7 @@ static const struct board_info __initcon
+@@ -1830,6 +1907,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
#endif
/*
-@@ -1868,6 +1907,7 @@ static const struct board_info __initcon
+@@ -1875,6 +1914,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1891,6 +1891,72 @@ static struct board_info __initdata boar
+@@ -922,6 +922,72 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1941,6 +2007,7 @@ static const struct board_info __initcon
+@@ -1948,6 +2014,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -922,6 +922,65 @@ static struct board_info __initdata boar
+@@ -288,6 +288,65 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1992,6 +2051,7 @@ static const struct board_info __initcon
+@@ -1999,6 +2058,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2067,6 +2127,22 @@ void __init board_bcm963xx_init(void)
+@@ -2074,6 +2134,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
-@@ -477,6 +477,64 @@ static struct board_info __initdata boar
+@@ -536,6 +536,64 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2052,6 +2110,7 @@ static const struct board_info __initcon
+@@ -2059,6 +2117,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
-@@ -535,6 +535,51 @@ static struct board_info __initdata boar
+@@ -594,6 +594,51 @@ static struct board_info __initdata boar
};
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2111,6 +2156,7 @@ static const struct board_info __initcon
+@@ -2118,6 +2163,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1312,6 +1312,8 @@ static struct board_info __initdata boar
+@@ -1378,6 +1378,8 @@ static struct board_info __initdata boar
.name = "DWV-S0",
.expected_cpu_id = 0x6358,
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
-@@ -1328,6 +1330,7 @@ static struct board_info __initdata boar
+@@ -1394,6 +1396,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
-@@ -580,6 +580,69 @@ static struct board_info __initdata boar
+@@ -639,6 +639,69 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2160,6 +2223,7 @@ static const struct board_info __initcon
+@@ -2167,6 +2230,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -847,6 +847,7 @@ static struct board_info __initdata boar
+@@ -906,6 +906,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
-@@ -1148,6 +1148,42 @@ static struct board_info __initdata boar
+@@ -347,6 +347,42 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -2225,6 +2261,7 @@ static const struct board_info __initcon
+@@ -2232,6 +2268,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
-@@ -2225,6 +2225,85 @@ static struct board_info __initdata boar
+@@ -2232,6 +2232,85 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2279,6 +2358,10 @@ static const struct board_info __initcon
+@@ -2286,6 +2365,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2301,6 +2301,72 @@ static struct board_info __initdata boar
+@@ -2308,6 +2308,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -2361,6 +2427,7 @@ static const struct board_info __initcon
+@@ -2368,6 +2434,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
#endif
/*
-@@ -2410,6 +2480,7 @@ static const struct board_info __initcon
+@@ -2417,6 +2487,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -2481,6 +2586,7 @@ static const struct board_info __initcon
+@@ -2488,6 +2593,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1391,6 +1391,59 @@ static struct board_info __initdata boar
+@@ -590,6 +590,59 @@ static struct board_info __initdata boar
.ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
};
#endif
/*
-@@ -2616,6 +2669,7 @@ static const struct board_info __initcon
+@@ -2623,6 +2676,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
/*
* known 3368 boards
*/
-@@ -2347,6 +2353,117 @@ static struct board_info __initdata boar
+@@ -2413,6 +2419,117 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2684,6 +2801,7 @@ static const struct board_info __initcon
+@@ -2691,6 +2808,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2599,6 +2599,73 @@ static struct board_info __initdata boar
+@@ -1516,6 +1516,73 @@ static struct board_info __initdata boar
},
}
};
#endif
/*
-@@ -2804,6 +2871,7 @@ static const struct board_info __initcon
+@@ -2811,6 +2878,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2668,6 +2671,104 @@ static struct board_info __initdata boar
+@@ -2675,6 +2678,104 @@ static struct board_info __initdata boar
};
#endif
/*
* known 6368 boards
*/
-@@ -2874,6 +2975,10 @@ static const struct board_info __initcon
+@@ -2881,6 +2982,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2895,6 +3000,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2902,6 +3007,11 @@ static void __init boardid_fixup(u8 *boo
}
}
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1059,6 +1059,57 @@ static struct board_info __initdata boar
+@@ -1207,6 +1207,57 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2943,6 +2994,7 @@ static const struct board_info __initcon
+@@ -2950,6 +3001,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -2975,6 +3095,7 @@ static const struct board_info __initcon
+@@ -2982,6 +3102,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -3094,6 +3167,7 @@ static const struct board_info __initcon
+@@ -3101,6 +3174,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
-@@ -3167,6 +3234,7 @@ static const struct board_info __initcon
+@@ -3174,6 +3241,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -776,6 +776,55 @@ static struct board_info __initdata boar
+@@ -924,6 +924,55 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
#endif
/*
-@@ -3248,6 +3297,7 @@ static const struct board_info __initcon
+@@ -3255,6 +3304,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -2897,6 +2898,492 @@ static struct board_info __initdata boar
+@@ -1814,6 +1815,492 @@ static struct board_info __initdata boar
},
};
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3336,6 +3823,10 @@ static const struct board_info __initcon
+@@ -3343,6 +3830,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3355,13 +3846,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3362,13 +3853,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -826,6 +826,60 @@ static struct board_info __initdata boar
+@@ -974,6 +974,60 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -3785,6 +3839,7 @@ static const struct board_info __initcon
+@@ -3792,6 +3846,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1474,6 +1474,122 @@ static struct board_info __initdata boar
+@@ -1622,6 +1622,122 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3829,6 +3945,7 @@ static const struct board_info __initcon
+@@ -3836,6 +3952,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3784,6 +3784,96 @@ static struct board_info __initdata boar
+@@ -3791,6 +3791,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
#endif
/*
-@@ -4005,6 +4095,7 @@ static const struct board_info __initcon
+@@ -4012,6 +4102,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2206,6 +2206,99 @@ static struct board_info __initdata boar
+@@ -2825,6 +2825,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1652,6 +1652,19 @@ static struct board_info __initdata boar
+@@ -1800,6 +1800,19 @@ 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
-@@ -990,6 +990,17 @@ static struct board_info __initdata boar
+@@ -1138,6 +1138,17 @@ static struct board_info __initdata boar
.active_low = 1,
},
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -946,6 +950,8 @@ static struct board_info __initdata boar
+@@ -1094,6 +1098,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1019,6 +1025,8 @@ static struct board_info __initdata boar
+@@ -1167,6 +1173,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1249,6 +1257,8 @@ static struct board_info __initdata boar
+@@ -1397,6 +1405,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1425,6 +1435,8 @@ static struct board_info __initdata boar
+@@ -1573,6 +1583,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1616,6 +1628,8 @@ static struct board_info __initdata boar
+@@ -1764,6 +1776,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1638,6 +1652,8 @@ static struct board_info __initdata boar
+@@ -1786,6 +1800,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1658,6 +1674,8 @@ static struct board_info __initdata boar
+@@ -1806,6 +1822,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2030,6 +2048,8 @@ static struct board_info __initdata boar
+@@ -2649,6 +2667,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2083,6 +2103,8 @@ static struct board_info __initdata boar
+@@ -2702,6 +2722,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2224,6 +2246,8 @@ static struct board_info __initdata boar
+@@ -2843,6 +2865,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2342,6 +2366,8 @@ static struct board_info __initdata boar
+@@ -2961,6 +2985,8 @@ static struct board_info __initdata boar
},
.enet1 = {
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2374,6 +2374,94 @@ static struct board_info __initdata boar
+@@ -2993,6 +2993,94 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4259,6 +4346,9 @@ static const struct board_info __initcon
+@@ -4266,6 +4353,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#endif
/*
-@@ -4348,6 +4436,7 @@ static const struct board_info __initcon
+@@ -4355,6 +4443,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
-@@ -4428,6 +4428,75 @@ static struct board_info __initdata boar
+@@ -4435,6 +4435,75 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4512,6 +4581,9 @@ static const struct board_info __initcon
+@@ -4519,6 +4588,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
-@@ -2201,6 +2201,51 @@ static struct board_info __initdata boar
+@@ -1092,6 +1092,51 @@ static struct board_info __initdata boar
},
};
#endif
/*
-@@ -4548,6 +4593,7 @@ static const struct board_info __initcon
+@@ -4555,6 +4600,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4539,6 +4539,108 @@ static struct board_info __initdata boar
+@@ -4546,6 +4546,108 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -4629,6 +4731,7 @@ static const struct board_info __initcon
+@@ -4636,6 +4738,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
-@@ -4476,6 +4476,131 @@ static struct board_info __initdata boar
+@@ -4483,6 +4483,131 @@ 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,
-@@ -4730,6 +4855,7 @@ static const struct board_info __initcon
+@@ -4737,6 +4862,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -4470,6 +4471,99 @@ static struct board_info __initdata boar
+@@ -4477,6 +4478,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -4853,6 +4947,7 @@ static const struct board_info __initcon
+@@ -4860,6 +4954,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4472,6 +4472,98 @@ static struct board_info __initdata boar
+@@ -4479,6 +4479,98 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -4947,6 +5039,7 @@ static const struct board_info __initcon
+@@ -4954,6 +5046,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4564,6 +4564,98 @@ static struct board_info __initdata boar
+@@ -4571,6 +4571,98 @@ static struct board_info __initdata boar
},
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -5040,6 +5132,7 @@ static const struct board_info __initcon
+@@ -5047,6 +5139,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4472,6 +4472,89 @@ static struct board_info __initdata boar
+@@ -4479,6 +4479,89 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -5131,6 +5214,7 @@ static const struct board_info __initcon
+@@ -5138,6 +5221,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3450,6 +3450,49 @@ static struct board_info __initdata boar
+@@ -4069,6 +4069,49 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(ct6373_spi_devices),
};
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -5197,6 +5240,7 @@ static const struct board_info __initcon
+@@ -5204,6 +5247,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_ct6373_1,
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
-@@ -5188,6 +5270,7 @@ static const struct board_info __initcon
+@@ -5195,6 +5277,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
#endif
/*
-@@ -5264,6 +5399,7 @@ static const struct board_info __initcon
+@@ -5271,6 +5406,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,