diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 16:04:25 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 16:04:25 +0000 |
| commit | 39f491e479eb74e6645ea6dce2219ff7d26570d1 (patch) | |
| tree | 85bd63e501b1abf2d5ee1d46ff85b177570ffcd0 /target/linux/brcm47xx | |
| parent | 365f76551af6786d9dda6cb20463a7c37321150e (diff) | |
| download | upstream-39f491e479eb74e6645ea6dce2219ff7d26570d1.tar.gz upstream-39f491e479eb74e6645ea6dce2219ff7d26570d1.tar.bz2 upstream-39f491e479eb74e6645ea6dce2219ff7d26570d1.zip | |
kernel: update to linux-3.0 and refresh patches.
Thank you Peter Wagner for the patch
SVN-Revision: 27722
Diffstat (limited to 'target/linux/brcm47xx')
3 files changed, 5 insertions, 33 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch b/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch index 4ae8ca4a81..d236fcbbbe 100644 --- a/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch +++ b/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch @@ -22,7 +22,7 @@ depends on USB --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1282,9 +1282,14 @@ MODULE_LICENSE ("GPL"); +@@ -1286,9 +1286,14 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_grlib_driver #endif @@ -38,7 +38,7 @@ #error "missing bus glue for ehci-hcd" #endif -@@ -1344,10 +1349,20 @@ static int __init ehci_hcd_init(void) +@@ -1348,10 +1353,20 @@ static int __init ehci_hcd_init(void) if (retval < 0) goto clean4; #endif @@ -60,7 +60,7 @@ clean4: #endif #ifdef OF_PLATFORM_DRIVER -@@ -1378,6 +1393,9 @@ module_init(ehci_hcd_init); +@@ -1382,6 +1397,9 @@ module_init(ehci_hcd_init); static void __exit ehci_hcd_cleanup(void) { diff --git a/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch b/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch index d975302e67..a3ec2b70d0 100644 --- a/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch +++ b/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch @@ -152,7 +152,7 @@ +#endif --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1350,17 +1350,21 @@ static int __init ehci_hcd_init(void) +@@ -1354,17 +1354,21 @@ static int __init ehci_hcd_init(void) goto clean4; #endif @@ -174,7 +174,7 @@ #ifdef XILINX_OF_PLATFORM_DRIVER platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); clean4: -@@ -1393,9 +1397,11 @@ module_init(ehci_hcd_init); +@@ -1397,9 +1401,11 @@ module_init(ehci_hcd_init); static void __exit ehci_hcd_cleanup(void) { diff --git a/target/linux/brcm47xx/patches-3.0/240-ssb_no_sprom_on_pci.patch b/target/linux/brcm47xx/patches-3.0/240-ssb_no_sprom_on_pci.patch deleted file mode 100644 index 52c8fe95f3..0000000000 --- a/target/linux/brcm47xx/patches-3.0/240-ssb_no_sprom_on_pci.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/drivers/ssb/driver_pcicore.c -+++ b/drivers/ssb/driver_pcicore.c -@@ -412,16 +412,6 @@ static int __devinit pcicore_is_in_hostm - * Workarounds. - **************************************************/ - --static void __devinit ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc) --{ -- u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0)); -- if (((tmp & 0xF000) >> 12) != pc->dev->core_index) { -- tmp &= ~0xF000; -- tmp |= (pc->dev->core_index << 12); -- pcicore_write16(pc, SSB_PCICORE_SPROM(0), tmp); -- } --} -- - static u8 ssb_pcicore_polarity_workaround(struct ssb_pcicore *pc) - { - return (ssb_pcie_read(pc, 0x204) & 0x10) ? 0xC0 : 0x80; -@@ -529,8 +519,6 @@ void __devinit ssb_pcicore_init(struct s - if (!ssb_device_is_enabled(dev)) - ssb_device_enable(dev, 0); - -- ssb_pcicore_fix_sprom_core_index(pc); -- - #ifdef CONFIG_SSB_PCICORE_HOSTMODE - pc->hostmode = pcicore_is_in_hostmode(pc); - if (pc->hostmode) |