diff options
author | Bala Shanmugam <bkamatch@qca.qualcomm.com> | 2012-09-26 07:34:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-28 13:54:07 -0400 |
commit | 6a73f507cf51a6a9e327fd9e36690072c657d36e (patch) | |
tree | 866186b8749cdae9772c779841597e7b2d64df76 | |
parent | 58901d181f12807d6bfa7ef29547b560740dd305 (diff) |
ath9k: Enable MCI for AR9565
Signed-off-by: Bala Shanmugam <bkamatch@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/btcoex.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/gpio.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/wow.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c index acd437384fe4..4ef610e63fcb 100644 --- a/drivers/net/wireless/ath/ath9k/btcoex.c +++ b/drivers/net/wireless/ath/ath9k/btcoex.c | |||
@@ -282,7 +282,7 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah) | |||
282 | ath9k_hw_btcoex_enable_2wire(ah); | 282 | ath9k_hw_btcoex_enable_2wire(ah); |
283 | break; | 283 | break; |
284 | case ATH_BTCOEX_CFG_3WIRE: | 284 | case ATH_BTCOEX_CFG_3WIRE: |
285 | if (AR_SREV_9462(ah)) { | 285 | if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) { |
286 | ath9k_hw_btcoex_enable_mci(ah); | 286 | ath9k_hw_btcoex_enable_mci(ah); |
287 | return; | 287 | return; |
288 | } | 288 | } |
@@ -304,7 +304,7 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah) | |||
304 | int i; | 304 | int i; |
305 | 305 | ||
306 | btcoex_hw->enabled = false; | 306 | btcoex_hw->enabled = false; |
307 | if (AR_SREV_9462(ah)) { | 307 | if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) { |
308 | ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE); | 308 | ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE); |
309 | for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++) | 309 | for (i = 0; i < AR9300_NUM_BT_WEIGHTS; i++) |
310 | REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i), | 310 | REG_WRITE(ah, AR_MCI_COEX_WL_WEIGHTS(i), |
@@ -339,7 +339,7 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah, | |||
339 | const u32 *weight = ar9003_wlan_weights[stomp_type]; | 339 | const u32 *weight = ar9003_wlan_weights[stomp_type]; |
340 | int i; | 340 | int i; |
341 | 341 | ||
342 | if (AR_SREV_9462(ah)) { | 342 | if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) { |
343 | if ((stomp_type == ATH_BTCOEX_STOMP_LOW) && | 343 | if ((stomp_type == ATH_BTCOEX_STOMP_LOW) && |
344 | btcoex->mci.stomp_ftp) | 344 | btcoex->mci.stomp_ftp) |
345 | stomp_type = ATH_BTCOEX_STOMP_LOW_FTP; | 345 | stomp_type = ATH_BTCOEX_STOMP_LOW_FTP; |
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c index bf7d29ec1a87..5faa4f777122 100644 --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c | |||
@@ -412,7 +412,7 @@ void ath9k_stop_btcoex(struct ath_softc *sc) | |||
412 | if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE) | 412 | if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE) |
413 | ath9k_btcoex_timer_pause(sc); | 413 | ath9k_btcoex_timer_pause(sc); |
414 | ath9k_hw_btcoex_disable(ah); | 414 | ath9k_hw_btcoex_disable(ah); |
415 | if (AR_SREV_9462(ah)) | 415 | if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) |
416 | ath_mci_flush_profile(&sc->btcoex.mci); | 416 | ath_mci_flush_profile(&sc->btcoex.mci); |
417 | } | 417 | } |
418 | } | 418 | } |
diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c index 44a08eb53c62..a483d518758c 100644 --- a/drivers/net/wireless/ath/ath9k/wow.c +++ b/drivers/net/wireless/ath/ath9k/wow.c | |||
@@ -497,7 +497,7 @@ void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable) | |||
497 | 497 | ||
498 | REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr); | 498 | REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr); |
499 | 499 | ||
500 | if (AR_SREV_9462(ah)) { | 500 | if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) { |
501 | /* | 501 | /* |
502 | * this is needed to prevent the chip waking up | 502 | * this is needed to prevent the chip waking up |
503 | * the host within 3-4 seconds with certain | 503 | * the host within 3-4 seconds with certain |