Commit e9c25a40 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by Greg Kroah-Hartman

ath9k_hw: Assign default xlna config for AR9485

commit 30d5b709 upstream.

For AR9485 boards with XLNA, the default gpio config
is not set correctly, fix this.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0530bd4a
...@@ -3563,14 +3563,18 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) ...@@ -3563,14 +3563,18 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
{ {
struct ath9k_hw_capabilities *pCap = &ah->caps; struct ath9k_hw_capabilities *pCap = &ah->caps;
int chain; int chain;
u32 regval; u32 regval, value;
static const u32 switch_chain_reg[AR9300_MAX_CHAINS] = { static const u32 switch_chain_reg[AR9300_MAX_CHAINS] = {
AR_PHY_SWITCH_CHAIN_0, AR_PHY_SWITCH_CHAIN_0,
AR_PHY_SWITCH_CHAIN_1, AR_PHY_SWITCH_CHAIN_1,
AR_PHY_SWITCH_CHAIN_2, AR_PHY_SWITCH_CHAIN_2,
}; };
u32 value = ar9003_hw_ant_ctrl_common_get(ah, is2ghz); if (AR_SREV_9485(ah) && (ar9003_hw_get_rx_gain_idx(ah) == 0))
ath9k_hw_cfg_output(ah, AR9300_EXT_LNA_CTL_GPIO_AR9485,
AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED);
value = ar9003_hw_ant_ctrl_common_get(ah, is2ghz);
if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) { if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM, REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM,
......
...@@ -351,6 +351,8 @@ ...@@ -351,6 +351,8 @@
#define AR_PHY_CCA_NOM_VAL_9330_2GHZ -118 #define AR_PHY_CCA_NOM_VAL_9330_2GHZ -118
#define AR9300_EXT_LNA_CTL_GPIO_AR9485 9
/* /*
* AGC Field Definitions * AGC Field Definitions
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment