diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-12 22:42:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-12 22:42:18 +0000 |
| commit | 1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068 (patch) | |
| tree | 3e1be3d06231d100c7133e2413cda80d9a74a9b8 /target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch | |
| parent | d085aad2880f799cc09b03a3329635ad84551d3b (diff) | |
| download | upstream-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.gz upstream-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.tar.bz2 upstream-1bd8db0bd63d1c11bb2a73a41835f7d1eb3ca068.zip | |
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
SVN-Revision: 34651
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch index d65fc0a5b4..8b218f3070 100644 --- a/target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch +++ b/target/linux/brcm47xx/patches-3.3/060-ssb-add-serial-flash-driver.patch @@ -434,7 +434,7 @@ pr_debug("Found parallel flash\n"); --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include <linux/ssb/ssb_driver_gige.h> #include <linux/dma-mapping.h> #include <linux/pci.h> @@ -442,7 +442,7 @@ #include <linux/mmc/sdio_func.h> #include <linux/slab.h> -@@ -534,6 +535,15 @@ static int ssb_devices_register(struct s +@@ -540,6 +541,15 @@ static int ssb_devices_register(struct s dev_idx++; } @@ -460,9 +460,9 @@ /* Unwind the already registered devices. */ --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h -@@ -211,4 +211,16 @@ static inline void b43_pci_ssb_bridge_ex - extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc); - extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc); +@@ -242,4 +242,16 @@ static inline int ssb_watchdog_register( + } + #endif /* CONFIG_SSB_EMBEDDED */ +#ifdef CONFIG_SSB_SFLASH +/* driver_chipcommon_sflash.c */ @@ -515,10 +515,10 @@ #define SSB_CHIPCO_FLASHCTL_ST_RES 0x03AB /* Read Electronic Signature */ #define SSB_CHIPCO_FLASHCTL_ST_CSA 0x1000 /* Keep chip select asserted */ #define SSB_CHIPCO_FLASHCTL_ST_SSE 0x0220 /* Sub-sector Erase */ -@@ -591,6 +604,9 @@ struct ssb_chipcommon { - /* Fast Powerup Delay constant */ - u16 fast_pwrup_delay; +@@ -593,6 +606,9 @@ struct ssb_chipcommon { struct ssb_chipcommon_pmu pmu; + u32 ticks_per_ms; + u32 max_timer_ms; +#ifdef CONFIG_SSB_SFLASH + struct bcm47xx_sflash sflash; +#endif |