Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[uclinux-h8/linux.git] / drivers / net / wireless / ath / ath9k / btcoex.c

diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 0122639..9ac28d9 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -36,6 +36,20 @@ struct ath_btcoex_config {
        bool bt_hold_rx_clear;
 };
 
+static const u32 ar9003_wlan_weights[ATH_BTCOEX_STOMP_MAX]
+                                   [AR9300_NUM_WLAN_WEIGHTS] = {
+       { 0xfffffff0, 0xfffffff0, 0xfffffff0, 0xfffffff0 }, /* STOMP_ALL */
+       { 0x88888880, 0x88888880, 0x88888880, 0x88888880 }, /* STOMP_LOW */
+       { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* STOMP_NONE */
+};
+
+static const u32 ar9462_wlan_weights[ATH_BTCOEX_STOMP_MAX]
+                                   [AR9300_NUM_WLAN_WEIGHTS] = {
+       { 0x01017d01, 0x41414101, 0x41414101, 0x41414141 }, /* STOMP_ALL */
+       { 0x01017d01, 0x3b3b3b01, 0x3b3b3b01, 0x3b3b3b3b }, /* STOMP_LOW */
+       { 0x01017d01, 0x01010101, 0x01010101, 0x01010101 }, /* STOMP_NONE */
+       { 0x01017d01, 0x013b0101, 0x3b3b0101, 0x3b3b013b }, /* STOMP_LOW_FTP */
+};
 
 void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum)
 {
@@ -152,27 +166,26 @@ EXPORT_SYMBOL(ath9k_hw_btcoex_set_weight);
 
 static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah)
 {
-       struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
+       struct ath_btcoex_hw *btcoex = &ah->btcoex_hw;
        u32  val;
+       int i;
 
        /*
         * Program coex mode and weight registers to
         * enable coex 3-wire
         */
-       REG_WRITE(ah, AR_BT_COEX_MODE, btcoex_hw->bt_coex_mode);
-       REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex_hw->bt_coex_mode2);
+       REG_WRITE(ah, AR_BT_COEX_MODE, btcoex->bt_coex_mode);
+       REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex->bt_coex_mode2);
 
 
        if (AR_SREV_9300_20_OR_LATER(ah)) {
-               REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, ah->bt_coex_wlan_weight[0]);
-               REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, ah->bt_coex_wlan_weight[1]);
-               REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS0, ah->bt_coex_bt_weight[0]);
-               REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS1, ah->bt_coex_bt_weight[1]);
-               REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS2, ah->bt_coex_bt_weight[2]);
-               REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS3, ah->bt_coex_bt_weight[3]);
-
+               REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, btcoex->wlan_weight[0]);
+               REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, btcoex->wlan_weight[1]);
+               for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
+                       REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS(i),
+                                 btcoex->bt_weight[i]);
        } else
-               REG_WRITE(ah, AR_BT_COEX_WEIGHT, btcoex_hw->bt_coex_weights);
+               REG_WRITE(ah, AR_BT_COEX_WEIGHT, btcoex->bt_coex_weights);
 
 
 
@@ -185,10 +198,23 @@ static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah)
        REG_RMW_FIELD(ah, AR_QUIET1, AR_QUIET1_QUIET_ACK_CTS_ENABLE, 1);
        REG_RMW_FIELD(ah, AR_PCU_MISC, AR_PCU_BT_ANT_PREVENT_RX, 0);
 
-       ath9k_hw_cfg_output(ah, btcoex_hw->wlanactive_gpio,
+       ath9k_hw_cfg_output(ah, btcoex->wlanactive_gpio,
                            AR_GPIO_OUTPUT_MUX_AS_RX_CLEAR_EXTERNAL);
 }
 
+static void ath9k_hw_btcoex_enable_mci(struct ath_hw *ah)
+{
+       struct ath_btcoex_hw *btcoex = &ah->btcoex_hw;
+       int i;
+
+       for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
+               REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),
+                         btcoex->wlan_weight[i]);
+
+       REG_RMW_FIELD(ah, AR_QUIET1, AR_QUIET1_QUIET_ACK_CTS_ENABLE, 1);
+       btcoex->enabled = true;
+}
+
 void ath9k_hw_btcoex_enable(struct ath_hw *ah)
 {
        struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
@@ -202,6 +228,9 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)
        case ATH_BTCOEX_CFG_3WIRE:
                ath9k_hw_btcoex_enable_3wire(ah);
                break;
+       case ATH_BTCOEX_CFG_MCI:
+               ath9k_hw_btcoex_enable_mci(ah);
+               return;
        }
 
        REG_RMW(ah, AR_GPIO_PDPU,
@@ -215,7 +244,15 @@ EXPORT_SYMBOL(ath9k_hw_btcoex_enable);
 void ath9k_hw_btcoex_disable(struct ath_hw *ah)
 {
        struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
-
+       int i;
+
+       btcoex_hw->enabled = false;
+       if (btcoex_hw->scheme == ATH_BTCOEX_CFG_MCI) {
+               ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
+               for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
+                       REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i),
+                                 btcoex_hw->wlan_weight[i]);
+       }
        ath9k_hw_set_gpio(ah, btcoex_hw->wlanactive_gpio, 0);
 
        ath9k_hw_cfg_output(ah, btcoex_hw->wlanactive_gpio,
@@ -228,49 +265,27 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)
                if (AR_SREV_9300_20_OR_LATER(ah)) {
                        REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, 0);
                        REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, 0);
-                       REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS0, 0);
-                       REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS1, 0);
-                       REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS2, 0);
-                       REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS3, 0);
+                       for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++)
+                               REG_WRITE(ah, AR_BT_COEX_BT_WEIGHTS(i), 0);
                } else
                        REG_WRITE(ah, AR_BT_COEX_WEIGHT, 0);
 
        }
-
-       ah->btcoex_hw.enabled = false;
 }
 EXPORT_SYMBOL(ath9k_hw_btcoex_disable);
 
 static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,
                         enum ath_stomp_type stomp_type)
 {
-       ah->bt_coex_bt_weight[0] = AR9300_BT_WGHT;
-       ah->bt_coex_bt_weight[1] = AR9300_BT_WGHT;
-       ah->bt_coex_bt_weight[2] = AR9300_BT_WGHT;
-       ah->bt_coex_bt_weight[3] = AR9300_BT_WGHT;
-
-
-       switch (stomp_type) {
-       case ATH_BTCOEX_STOMP_ALL:
-               ah->bt_coex_wlan_weight[0] = AR9300_STOMP_ALL_WLAN_WGHT0;
-               ah->bt_coex_wlan_weight[1] = AR9300_STOMP_ALL_WLAN_WGHT1;
-               break;
-       case ATH_BTCOEX_STOMP_LOW:
-               ah->bt_coex_wlan_weight[0] = AR9300_STOMP_LOW_WLAN_WGHT0;
-               ah->bt_coex_wlan_weight[1] = AR9300_STOMP_LOW_WLAN_WGHT1;
-               break;
-       case ATH_BTCOEX_STOMP_NONE:
-               ah->bt_coex_wlan_weight[0] = AR9300_STOMP_NONE_WLAN_WGHT0;
-               ah->bt_coex_wlan_weight[1] = AR9300_STOMP_NONE_WLAN_WGHT1;
-               break;
-
-       default:
-               ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,
-                               "Invalid Stomptype\n");
-               break;
+       struct ath_btcoex_hw *btcoex = &ah->btcoex_hw;
+       const u32 *weight = AR_SREV_9462(ah) ? ar9003_wlan_weights[stomp_type] :
+                                              ar9462_wlan_weights[stomp_type];
+       int i;
+
+       for (i = 0; i < AR9300_NUM_WLAN_WEIGHTS; i++) {
+               btcoex->bt_weight[i] = AR9300_BT_WGHT;
+               btcoex->wlan_weight[i] = weight[i];
        }
-
-       ath9k_hw_btcoex_enable(ah);
 }
 
 /*
@@ -302,7 +317,5 @@ void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah,
                                "Invalid Stomptype\n");
                break;
        }
-
-       ath9k_hw_btcoex_enable(ah);
 }
 EXPORT_SYMBOL(ath9k_hw_btcoex_bt_stomp);