aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.c
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vasanth@atheros.com>2009-08-26 11:38:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-28 14:40:50 -0400
commit22f25d0d5e146112d4ec464564ebb49a5b8a547b (patch)
tree31145930a77a642673dcebdf1b0c3f09485fed4c /drivers/net/wireless/ath/ath9k/hw.c
parentf14462c6661c6b9e91d436f7ab66b35ed52ea703 (diff)
ath9k: Determine btcoex scheme type based on chip version
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 3bb6abd7b2b6..7b4bc8b74bb8 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3489,6 +3489,7 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
3489{ 3489{
3490 struct ath9k_hw_capabilities *pCap = &ah->caps; 3490 struct ath9k_hw_capabilities *pCap = &ah->caps;
3491 struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); 3491 struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
3492 struct ath_btcoex_info *btcoex_info = &ah->ah_sc->btcoex_info;
3492 3493
3493 u16 capField = 0, eeval; 3494 u16 capField = 0, eeval;
3494 3495
@@ -3666,8 +3667,15 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
3666 3667
3667 if (AR_SREV_9280_10_OR_LATER(ah) && btcoex_enable) { 3668 if (AR_SREV_9280_10_OR_LATER(ah) && btcoex_enable) {
3668 pCap->hw_caps |= ATH9K_HW_CAP_BT_COEX; 3669 pCap->hw_caps |= ATH9K_HW_CAP_BT_COEX;
3669 ah->ah_sc->btcoex_info.btactive_gpio = ATH_BTACTIVE_GPIO; 3670 btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO;
3670 ah->ah_sc->btcoex_info.wlanactive_gpio = ATH_WLANACTIVE_GPIO; 3671 btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
3672
3673 if (AR_SREV_9285(ah))
3674 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_3WIRE;
3675 else
3676 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE;
3677 } else {
3678 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
3671 } 3679 }
3672} 3680}
3673 3681