kernel: update linux 3.1 to 3.1.9
SVN-Revision: 29726
This commit is contained in:
@@ -177,7 +177,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
||||
+MODULE_ALIAS("platform:bcm63xx_ohci");
|
||||
--- a/drivers/usb/host/ohci-hcd.c
|
||||
+++ b/drivers/usb/host/ohci-hcd.c
|
||||
@@ -1058,6 +1058,11 @@ MODULE_LICENSE ("GPL");
|
||||
@@ -1055,6 +1055,11 @@ MODULE_LICENSE ("GPL");
|
||||
#define PLATFORM_DRIVER ohci_hcd_da8xx_driver
|
||||
#endif
|
||||
|
||||
@@ -191,7 +191,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
||||
#define PLATFORM_DRIVER ohci_hcd_sh_driver
|
||||
--- a/drivers/usb/host/ohci.h
|
||||
+++ b/drivers/usb/host/ohci.h
|
||||
@@ -646,7 +646,7 @@ static inline u32 hc32_to_cpup (const st
|
||||
@@ -645,7 +645,7 @@ static inline u32 hc32_to_cpup (const st
|
||||
* some big-endian SOC implementations. Same thing happens with PSW access.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -751,6 +751,76 @@ static struct board_info __initdata boar
|
||||
@@ -746,6 +746,76 @@ static struct board_info __initdata boar
|
||||
},
|
||||
};
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1661,6 +1731,7 @@ static const struct board_info __initdat
|
||||
@@ -1656,6 +1726,7 @@ static const struct board_info __initdat
|
||||
&board_rta1025w_16,
|
||||
&board_96348_D4PW,
|
||||
&board_spw500v,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -1704,6 +1704,81 @@ static struct board_info __initdata boar
|
||||
@@ -1699,6 +1699,81 @@ static struct board_info __initdata boar
|
||||
.spis = nb4_spi_devices,
|
||||
.num_spis = ARRAY_SIZE(nb4_spi_devices),
|
||||
};
|
||||
@@ -82,7 +82,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1746,6 +1821,7 @@ static const struct board_info __initdat
|
||||
@@ -1741,6 +1816,7 @@ static const struct board_info __initdat
|
||||
&board_nb4_ser_r2,
|
||||
&board_nb4_fxc_r1,
|
||||
&board_nb4_fxc_r2,
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1789,6 +1826,7 @@ static const struct board_info __initdat
|
||||
@@ -1784,6 +1821,7 @@ static const struct board_info __initdat
|
||||
&board_96338gw,
|
||||
&board_96338w,
|
||||
&board_96338w2_e7t,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -1816,6 +1816,72 @@ static struct board_info __initdata boar
|
||||
@@ -1811,6 +1811,72 @@ static struct board_info __initdata boar
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -73,7 +73,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1860,6 +1926,7 @@ static const struct board_info __initdat
|
||||
@@ -1855,6 +1921,7 @@ static const struct board_info __initdat
|
||||
&board_nb4_fxc_r1,
|
||||
&board_nb4_fxc_r2,
|
||||
&board_HW553,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -858,6 +858,63 @@ static struct board_info __initdata boar
|
||||
@@ -853,6 +853,63 @@ static struct board_info __initdata boar
|
||||
},
|
||||
};
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
|
||||
@@ -1906,6 +1963,7 @@ static const struct board_info __initdat
|
||||
&board_96348_D4PW,
|
||||
&board_spw500v,
|
||||
&board_96348sv,
|
||||
@@ -72,7 +72,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BCM63XX_CPU_6358
|
||||
@@ -2064,6 +2122,22 @@ void __init board_prom_init(void)
|
||||
@@ -2059,6 +2117,22 @@ void __init board_prom_init(void)
|
||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
val &= MPI_CSBASE_BASE_MASK;
|
||||
boot_addr = (u8 *)KSEG1ADDR(val);
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
/* dump cfe version */
|
||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
||||
@@ -2265,6 +2339,13 @@ int __init board_register_devices(void)
|
||||
@@ -2260,6 +2334,13 @@ 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,
|
||||
@@ -1969,6 +2025,7 @@ static const struct board_info __initdat
|
||||
@@ -1964,6 +2020,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,
|
||||
@@ -2026,6 +2069,7 @@ static const struct board_info __initdat
|
||||
@@ -2021,6 +2064,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
|
||||
@@ -1332,6 +1332,8 @@ static struct board_info __initdata boar
|
||||
@@ -1327,6 +1327,8 @@ static struct board_info __initdata boar
|
||||
.name = "DWV-S0",
|
||||
.expected_cpu_id = 0x6358,
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
.has_enet0 = 1,
|
||||
.has_enet1 = 1,
|
||||
.has_pci = 1,
|
||||
@@ -1347,6 +1349,7 @@ static struct board_info __initdata boar
|
||||
@@ -1342,6 +1344,7 @@ static struct board_info __initdata boar
|
||||
},
|
||||
|
||||
.has_ohci0 = 1,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2113,7 +2113,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
@@ -2108,7 +2108,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,
|
||||
@@ -2133,6 +2133,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user