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

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

ath9k: Remove incorrect diversity initialization 



Fast antenna diversity is required only for single chain
chips and the diversity initialization is done in the
per-family board setup routines. Enabling of diversity
should be done based on the calibrated EEPROM/OTP data,
doing it for all chips is incorrect.

Remove the code that sets the fast_div bit for all cards, since
the documentation for the AR_PHY_CCK_DETECT register says:

reg 642: sig_detect_cck
enable_ant_fast_div : Only used for single chain chips.

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

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

+0 −3
Original line number Diff line number Diff line
@@ -631,9 +631,6 @@ static void ar5008_hw_override_ini(struct ath_hw *ah, 
		REG_WRITE(ah, AR_PCU_MISC_MODE2, val);

	}



	REG_SET_BIT(ah, AR_PHY_CCK_DETECT,

		    AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV);



	if (AR_SREV_9280_20_OR_LATER(ah))

		return;

	/*

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

+0 −3
Original line number Diff line number Diff line
@@ -632,9 +632,6 @@ static void ar9003_hw_override_ini(struct ath_hw *ah) 
	       AR_PCU_MISC_MODE2_CFP_IGNORE;

	REG_WRITE(ah, AR_PCU_MISC_MODE2, val);



	REG_SET_BIT(ah, AR_PHY_CCK_DETECT,

		    AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV);



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

		REG_WRITE(ah, AR_GLB_SWREG_DISCONT_MODE,

			  AR_GLB_SWREG_DISCONT_EN_BT_WLAN);