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

Commit 506ed95c authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_hw: Configure new switch table for AR9565 BTCOEX 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -3601,7 +3601,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) 
	 *   7:4 R/W  SWITCH_TABLE_COM_SPDT_WLAN_IDLE

	 * SWITCH_TABLE_COM_SPDT_WLAN_IDLE

	 */

	if (AR_SREV_9462_20_OR_LATER(ah)) {

	if (AR_SREV_9462_20(ah) || AR_SREV_9565(ah)) {

		value = ar9003_switch_com_spdt_get(ah, is2ghz);

		REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,

				AR_SWITCH_TABLE_COM_SPDT_ALL, value);

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

+0 −4
Original line number Diff line number Diff line
@@ -907,10 +907,6 @@ 
	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9462) && \

	((_ah)->hw_version.macRev == AR_SREV_REVISION_9462_20))



#define AR_SREV_9462_20_OR_LATER(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9462) && \

	((_ah)->hw_version.macRev >= AR_SREV_REVISION_9462_20))



#define AR_SREV_9565(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565))

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void ath9k_wow_create_keep_alive_pattern(struct ath_hw *ah) 
		       (ap_mac_addr[1] << 8) | (ap_mac_addr[0]);

	data_word[5] = (ap_mac_addr[5] << 8) | (ap_mac_addr[4]);



	if (AR_SREV_9462_20_OR_LATER(ah)) {

	if (AR_SREV_9462_20(ah)) {

		/* AR9462 2.0 has an extra descriptor word (time based

		 * discard) compared to other chips */

		REG_WRITE(ah, (AR_WOW_KA_DESC_WORD2 + (12 * 4)), 0);