hw553: fix missing has_uart0 in board definition (#9533)
SVN-Revision: 27448
This commit is contained in:
parent
89f6b29feb
commit
7c3bbe150a
15 changed files with 30 additions and 26 deletions
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -1706,6 +1706,79 @@ static struct board_info __initdata boar
|
||||
@@ -1706,6 +1706,81 @@ static struct board_info __initdata boar
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -8,6 +8,8 @@
|
|||
+ .name = "HW553",
|
||||
+ .expected_cpu_id = 0x6358,
|
||||
+
|
||||
+ .has_uart0 = 1,
|
||||
+
|
||||
+ .has_enet0 = 1,
|
||||
+ .has_enet1 = 1,
|
||||
+ .has_pci = 1,
|
||||
|
@ -26,7 +28,7 @@
|
|||
+ .has_ehci0 = 1,
|
||||
+
|
||||
+ .leds = {
|
||||
+ /*Each led on HW553 is bi-color (except wifi) */
|
||||
+ /*Each led on HW553 is bi-color (except wifi) */
|
||||
+ {
|
||||
+ .name = "lan:red",
|
||||
+ .gpio = 34,
|
||||
|
@ -80,7 +82,7 @@
|
|||
/*
|
||||
* all boards
|
||||
*/
|
||||
@@ -1746,6 +1819,7 @@ static const struct board_info __initdat
|
||||
@@ -1746,6 +1821,7 @@ static const struct board_info __initdat
|
||||
&board_nb4_ser_r2,
|
||||
&board_nb4_fxc_r1,
|
||||
&board_nb4_fxc_r2,
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#endif
|
||||
|
||||
/*
|
||||
@@ -1787,6 +1824,7 @@ static const struct board_info __initdat
|
||||
@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
|
||||
&board_96338gw,
|
||||
&board_96338w,
|
||||
&board_96338w2_e7t,
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
#endif
|
||||
|
||||
static struct board_info __initdata board_HW553 = {
|
||||
@@ -1858,6 +1924,7 @@ static const struct board_info __initdat
|
||||
@@ -1860,6 +1926,7 @@ static const struct board_info __initdat
|
||||
&board_nb4_fxc_r1,
|
||||
&board_nb4_fxc_r2,
|
||||
&board_HW553,
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
#endif
|
||||
|
||||
/*
|
||||
@@ -1909,6 +1966,7 @@ static const struct board_info __initdat
|
||||
@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
|
||||
&board_96348_D4PW,
|
||||
&board_spw500v,
|
||||
&board_96348sv,
|
||||
|
@ -72,7 +72,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_BCM63XX_CPU_6358
|
||||
@@ -2057,6 +2115,22 @@ void __init board_prom_init(void)
|
||||
@@ -2059,6 +2117,22 @@ void __init board_prom_init(void)
|
||||
val &= MPI_CSBASE_BASE_MASK;
|
||||
}
|
||||
boot_addr = (u8 *)KSEG1ADDR(val);
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
/* dump cfe version */
|
||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
||||
@@ -2260,6 +2334,14 @@ int __init board_register_devices(void)
|
||||
@@ -2262,6 +2336,14 @@ int __init board_register_devices(void)
|
||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
val &= MPI_CSBASE_BASE_MASK;
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
static struct board_info __initdata board_96348gw = {
|
||||
.name = "96348GW",
|
||||
.expected_cpu_id = 0x6348,
|
||||
@@ -1967,6 +2023,7 @@ static const struct board_info __initdat
|
||||
@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
|
||||
&board_spw500v,
|
||||
&board_96348sv,
|
||||
&board_V2500V_BB,
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
static struct board_info __initdata board_96348gw = {
|
||||
.name = "96348GW",
|
||||
.expected_cpu_id = 0x6348,
|
||||
@@ -2024,6 +2067,7 @@ static const struct board_info __initdat
|
||||
@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
|
||||
&board_96348sv,
|
||||
&board_V2500V_BB,
|
||||
&board_V2110,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2130,6 +2130,17 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
|
@ -18,7 +18,7 @@
|
|||
#endif
|
||||
|
||||
/*
|
||||
@@ -2403,8 +2414,9 @@ int __init board_register_devices(void)
|
||||
@@ -2405,8 +2416,9 @@ int __init board_register_devices(void)
|
||||
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
@@ -2110,7 +2110,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
* bcm4318 WLAN work
|
||||
*/
|
||||
#ifdef CONFIG_SSB_PCIHOST
|
||||
|
@ -9,7 +9,7 @@
|
|||
.revision = 0x02,
|
||||
.board_rev = 0x17,
|
||||
.country_code = 0x0,
|
||||
@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2130,6 +2130,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -1706,6 +1706,79 @@ static struct board_info __initdata boar
|
||||
@@ -1706,6 +1706,81 @@ static struct board_info __initdata boar
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -8,6 +8,8 @@
|
|||
+ .name = "HW553",
|
||||
+ .expected_cpu_id = 0x6358,
|
||||
+
|
||||
+ .has_uart0 = 1,
|
||||
+
|
||||
+ .has_enet0 = 1,
|
||||
+ .has_enet1 = 1,
|
||||
+ .has_pci = 1,
|
||||
|
@ -26,7 +28,7 @@
|
|||
+ .has_ehci0 = 1,
|
||||
+
|
||||
+ .leds = {
|
||||
+ /*Each led on HW553 is bi-color (except wifi) */
|
||||
+ /*Each led on HW553 is bi-color (except wifi) */
|
||||
+ {
|
||||
+ .name = "lan:red",
|
||||
+ .gpio = 34,
|
||||
|
@ -80,7 +82,7 @@
|
|||
/*
|
||||
* all boards
|
||||
*/
|
||||
@@ -1746,6 +1819,7 @@ static const struct board_info __initdat
|
||||
@@ -1746,6 +1821,7 @@ static const struct board_info __initdat
|
||||
&board_nb4_ser_r2,
|
||||
&board_nb4_fxc_r1,
|
||||
&board_nb4_fxc_r2,
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#endif
|
||||
|
||||
/*
|
||||
@@ -1787,6 +1824,7 @@ static const struct board_info __initdat
|
||||
@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
|
||||
&board_96338gw,
|
||||
&board_96338w,
|
||||
&board_96338w2_e7t,
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
#endif
|
||||
|
||||
static struct board_info __initdata board_HW553 = {
|
||||
@@ -1858,6 +1924,7 @@ static const struct board_info __initdat
|
||||
@@ -1860,6 +1926,7 @@ static const struct board_info __initdat
|
||||
&board_nb4_fxc_r1,
|
||||
&board_nb4_fxc_r2,
|
||||
&board_HW553,
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
#endif
|
||||
|
||||
/*
|
||||
@@ -1909,6 +1966,7 @@ static const struct board_info __initdat
|
||||
@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
|
||||
&board_96348_D4PW,
|
||||
&board_spw500v,
|
||||
&board_96348sv,
|
||||
|
@ -72,7 +72,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_BCM63XX_CPU_6358
|
||||
@@ -2068,6 +2126,22 @@ void __init board_prom_init(void)
|
||||
@@ -2070,6 +2128,22 @@ void __init board_prom_init(void)
|
||||
val &= MPI_CSBASE_BASE_MASK;
|
||||
}
|
||||
boot_addr = (u8 *)KSEG1ADDR(val);
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
/* dump cfe version */
|
||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
||||
@@ -2272,6 +2346,14 @@ int __init board_register_devices(void)
|
||||
@@ -2274,6 +2348,14 @@ int __init board_register_devices(void)
|
||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
val &= MPI_CSBASE_BASE_MASK;
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
static struct board_info __initdata board_96348gw = {
|
||||
.name = "96348GW",
|
||||
.expected_cpu_id = 0x6348,
|
||||
@@ -1967,6 +2023,7 @@ static const struct board_info __initdat
|
||||
@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
|
||||
&board_spw500v,
|
||||
&board_96348sv,
|
||||
&board_V2500V_BB,
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
static struct board_info __initdata board_96348gw = {
|
||||
.name = "96348GW",
|
||||
.expected_cpu_id = 0x6348,
|
||||
@@ -2024,6 +2067,7 @@ static const struct board_info __initdat
|
||||
@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
|
||||
&board_96348sv,
|
||||
&board_V2500V_BB,
|
||||
&board_V2110,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
@@ -2110,7 +2110,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
* bcm4318 WLAN work
|
||||
*/
|
||||
#ifdef CONFIG_SSB_PCIHOST
|
||||
|
@ -9,7 +9,7 @@
|
|||
.revision = 0x02,
|
||||
.board_rev = 0x17,
|
||||
.country_code = 0x0,
|
||||
@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2130,6 +2130,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue