]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ath9k: fix antenna diversity configuration for non AR9485 chips
authorGabor Juhos <juhosg@openwrt.org>
Tue, 21 Jun 2011 09:23:44 +0000 (11:23 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Jun 2011 20:09:55 +0000 (16:09 -0400)
The current values must be used only on AR9485 chips. Other chips
requires different values.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar9003_phy.c

index 5e987c7aacd09d7a87d11cf7eea45a389f7a8421..e788fa0d5afdfa92d578536d79d0db784aa09d87 100644 (file)
@@ -1214,8 +1214,14 @@ static void ar9003_hw_antdiv_comb_conf_get(struct ath_hw *ah,
                                 AR_PHY_9485_ANT_DIV_ALT_LNACONF_S;
        antconf->fast_div_bias = (regval & AR_PHY_9485_ANT_FAST_DIV_BIAS) >>
                                  AR_PHY_9485_ANT_FAST_DIV_BIAS_S;
-       antconf->lna1_lna2_delta = -9;
-       antconf->div_group = 2;
+
+       if (AR_SREV_9485(ah)) {
+               antconf->lna1_lna2_delta = -9;
+               antconf->div_group = 2;
+       } else {
+               antconf->lna1_lna2_delta = -3;
+               antconf->div_group = 0;
+       }
 }
 
 static void ar9003_hw_antdiv_comb_conf_set(struct ath_hw *ah,