diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-07-15 13:53:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-17 15:11:36 -0400 |
commit | 08a4a1ab0725d89ca1df80f2ebe8443da82cd34f (patch) | |
tree | acb335635ca806a7a3a7185221b96eaf7b27b456 /drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |
parent | 3e2ea543286dc2a4df46633a2ab6fda5f1a98cf3 (diff) |
ath9k_hw: fix SREV checks for applying tuning caps from EEPROM
AR9485, AR9330 and AR9340 are the chips that this is *NOT* supposed to be
applied on.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_eeprom.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index c5f3c430c985..b5c8450e1b9f 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3890,6 +3890,9 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah) | |||
3890 | struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep; | 3890 | struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep; |
3891 | u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0]; | 3891 | u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0]; |
3892 | 3892 | ||
3893 | if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah)) | ||
3894 | return; | ||
3895 | |||
3893 | if (eep->baseEepHeader.featureEnable & 0x40) { | 3896 | if (eep->baseEepHeader.featureEnable & 0x40) { |
3894 | tuning_caps_param &= 0x7f; | 3897 | tuning_caps_param &= 0x7f; |
3895 | REG_RMW_FIELD(ah, AR_CH0_XTAL, AR_CH0_XTAL_CAPINDAC, | 3898 | REG_RMW_FIELD(ah, AR_CH0_XTAL, AR_CH0_XTAL_CAPINDAC, |
@@ -3987,8 +3990,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah, | |||
3987 | ar9003_hw_quick_drop_apply(ah, chan->channel); | 3990 | ar9003_hw_quick_drop_apply(ah, chan->channel); |
3988 | if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9550(ah)) | 3991 | if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9550(ah)) |
3989 | ar9003_hw_internal_regulator_apply(ah); | 3992 | ar9003_hw_internal_regulator_apply(ah); |
3990 | if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah)) | 3993 | ar9003_hw_apply_tuning_caps(ah); |
3991 | ar9003_hw_apply_tuning_caps(ah); | ||
3992 | ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz); | 3994 | ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz); |
3993 | } | 3995 | } |
3994 | 3996 | ||