diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-01 13:12:31 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-06-01 13:12:31 +0000 |
| commit | 520149cb7f85a6f527f270005c83afad3a0b7bda (patch) | |
| tree | 0808a998afabf4c21d3dcc55c2f2cd40f413bcd8 /package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch | |
| parent | 3db28f95612c6624080170a8ad73192e579f82ea (diff) | |
mac80211: add initial support for AR9330
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27084 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch')
| -rw-r--r-- | package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch b/package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch new file mode 100644 index 0000000000..09fd3e3bdc --- /dev/null +++ b/package/mac80211/patches/540-ath9k-define-mac-version-for-AR9330.patch @@ -0,0 +1,64 @@ +diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c +index 1be7c8b..05c2ba2 100644 +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -551,6 +551,7 @@ static int __ath9k_hw_init(struct ath_hw *ah) + case AR_SREV_VERSION_9287: + case AR_SREV_VERSION_9271: + case AR_SREV_VERSION_9300: ++ case AR_SREV_VERSION_9330: + case AR_SREV_VERSION_9485: + case AR_SREV_VERSION_9340: + break; +@@ -561,7 +562,8 @@ static int __ath9k_hw_init(struct ath_hw *ah) + return -EOPNOTSUPP; + } + +- if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah)) ++ if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah) || ++ AR_SREV_9330(ah)) + ah->is_pciexpress = false; + + ah->hw_version.phyRev = REG_READ(ah, AR_PHY_CHIP_ID); +@@ -2574,6 +2576,7 @@ static struct { + { AR_SREV_VERSION_9287, "9287" }, + { AR_SREV_VERSION_9271, "9271" }, + { AR_SREV_VERSION_9300, "9300" }, ++ { AR_SREV_VERSION_9330, "9330" }, + { AR_SREV_VERSION_9485, "9485" }, + }; + +diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h +index c18ee99..a483388 100644 +--- a/drivers/net/wireless/ath/ath9k/reg.h ++++ b/drivers/net/wireless/ath/ath9k/reg.h +@@ -788,6 +788,10 @@ + #define AR_SREV_REVISION_9271_11 1 + #define AR_SREV_VERSION_9300 0x1c0 + #define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */ ++#define AR_SREV_VERSION_9330 0x200 ++#define AR_SREV_REVISION_9330_10 0 ++#define AR_SREV_REVISION_9330_11 1 ++#define AR_SREV_REVISION_9330_12 2 + #define AR_SREV_VERSION_9485 0x240 + #define AR_SREV_REVISION_9485_10 0 + #define AR_SREV_REVISION_9485_11 1 +@@ -862,6 +866,18 @@ + #define AR_SREV_9300_20_OR_LATER(_ah) \ + ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300) + ++#define AR_SREV_9330(_ah) \ ++ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330)) ++#define AR_SREV_9330_10(_ah) \ ++ (AR_SREV_9330((_ah)) && \ ++ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_10)) ++#define AR_SREV_9330_11(_ah) \ ++ (AR_SREV_9330((_ah)) && \ ++ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_11)) ++#define AR_SREV_9330_12(_ah) \ ++ (AR_SREV_9330((_ah)) && \ ++ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9330_12)) ++ + #define AR_SREV_9485(_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9485)) + #define AR_SREV_9485_10(_ah) \ |