Browse Source

ath9k: Disable AIC by default

Since various MCI messages need to be
handled, along with driver-level support
in upper layers, disable AIC for now.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Sujith Manoharan 10 years ago
parent
commit
208837eeb9

+ 6 - 0
drivers/net/wireless/ath/ath9k/ar9003_aic.c

@@ -40,6 +40,12 @@ static bool ar9003_hw_is_aic_enabled(struct ath_hw *ah)
 {
 {
 	struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
 	struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
 
 
+	/*
+	 * Disable AIC for now, until we have all the
+	 * HW code and the driver-layer support ready.
+	 */
+	return false;
+
 	if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_AIC)
 	if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_AIC)
 		return false;
 		return false;
 
 

+ 2 - 1
drivers/net/wireless/ath/ath9k/ar9003_mci.c

@@ -1364,7 +1364,8 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
 		mci->need_flush_btinfo = false;
 		mci->need_flush_btinfo = false;
 		break;
 		break;
 	case MCI_STATE_AIC_CAL_SINGLE:
 	case MCI_STATE_AIC_CAL_SINGLE:
-		value = ar9003_aic_calibration_single(ah);
+		if (ath9k_hw_is_aic_enabled(ah))
+			value = ar9003_aic_calibration_single(ah);
 		break;
 		break;
 	default:
 	default:
 		break;
 		break;