diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-07-11 22:20:26 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-07-11 22:20:26 +0000 |
| commit | c09cf1db9473ea3ca88ed633801b2042126c08b2 (patch) | |
| tree | 8b95f2ea5ea87e7c27370bd70256b457048aeac1 /target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch | |
| parent | 0a2e45ea30966e3587a9d937361bc1c05c6588d6 (diff) | |
| download | upstream-c09cf1db9473ea3ca88ed633801b2042126c08b2.tar.gz upstream-c09cf1db9473ea3ca88ed633801b2042126c08b2.tar.bz2 upstream-c09cf1db9473ea3ca88ed633801b2042126c08b2.zip | |
kernel: update bcma and ssb to wireless-testing/master master-2013-07-03
This updates 025-bcma_backport.patch and 020-ssb_update.patch to a
version of ssb and bcma used in recent wireless-testing. I removed all
patches adding serial and nand flash support before doing so to not
conflict with the existing flash support in the brcm47xx target. This
update was done to easily update the wireless drivers afterwards.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37261 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch b/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch index 12055bff03..4fa76e159e 100644 --- a/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch +++ b/target/linux/brcm47xx/patches-3.3/022-ssb-move-flash-to-chipcommon.patch @@ -63,11 +63,11 @@ struct ssb_bus *bus = mcore->dev->bus; - mcore->flash_buswidth = 2; -- if (bus->chipco.dev) { +- if (ssb_chipco_available(&bus->chipco)) { - mcore->flash_window = 0x1c000000; - mcore->flash_window_size = 0x02000000; + /* When there is no chipcommon on the bus there is 4MB flash */ -+ if (!bus->chipco.dev) { ++ if (!ssb_chipco_available(&bus->chipco)) { + pr_info("found parallel flash.\n"); + bus->chipco.flash_type = SSB_PFLASH; + bus->chipco.pflash.window = SSB_FLASH1; @@ -104,7 +104,7 @@ --- a/include/linux/ssb/ssb_driver_chipcommon.h +++ b/include/linux/ssb/ssb_driver_chipcommon.h -@@ -582,6 +582,18 @@ struct ssb_chipcommon_pmu { +@@ -583,6 +583,18 @@ struct ssb_chipcommon_pmu { u32 crystalfreq; /* The active crystal frequency (in kHz) */ }; @@ -123,10 +123,10 @@ struct ssb_chipcommon { struct ssb_device *dev; u32 capabilities; -@@ -589,6 +601,12 @@ struct ssb_chipcommon { - /* Fast Powerup Delay constant */ - u16 fast_pwrup_delay; +@@ -593,6 +605,12 @@ struct ssb_chipcommon { struct ssb_chipcommon_pmu pmu; + u32 ticks_per_ms; + u32 max_timer_ms; +#ifdef CONFIG_SSB_DRIVER_MIPS + enum ssb_flash_type flash_type; + union { |