> RvR test is not good when ANT control bit is not set so
> enable ANT diversity only when ANT control bit is set.
>
> Signed-off-by: Bala Shanmugam <bkamatch@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 +++++++++++++++++-----
> drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 ++
> 2 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> index 189aeb2..d2e44c3 100644
> --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> @@ -3630,15 +3630,21 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
> regval = REG_READ(ah, AR_PHY_MC_GAIN_CTRL);
> regval &= (~AR_ANT_DIV_CTRL_ALL);
> regval |= (value & 0x3f) << AR_ANT_DIV_CTRL_ALL_S;
> - /* enable_lnadiv */
> - regval &= (~AR_PHY_ANT_DIV_LNADIV);
> - regval |= ((value >> 6) & 0x1) << AR_PHY_ANT_DIV_LNADIV_S;
> +
> + if (AR_SREV_9485(ah)) {
> + /* enable_lnadiv */
> + regval &= (~AR_PHY_ANT_DIV_LNADIV);
> + regval |= ((value >> 6) & 0x1) <<
> + AR_PHY_ANT_DIV_LNADIV_S;
> + }
>
> if (AR_SREV_9565(ah)) {
> - if (ah->shared_chain_lnadiv) {
> + if (ah->shared_chain_lnadiv &&
> + (value & AR_EEP_ANT_DIV_ENABLE)) {
> + regval |= AR_ANT_DIV_ENABLE;
> regval |= (1 << AR_PHY_ANT_SW_RX_PROT_S);
> } else {
> - regval &= ~(1 << AR_PHY_ANT_DIV_LNADIV_S);
> + regval &= ~AR_ANT_DIV_ENABLE;
> regval &= ~(1 << AR_PHY_ANT_SW_RX_PROT_S);
> }
> }
> @@ -3649,6 +3655,12 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
> regval = REG_READ(ah, AR_PHY_CCK_DETECT);
> regval &= (~AR_FAST_DIV_ENABLE);
> regval |= ((value >> 7) & 0x1) << AR_FAST_DIV_ENABLE_S;
> + if (ah->shared_chain_lnadiv &&
> + (AR_SREV_9485(ah) || (AR_SREV_9565(ah) &&
> + (value & AR_EEP_FAST_DIV_ENABLE))))
> + regval |= AR_FAST_DIV_ENABLE;
> + else
> + regval &= ~AR_FAST_DIV_ENABLE;
> REG_WRITE(ah, AR_PHY_CCK_DETECT, regval);
>
These changes should be done in ar9003_hw_antctrl_shared_chain_lnadiv not in
eeprom path. Otherwise it breaks AR9330.
-Rajkumar
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
