ath9k: Enable MCI for AR9565
authorBala Shanmugam <bkamatch@qca.qualcomm.com>
Wed, 26 Sep 2012 11:34:26 +0000 (17:04 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Sep 2012 17:54:07 +0000 (13:54 -0400)
Signed-off-by: Bala Shanmugam <bkamatch@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/btcoex.c
drivers/net/wireless/ath/ath9k/gpio.c
drivers/net/wireless/ath/ath9k/wow.c

index acd437384fe47840852aeb3f967524ac52265975..4ef610e63fcbee45037b422c68786fb0932500e5 100644 (file)
@@ -282,7 +282,7 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)
                ath9k_hw_btcoex_enable_2wire(ah);
                break;
        case ATH_BTCOEX_CFG_3WIRE:
-               if (AR_SREV_9462(ah)) {
+               if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
                        ath9k_hw_btcoex_enable_mci(ah);
                        return;
                }
@@ -304,7 +304,7 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)
        int i;
 
        btcoex_hw->enabled = false;
-       if (AR_SREV_9462(ah)) {
+       if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
                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),
@@ -339,7 +339,7 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,
        const u32 *weight = ar9003_wlan_weights[stomp_type];
        int i;
 
-       if (AR_SREV_9462(ah)) {
+       if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
                if ((stomp_type == ATH_BTCOEX_STOMP_LOW) &&
                    btcoex->mci.stomp_ftp)
                        stomp_type = ATH_BTCOEX_STOMP_LOW_FTP;
index bf7d29ec1a87cac0f501354a2c9d18b553441c88..5faa4f777122ae384223f7f9f5f9048c60c73db4 100644 (file)
@@ -412,7 +412,7 @@ void ath9k_stop_btcoex(struct ath_softc *sc)
                if (ath9k_hw_get_btcoex_scheme(ah) == ATH_BTCOEX_CFG_3WIRE)
                        ath9k_btcoex_timer_pause(sc);
                ath9k_hw_btcoex_disable(ah);
-               if (AR_SREV_9462(ah))
+               if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
                        ath_mci_flush_profile(&sc->btcoex.mci);
        }
 }
index 44a08eb53c62bc74baed99b25176d554571a5f58..a483d518758cfe4d57f1b38c8e8812b3ce3d8a74 100644 (file)
@@ -497,7 +497,7 @@ void ath9k_hw_wow_enable(struct ath_hw *ah, u32 pattern_enable)
 
        REG_RMW(ah, AR_PCIE_PM_CTRL, set, clr);
 
-       if (AR_SREV_9462(ah)) {
+       if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
                /*
                 * this is needed to prevent the chip waking up
                 * the host within 3-4 seconds with certain