/*
* known 3368 boards
*/
-@@ -2427,6 +2433,117 @@ static struct board_info __initdata boar
+@@ -2427,6 +2433,124 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
+
+ .has_uart0 = 1,
+ .has_pci = 1,
++ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+
+ },
+ },
+
++ .fallback_sprom = {
++ .type = SPROM_BCM4318,
++ .pci_bus = 0,
++ .pci_dev = 1,
++ },
++
+ .devs = ct6373_devices,
+ .num_devs = ARRAY_SIZE(ct6373_devices),
+ .spis = ct6373_spi_devices,
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2705,6 +2822,7 @@ static const struct board_info __initcon
+@@ -2705,6 +2829,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
#endif
/*
-@@ -2825,6 +2892,7 @@ static const struct board_info __initcon
+@@ -2832,6 +2899,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
-@@ -2689,6 +2692,104 @@ static struct board_info __initdata boar
+@@ -2696,6 +2699,104 @@ static struct board_info __initdata boar
};
#endif
/*
* known 6368 boards
*/
-@@ -2895,6 +2996,10 @@ static const struct board_info __initcon
+@@ -2902,6 +3003,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2916,6 +3021,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2923,6 +3028,11 @@ static void __init boardid_fixup(u8 *boo
}
}
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2964,6 +3015,7 @@ static const struct board_info __initcon
+@@ -2971,6 +3022,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,
-@@ -2996,6 +3116,7 @@ static const struct board_info __initcon
+@@ -3003,6 +3123,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,
-@@ -3115,6 +3188,7 @@ static const struct board_info __initcon
+@@ -3122,6 +3195,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,
-@@ -3188,6 +3255,7 @@ static const struct board_info __initcon
+@@ -3195,6 +3262,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -3269,6 +3318,7 @@ static const struct board_info __initcon
+@@ -3276,6 +3325,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3357,6 +3844,10 @@ static const struct board_info __initcon
+@@ -3364,6 +3851,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3376,13 +3867,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3383,13 +3874,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();
#endif
/*
-@@ -3806,6 +3860,7 @@ static const struct board_info __initcon
+@@ -3813,6 +3867,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3850,6 +3966,7 @@ static const struct board_info __initcon
+@@ -3857,6 +3973,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
-@@ -3805,6 +3805,96 @@ static struct board_info __initdata boar
+@@ -3812,6 +3812,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
#endif
/*
-@@ -4026,6 +4116,7 @@ static const struct board_info __initcon
+@@ -4033,6 +4123,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4280,6 +4367,9 @@ static const struct board_info __initcon
+@@ -4287,6 +4374,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#endif
/*
-@@ -4369,6 +4457,7 @@ static const struct board_info __initcon
+@@ -4376,6 +4464,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
-@@ -4449,6 +4449,75 @@ static struct board_info __initdata boar
+@@ -4456,6 +4456,75 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4533,6 +4602,9 @@ static const struct board_info __initcon
+@@ -4540,6 +4609,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
#endif
/*
-@@ -4569,6 +4614,7 @@ static const struct board_info __initcon
+@@ -4576,6 +4621,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
-@@ -4560,6 +4560,108 @@ static struct board_info __initdata boar
+@@ -4567,6 +4567,108 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -4650,6 +4752,7 @@ static const struct board_info __initcon
+@@ -4657,6 +4759,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
-@@ -4497,6 +4497,131 @@ static struct board_info __initdata boar
+@@ -4504,6 +4504,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,
-@@ -4751,6 +4876,7 @@ static const struct board_info __initcon
+@@ -4758,6 +4883,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>
-@@ -4491,6 +4492,99 @@ static struct board_info __initdata boar
+@@ -4498,6 +4499,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -4874,6 +4968,7 @@ static const struct board_info __initcon
+@@ -4881,6 +4975,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
-@@ -4493,6 +4493,98 @@ static struct board_info __initdata boar
+@@ -4500,6 +4500,98 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -4968,6 +5060,7 @@ static const struct board_info __initcon
+@@ -4975,6 +5067,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
-@@ -4585,6 +4585,98 @@ static struct board_info __initdata boar
+@@ -4592,6 +4592,98 @@ static struct board_info __initdata boar
},
};
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
-@@ -5061,6 +5153,7 @@ static const struct board_info __initcon
+@@ -5068,6 +5160,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
-@@ -4493,6 +4493,89 @@ static struct board_info __initdata boar
+@@ -4500,6 +4500,89 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -5152,6 +5235,7 @@ static const struct board_info __initcon
+@@ -5159,6 +5242,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
-@@ -4083,6 +4083,49 @@ static struct board_info __initdata boar
+@@ -4090,6 +4090,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,
-@@ -5218,6 +5261,7 @@ static const struct board_info __initcon
+@@ -5225,6 +5268,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,
-@@ -5209,6 +5291,7 @@ static const struct board_info __initcon
+@@ -5216,6 +5298,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
#endif
/*
-@@ -5285,6 +5420,7 @@ static const struct board_info __initcon
+@@ -5292,6 +5427,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,