Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b686929c authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_hw: Enable calibration types in init_cal_settings 



Doing this in ath9k_hw_fill_cap_info() is odd and it's
cleaner to do this in the init function for calibration.
Also, setup the supported calibration type in init_cal_settings.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 54428c57

drivers/net/wireless/ath/ath9k/ar9003_calib.c

+11 −6
Original line number Diff line number Diff line
@@ -323,6 +323,14 @@ static const struct ath9k_percal_data iq_cal_single_sample = { 
static void ar9003_hw_init_cal_settings(struct ath_hw *ah)

{

	ah->iq_caldata.calData = &iq_cal_single_sample;



	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ah->enabled_cals |= TX_IQ_CAL;

		if (AR_SREV_9485_OR_LATER(ah))

			ah->enabled_cals |= TX_IQ_ON_AGC_CAL;

	}



	ah->supp_cals = IQ_MISMATCH_CAL;

}



/*
@@ -1131,13 +1139,10 @@ skip_tx_iqcal: 


	/* Initialize list pointers */

	ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;

	ah->supp_cals = IQ_MISMATCH_CAL;



	if (ah->supp_cals & IQ_MISMATCH_CAL) {

	INIT_CAL(&ah->iq_caldata);

	INSERT_CAL(ah, &ah->iq_caldata);

	ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");

	}



	if (ah->supp_cals & TEMP_COMP_CAL) {

		INIT_CAL(&ah->tempCompCalData);

drivers/net/wireless/ath/ath9k/hw.c

+0 −7
Original line number Diff line number Diff line
@@ -2568,12 +2568,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		rx_chainmask >>= 1;

	}



	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ah->enabled_cals |= TX_IQ_CAL;

		if (AR_SREV_9485_OR_LATER(ah))

			ah->enabled_cals |= TX_IQ_ON_AGC_CAL;

	}



	if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {

		if (!(ah->ent_mode & AR_ENT_OTP_49GHZ_DISABLE))

			pCap->hw_caps |= ATH9K_HW_CAP_MCI;
@@ -2582,7 +2576,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
			pCap->hw_caps |= ATH9K_HW_CAP_RTT;

	}





	if (AR_SREV_9280_20_OR_LATER(ah)) {

		pCap->hw_caps |= ATH9K_HW_WOW_DEVICE_CAPABLE |

				 ATH9K_HW_WOW_PATTERN_MATCH_EXACT;