Return-path: Received: from nbd.name ([46.4.11.11]:49715 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757241Ab2GKR70 (ORCPT ); Wed, 11 Jul 2012 13:59:26 -0400 From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, mcgrof@qca.qualcomm.com Subject: [PATCH 12/12] ath9k_hw: fix SREV checks for applying tuning caps from EEPROM Date: Wed, 11 Jul 2012 19:59:15 +0200 Message-Id: <1342029555-31618-12-git-send-email-nbd@openwrt.org> (sfid-20120711_202113_654457_39CA3E31) In-Reply-To: <1342029555-31618-11-git-send-email-nbd@openwrt.org> References: <1342029555-31618-1-git-send-email-nbd@openwrt.org> <1342029555-31618-2-git-send-email-nbd@openwrt.org> <1342029555-31618-3-git-send-email-nbd@openwrt.org> <1342029555-31618-4-git-send-email-nbd@openwrt.org> <1342029555-31618-5-git-send-email-nbd@openwrt.org> <1342029555-31618-6-git-send-email-nbd@openwrt.org> <1342029555-31618-7-git-send-email-nbd@openwrt.org> <1342029555-31618-8-git-send-email-nbd@openwrt.org> <1342029555-31618-9-git-send-email-nbd@openwrt.org> <1342029555-31618-10-git-send-email-nbd@openwrt.org> <1342029555-31618-11-git-send-email-nbd@openwrt.org> Sender: linux-wireless-owner@vger.kernel.org List-ID: AR9485, AR9330 and AR9340 are the chips that this is *NOT* supposed to be applied on. Signed-off-by: Felix Fietkau --- 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 c5f3c43..b5c8450 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) struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep; u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0]; + if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah)) + return; + if (eep->baseEepHeader.featureEnable & 0x40) { tuning_caps_param &= 0x7f; 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, ar9003_hw_quick_drop_apply(ah, chan->channel); if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9550(ah)) ar9003_hw_internal_regulator_apply(ah); - if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah)) - ar9003_hw_apply_tuning_caps(ah); + ar9003_hw_apply_tuning_caps(ah); ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz); } -- 1.7.3.2