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>

diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index c80492bac76867111d3f81435dcadc526f590ddc..cdfa80d0eb4d7241aaf6a69378f2059ccb8127e7 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -20,7 +20,14 @@
 #define ATH_WLANACTIVE_GPIO    5
 #define ATH_BTACTIVE_GPIO      6
 
+enum ath_btcoex_scheme {
+       ATH_BTCOEX_CFG_NONE,
+       ATH_BTCOEX_CFG_2WIRE,
+       ATH_BTCOEX_CFG_3WIRE,
+};
+
 struct ath_btcoex_info {
+       enum ath_btcoex_scheme btcoex_scheme;
        u8 wlanactive_gpio;
        u8 btactive_gpio;
 };

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 3bb6abd7b2b67c98543eab5d257c42bb073faee3..7b4bc8b74bb85d09f5ccd5dbfde1ea004c4d3b35 100644 (file)
--- 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)
 {
        struct ath9k_hw_capabilities *pCap = &ah->caps;
        struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
+       struct ath_btcoex_info *btcoex_info = &ah->ah_sc->btcoex_info;
 
        u16 capField = 0, eeval;
 
@@ -3666,8 +3667,15 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
        if (AR_SREV_9280_10_OR_LATER(ah) && btcoex_enable) {
                pCap->hw_caps |= ATH9K_HW_CAP_BT_COEX;
-               ah->ah_sc->btcoex_info.btactive_gpio = ATH_BTACTIVE_GPIO;
-               ah->ah_sc->btcoex_info.wlanactive_gpio = ATH_WLANACTIVE_GPIO;
+               btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO;
+               btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
+
+               if (AR_SREV_9285(ah))
+                       btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_3WIRE;
+               else
+                       btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE;
+       } else {
+               btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
        }
 }
 

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 878d3be7c717395bdaeec1f0543dfefff47311b9..8a2f000274b575be622623590f8f02ba2d7fa4b2 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1509,7 +1509,8 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc)
                        ARRAY_SIZE(ath9k_5ghz_chantable);
        }
 
-       if (ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX)
+       if ((ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) &&
+           (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE))
                ath9k_hw_btcoex_init(ah);
 
        return 0;
@@ -1993,6 +1994,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
 
        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) &&
+           (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE) &&
            !(sc->sc_flags & SC_OP_BTCOEX_ENABLED))
                ath9k_hw_btcoex_enable(sc->sc_ah);