dfcd340721
Add patches from Hauke adding linux 3.0 compatibility. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 27187
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -560,6 +560,7 @@ static int __ath9k_hw_init(struct ath_hw
|
|
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;
|
|
@@ -570,7 +571,8 @@ static int __ath9k_hw_init(struct ath_hw
|
|
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);
|
|
@@ -2584,6 +2586,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" },
|
|
};
|
|
|
|
--- 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) \
|