diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-19 12:39:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-19 12:39:40 +0000 |
| commit | db175c1d34b30e23e0f90311fb6dc4c078843717 (patch) | |
| tree | 1154d32bae6311f288b651ef5e23df029de445c9 /target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch | |
| parent | 07e96278b655e4dd591aa4153321bef713aad991 (diff) | |
| download | upstream-db175c1d34b30e23e0f90311fb6dc4c078843717.tar.gz upstream-db175c1d34b30e23e0f90311fb6dc4c078843717.tar.bz2 upstream-db175c1d34b30e23e0f90311fb6dc4c078843717.zip | |
kernel: backport SSB/BCMA changes in preparation for a compat-wireless update
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36367 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch index c40a58ecaa..1dfb35dc21 100644 --- a/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch +++ b/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch @@ -476,7 +476,7 @@ #define SSB_CHIPCO_BCAST_ADDR 0x0050 #define SSB_CHIPCO_BCAST_DATA 0x0054 #define SSB_CHIPCO_GPIOPULLUP 0x0058 /* Rev >= 20 only */ -@@ -503,7 +516,7 @@ +@@ -504,7 +517,7 @@ #define SSB_CHIPCO_FLASHCTL_ST_PP 0x0302 /* Page Program */ #define SSB_CHIPCO_FLASHCTL_ST_SE 0x02D8 /* Sector Erase */ #define SSB_CHIPCO_FLASHCTL_ST_BE 0x00C7 /* Bulk Erase */ @@ -485,7 +485,7 @@ #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 */ -@@ -594,6 +607,9 @@ struct ssb_chipcommon { +@@ -595,6 +608,9 @@ struct ssb_chipcommon { struct ssb_chipcommon_pmu pmu; u32 ticks_per_ms; u32 max_timer_ms; |