diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2012-10-15 05:59:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 15:19:30 -0400 |
commit | 506ed95c27b9e4db521df8433860da78b4747cd8 (patch) | |
tree | f71a306b29989622aacbfb3339e56e501c768ede /drivers | |
parent | 6f37ff96d3bd2a53e68131a7c10ced933815b390 (diff) |
ath9k_hw: Configure new switch table for AR9565 BTCOEX
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/reg.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/wow.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index d31399871e8d..c86cb6400040 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3601,7 +3601,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) | |||
3601 | * 7:4 R/W SWITCH_TABLE_COM_SPDT_WLAN_IDLE | 3601 | * 7:4 R/W SWITCH_TABLE_COM_SPDT_WLAN_IDLE |
3602 | * SWITCH_TABLE_COM_SPDT_WLAN_IDLE | 3602 | * SWITCH_TABLE_COM_SPDT_WLAN_IDLE |
3603 | */ | 3603 | */ |
3604 | if (AR_SREV_9462_20_OR_LATER(ah)) { | 3604 | if (AR_SREV_9462_20(ah) || AR_SREV_9565(ah)) { |
3605 | value = ar9003_switch_com_spdt_get(ah, is2ghz); | 3605 | value = ar9003_switch_com_spdt_get(ah, is2ghz); |
3606 | REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL, | 3606 | REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL, |
3607 | AR_SWITCH_TABLE_COM_SPDT_ALL, value); | 3607 | AR_SWITCH_TABLE_COM_SPDT_ALL, value); |
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index 8f40dba9142d..e9dec138b913 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h | |||
@@ -907,10 +907,6 @@ | |||
907 | (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9462) && \ | 907 | (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9462) && \ |
908 | ((_ah)->hw_version.macRev == AR_SREV_REVISION_9462_20)) | 908 | ((_ah)->hw_version.macRev == AR_SREV_REVISION_9462_20)) |
909 | 909 | ||
910 | #define AR_SREV_9462_20_OR_LATER(_ah) \ | ||
911 | (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9462) && \ | ||
912 | ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9462_20)) | ||
913 | |||
914 | #define AR_SREV_9565(_ah) \ | 910 | #define AR_SREV_9565(_ah) \ |
915 | (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565)) | 911 | (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565)) |
916 | 912 | ||
diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c index a483d518758c..9f8563091bea 100644 --- a/drivers/net/wireless/ath/ath9k/wow.c +++ b/drivers/net/wireless/ath/ath9k/wow.c | |||
@@ -118,7 +118,7 @@ static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah) | |||
118 | (ap_mac_addr[1] << 8) | (ap_mac_addr[0]); | 118 | (ap_mac_addr[1] << 8) | (ap_mac_addr[0]); |
119 | data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]); | 119 | data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]); |
120 | 120 | ||
121 | if (AR_SREV_9462_20_OR_LATER(ah)) { | 121 | if (AR_SREV_9462_20(ah)) { |
122 | /* AR9462 2.0 has an extra descriptor word (time based | 122 | /* AR9462 2.0 has an extra descriptor word (time based |
123 | * discard) compared to other chips */ | 123 | * discard) compared to other chips */ |
124 | REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0); | 124 | REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0); |