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

Commit 56266bff authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_hw: Remove unnecessary chainmask configuration 



The chainmasks were already configured at process_ini
before doing init calibration.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 479c6892

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

+0 −15
Original line number Diff line number Diff line
@@ -839,20 +839,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
			       struct ath9k_channel *chan)

{

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath9k_hw_capabilities *pCap = &ah->caps;

	int val;

	bool txiqcal_done = false;



	val = REG_READ(ah, AR_ENT_OTP);

	ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);



	/* Configure rx/tx chains before running AGC/TxiQ cals */

	if (val & AR_ENT_OTP_CHAIN2_DISABLE)

		ar9003_hw_set_chain_masks(ah, 0x3, 0x3);

	else

		ar9003_hw_set_chain_masks(ah, pCap->rx_chainmask,

					  pCap->tx_chainmask);



	/* Do Tx IQ Calibration */

	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,

		      AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
@@ -887,9 +875,6 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
	if (txiqcal_done)

		ar9003_hw_tx_iq_cal_post_proc(ah);



	/* Revert chainmasks to their original values before NF cal */

	ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);



	ath9k_hw_start_nfcal(ah, true);



	/* Initialize list pointers */

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

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, 
	udelay(synthDelay + BASE_ACTIVATE_DELAY);

}



void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)

static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)

{

	switch (rx) {

	case 0x5:

drivers/net/wireless/ath/ath9k/ar9003_phy.h

+0 −2
Original line number Diff line number Diff line
@@ -1124,6 +1124,4 @@ 
#define AR_PHY_CL_TAB_CL_GAIN_MOD		0x1f

#define AR_PHY_CL_TAB_CL_GAIN_MOD_S		0



void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);



#endif  /* AR9003_PHY_H */