refresh patches

SVN-Revision: 26957
This commit is contained in:
Florian Fainelli 2011-05-20 10:06:18 +00:00
parent 3e83f60a66
commit 031ea08ef0
10 changed files with 20 additions and 22 deletions

View File

@ -118,7 +118,7 @@
static struct board_info __initdata board_FAST2404 = { static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404", .name = "F@ST2404",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -1521,6 +1632,8 @@ static const struct board_info __initdat @@ -1527,6 +1638,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348 #ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r, &board_96348r,
&board_96348gw, &board_96348gw,

View File

@ -50,7 +50,7 @@
static struct board_info __initdata board_96348gw = { static struct board_info __initdata board_96348gw = {
.name = "96348GW", .name = "96348GW",
.expected_cpu_id = 0x6348, .expected_cpu_id = 0x6348,
@@ -1642,6 +1685,7 @@ static const struct board_info __initdat @@ -1648,6 +1691,7 @@ static const struct board_info __initdat
&board_rta1025w_16, &board_rta1025w_16,
&board_96348_D4PW, &board_96348_D4PW,
&board_spw500v, &board_spw500v,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -670,6 +670,19 @@ @@ -670,6 +670,19 @@ static struct board_info __initdata boar
}, },
.has_ohci0 = 1, .has_ohci0 = 1,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -775,6 +775,76 @@ static struct board_info __initdata boar @@ -794,6 +794,76 @@ static struct board_info __initdata boar
}, },
}; };
@ -77,7 +77,7 @@
#endif #endif
/* /*
@@ -1686,6 +1756,7 @@ static const struct board_info __initdat @@ -1705,6 +1775,7 @@ static const struct board_info __initdat
&board_96348_D4PW, &board_96348_D4PW,
&board_spw500v, &board_spw500v,
&board_ct536_ct5621, &board_ct536_ct5621,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1730,6 +1730,79 @@ static struct board_info __initdata boar @@ -1749,6 +1749,79 @@ static struct board_info __initdata boar
}; };
#endif #endif
@ -80,7 +80,7 @@
/* /*
* all boards * all boards
*/ */
@@ -1771,6 +1844,7 @@ static const struct board_info __initdat @@ -1790,6 +1863,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2, &board_nb4_ser_r2,
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,

View File

@ -44,7 +44,7 @@
#endif #endif
/* /*
@@ -1811,6 +1848,7 @@ static const struct board_info __initdat @@ -1830,6 +1867,7 @@ static const struct board_info __initdat
&board_96338gw, &board_96338gw,
&board_96338w, &board_96338w,
&board_96338w2_e7t, &board_96338w2_e7t,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1728,6 +1728,72 @@ static struct board_info __initdata boar @@ -1784,6 +1784,72 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices, .spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices), .num_spis = ARRAY_SIZE(nb4_spi_devices),
}; };
@ -73,7 +73,7 @@
#endif #endif
static struct board_info __initdata board_HW553 = { static struct board_info __initdata board_HW553 = {
@@ -1845,6 +1911,7 @@ static const struct board_info __initdat @@ -1902,6 +1968,7 @@ static const struct board_info __initdat
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,
&board_HW553, &board_HW553,

View File

@ -1,8 +1,6 @@
Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
=================================================================== +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 2011-03-21 08:29:36.500387994 +0000 @@ -901,6 +901,63 @@ static struct board_info __initdata boar
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 2011-03-31 12:35:08.209787004 +0100
@@ -845,6 +845,63 @@
}, },
}; };
@ -66,7 +64,7 @@ Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c
#endif #endif
/* /*
@@ -1830,6 +1887,7 @@ @@ -1953,6 +2010,7 @@ static const struct board_info __initdat
&board_spw500v, &board_spw500v,
&board_ct536_ct5621, &board_ct536_ct5621,
&board_96348sv, &board_96348sv,
@ -74,7 +72,7 @@ Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -1977,6 +2035,22 @@ @@ -2101,6 +2159,22 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK; val &= MPI_CSBASE_BASE_MASK;
} }
boot_addr = (u8 *)KSEG1ADDR(val); boot_addr = (u8 *)KSEG1ADDR(val);
@ -97,7 +95,7 @@ Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c
/* dump cfe version */ /* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
@@ -2184,6 +2258,14 @@ @@ -2308,6 +2382,14 @@ int __init board_register_devices(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK; val &= MPI_CSBASE_BASE_MASK;
} }

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1927,6 +1927,17 @@ static struct ssb_sprom bcm63xx_sprom = @@ -2071,6 +2071,17 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848, .boardflags_lo = 0x2848,
.boardflags_hi = 0x0000, .boardflags_hi = 0x0000,
}; };
@ -18,7 +18,7 @@
#endif #endif
/* /*
@@ -2111,8 +2122,9 @@ void __init board_prom_init(void) @@ -2271,8 +2282,9 @@ void __init board_prom_init(void)
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1907,7 +1907,7 @@ static void __init nb4_nvram_fixup(void) @@ -2051,7 +2051,7 @@ static void __init nb4_nvram_fixup(void)
* bcm4318 WLAN work * bcm4318 WLAN work
*/ */
#ifdef CONFIG_SSB_PCIHOST #ifdef CONFIG_SSB_PCIHOST
@ -9,7 +9,7 @@
.revision = 0x02, .revision = 0x02,
.board_rev = 0x17, .board_rev = 0x17,
.country_code = 0x0, .country_code = 0x0,
@@ -1927,6 +1927,7 @@ static struct ssb_sprom bcm63xx_sprom = @@ -2071,6 +2071,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848, .boardflags_lo = 0x2848,
.boardflags_hi = 0x0000, .boardflags_hi = 0x0000,
}; };