aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-06-05 19:16:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-06-05 19:16:16 +0000
commit1d301e00afc0c215ca988353a3ca81dd0ce08b1a (patch)
treec86f9df396582fa04490bfac7dc1d4021c1f7c56
parenteed81419760d281cb95ba112f5aa9ea9aea03b15 (diff)
downloadupstream-1d301e00afc0c215ca988353a3ca81dd0ce08b1a.tar.gz
upstream-1d301e00afc0c215ca988353a3ca81dd0ce08b1a.tar.bz2
upstream-1d301e00afc0c215ca988353a3ca81dd0ce08b1a.zip
ath9k: merge a fix for ar9550 eeprom access
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36858
-rw-r--r--package/mac80211/patches/300-pending_work.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 46e539bebf..18379c09ca 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -5038,3 +5038,25 @@
skb = ieee80211_get_buffered_bc(hw, vif);
}
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+@@ -68,13 +68,16 @@
+ #define AR9300_BASE_ADDR 0x3ff
+ #define AR9300_BASE_ADDR_512 0x1ff
+
+-#define AR9300_OTP_BASE (AR_SREV_9340(ah) ? 0x30000 : 0x14000)
+-#define AR9300_OTP_STATUS (AR_SREV_9340(ah) ? 0x30018 : 0x15f18)
++#define AR9300_OTP_BASE \
++ ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000)
++#define AR9300_OTP_STATUS \
++ ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30018 : 0x15f18)
+ #define AR9300_OTP_STATUS_TYPE 0x7
+ #define AR9300_OTP_STATUS_VALID 0x4
+ #define AR9300_OTP_STATUS_ACCESS_BUSY 0x2
+ #define AR9300_OTP_STATUS_SM_BUSY 0x1
+-#define AR9300_OTP_READ_DATA (AR_SREV_9340(ah) ? 0x3001c : 0x15f1c)
++#define AR9300_OTP_READ_DATA \
++ ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c)
+
+ enum targetPowerHTRates {
+ HT_TARGET_RATE_0_8_16,