diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-22 16:30:42 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-22 16:30:42 +0000 |
| commit | 31a40f97ef54e10e2b3dc3cacb9cff436657c586 (patch) | |
| tree | d0486f6bcb4c6cac1c25d4787ca13885ef6bd7ad /target/linux/brcm47xx/patches-2.6.39 | |
| parent | 13a779d3f3a91f0f029990ac96a7607aa24f6fe6 (diff) | |
brcm47xx: update bcma and ssb to master-2011-07-21
* add new patches for bcm4716 SoC
* add support for serial flash on bcma bus
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.39')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.39/240-ssb_no_sprom_on_pci.patch | 28 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.39/951-brcm4716-defines.patch | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/240-ssb_no_sprom_on_pci.patch b/target/linux/brcm47xx/patches-2.6.39/240-ssb_no_sprom_on_pci.patch deleted file mode 100644 index 52c8fe95f..000000000 --- a/target/linux/brcm47xx/patches-2.6.39/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) diff --git a/target/linux/brcm47xx/patches-2.6.39/951-brcm4716-defines.patch b/target/linux/brcm47xx/patches-2.6.39/951-brcm4716-defines.patch index 4cd700891..25cd46996 100644 --- a/target/linux/brcm47xx/patches-2.6.39/951-brcm4716-defines.patch +++ b/target/linux/brcm47xx/patches-2.6.39/951-brcm4716-defines.patch @@ -25,7 +25,7 @@ ssb_printk(KERN_ERR PFX --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h -@@ -155,9 +155,16 @@ struct ssb_bus_ops { +@@ -157,9 +157,16 @@ struct ssb_bus_ops { #define SSB_DEV_MINI_MACPHY 0x823 #define SSB_DEV_ARM_1176 0x824 #define SSB_DEV_ARM_7TDMI 0x825 |