diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-07-23 16:25:17 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-24 11:02:39 -0400 |
| commit | c2b8359d7878f75584ed68b7a2b930bd9bea814d (patch) | |
| tree | 491257b9955fb717733f8b4874484d5588ec059d /drivers/net/wireless/ath/ath9k/ar9003_phy.c | |
| parent | a4df8f56e92104c5e7be82cc2c471e600ea3f9ef (diff) | |
| download | linux-c2b8359d7878f75584ed68b7a2b930bd9bea814d.tar.gz linux-c2b8359d7878f75584ed68b7a2b930bd9bea814d.tar.bz2 linux-c2b8359d7878f75584ed68b7a2b930bd9bea814d.zip | |
ath9k: Fix diversity combining for AR9285
When antenna diversity combining is enabled in the EEPROM,
the initial values for the MAIN/ALT config have to be
programmed correctly. This patch adds it for AR9285.
Since the diversity combining macros are common to all chip
families, remove the redundant AR9285 macros and move the
definitions to phy.h.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_phy.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 2db4ddf74bc2..3ec33ce7be66 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -1465,8 +1465,8 @@ static void ar9003_hw_antctrl_shared_chain_lnadiv(struct ath_hw *ah, AR_PHY_ANT_DIV_ALT_LNACONF | AR_PHY_ANT_DIV_MAIN_GAINTB | AR_PHY_ANT_DIV_ALT_GAINTB); - regval |= (AR_PHY_ANT_DIV_LNA1 << AR_PHY_ANT_DIV_MAIN_LNACONF_S); - regval |= (AR_PHY_ANT_DIV_LNA2 << AR_PHY_ANT_DIV_ALT_LNACONF_S); + regval |= (ATH_ANT_DIV_COMB_LNA1 << AR_PHY_ANT_DIV_MAIN_LNACONF_S); + regval |= (ATH_ANT_DIV_COMB_LNA2 << AR_PHY_ANT_DIV_ALT_LNACONF_S); REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval); } } |