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

Commit d808ecd8 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by Kalle Valo
Browse files

ath9k: Fix MCI TX control 



This patch makes sure that the antenna configuration
is used properly when setting AR_MCI_TX_CTRL.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e18e164e

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

+6 −2
Original line number Diff line number Diff line
@@ -973,8 +973,12 @@ int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g, 
		  (SM(0xe801, AR_MCI_MSG_ATTRIBUTES_TABLE_INVALID_HDR) |

		   SM(0x0000, AR_MCI_MSG_ATTRIBUTES_TABLE_CHECKSUM)));



	if (MCI_ANT_ARCH_PA_LNA_SHARED(mci))

		REG_CLR_BIT(ah, AR_MCI_TX_CTRL,

			    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);

	else

		REG_SET_BIT(ah, AR_MCI_TX_CTRL,

			    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);



	ar9003_mci_observation_set_up(ah);

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

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ enum mci_gpm_coex_bt_update_flags_op { 
#define ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_SHARED     0x03

#define ATH_MCI_ANT_ARCH_3_ANT                   0x04



#define MCI_ANT_ARCH_PA_LNA_SHARED(mci)					\

	((MS(mci->config, ATH_MCI_CONFIG_ANT_ARCH) == ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED) || \

	 (MS(mci->config, ATH_MCI_CONFIG_ANT_ARCH) == ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_SHARED))



enum mci_message_header {		/* length of payload */

	MCI_LNA_CTRL     = 0x10,        /* len = 0 */

	MCI_CONT_NACK    = 0x20,        /* len = 0 */