diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-08-13 00:58:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-24 13:59:45 -0400 |
commit | 56266bff6df685d9c26d08904ae1d43bad162539 (patch) | |
tree | fd40d3232426d2616e5ea29901ac8681cb7212ea /drivers/net/wireless/ath | |
parent | 479c68927af8735597505320032c249e894f6b6c (diff) |
ath9k_hw: Remove unnecessary chainmask configuration
The chainmasks were already configured at process_ini
before doing init calibration.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_calib.c | 15 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c index f48051c50092..fa35a0235f44 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c | |||
@@ -839,20 +839,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, | |||
839 | struct ath9k_channel *chan) | 839 | struct ath9k_channel *chan) |
840 | { | 840 | { |
841 | struct ath_common *common = ath9k_hw_common(ah); | 841 | struct ath_common *common = ath9k_hw_common(ah); |
842 | struct ath9k_hw_capabilities *pCap = &ah->caps; | ||
843 | int val; | ||
844 | bool txiqcal_done = false; | 842 | bool txiqcal_done = false; |
845 | 843 | ||
846 | val = REG_READ(ah, AR_ENT_OTP); | ||
847 | ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val); | ||
848 | |||
849 | /* Configure rx/tx chains before running AGC/TxiQ cals */ | ||
850 | if (val & AR_ENT_OTP_CHAIN2_DISABLE) | ||
851 | ar9003_hw_set_chain_masks(ah, 0x3, 0x3); | ||
852 | else | ||
853 | ar9003_hw_set_chain_masks(ah, pCap->rx_chainmask, | ||
854 | pCap->tx_chainmask); | ||
855 | |||
856 | /* Do Tx IQ Calibration */ | 844 | /* Do Tx IQ Calibration */ |
857 | REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1, | 845 | REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1, |
858 | AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT, | 846 | AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT, |
@@ -887,9 +875,6 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, | |||
887 | if (txiqcal_done) | 875 | if (txiqcal_done) |
888 | ar9003_hw_tx_iq_cal_post_proc(ah); | 876 | ar9003_hw_tx_iq_cal_post_proc(ah); |
889 | 877 | ||
890 | /* Revert chainmasks to their original values before NF cal */ | ||
891 | ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask); | ||
892 | |||
893 | ath9k_hw_start_nfcal(ah, true); | 878 | ath9k_hw_start_nfcal(ah, true); |
894 | 879 | ||
895 | /* Initialize list pointers */ | 880 | /* Initialize list pointers */ |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index a0aaa6855486..88468a0d65d6 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c | |||
@@ -540,7 +540,7 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, | |||
540 | udelay(synthDelay + BASE_ACTIVATE_DELAY); | 540 | udelay(synthDelay + BASE_ACTIVATE_DELAY); |
541 | } | 541 | } |
542 | 542 | ||
543 | void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) | 543 | static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) |
544 | { | 544 | { |
545 | switch (rx) { | 545 | switch (rx) { |
546 | case 0x5: | 546 | case 0x5: |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h index 6de3f0bc18e6..3aca9fa2d27b 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h | |||
@@ -1124,6 +1124,4 @@ | |||
1124 | #define AR_PHY_CL_TAB_CL_GAIN_MOD 0x1f | 1124 | #define AR_PHY_CL_TAB_CL_GAIN_MOD 0x1f |
1125 | #define AR_PHY_CL_TAB_CL_GAIN_MOD_S 0 | 1125 | #define AR_PHY_CL_TAB_CL_GAIN_MOD_S 0 |
1126 | 1126 | ||
1127 | void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx); | ||
1128 | |||
1129 | #endif /* AR9003_PHY_H */ | 1127 | #endif /* AR9003_PHY_H */ |