From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH V2 11/22] ath9k_hw: Clean up rx/tx chain configuration before AGC/IQ cal
Date: Tue, 19 Apr 2011 19:29:09 +0530 [thread overview]
Message-ID: <1303221560-25139-12-git-send-email-vasanth@atheros.com> (raw)
In-Reply-To: <1303221560-25139-1-git-send-email-vasanth@atheros.com>
Use hw supported chains instead of hard coded values.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
---
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 4a4cd88..09f3aa7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -940,21 +940,18 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
struct ath9k_channel *chan)
{
struct ath_common *common = ath9k_hw_common(ah);
+ struct ath9k_hw_capabilities *pCap = &ah->caps;
int val;
val = REG_READ(ah, AR_ENT_OTP);
ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);
- if (AR_SREV_9485(ah))
- ar9003_hw_set_chain_masks(ah, 0x1, 0x1);
- else if (val & AR_ENT_OTP_CHAIN2_DISABLE)
+ /* Configure rx/tx chains before running AGC/TxiQ cals */
+ if (val & AR_ENT_OTP_CHAIN2_DISABLE)
ar9003_hw_set_chain_masks(ah, 0x3, 0x3);
else
- /*
- * 0x7 = 0b111 , AR9003 needs to be configured for 3-chain
- * mode before running AGC/TxIQ cals
- */
- ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
+ ar9003_hw_set_chain_masks(ah, pCap->rx_chainmask,
+ pCap->tx_chainmask);
/* Do Tx IQ Calibration */
if (AR_SREV_9485(ah))
--
1.7.0.4
next prev parent reply other threads:[~2011-04-19 13:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 13:58 [PATCH V2 00/22] Add support for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 02/22] ath9k_hw: Take care of few host interface register changes " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 03/22] ath9k_hw: Get AHB clock information from ath9k_platform_data Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 04/22] ath9k_hw: Configure pll control register accordingly for AR9340 Vasanthakumar Thiagarajan
2011-04-19 14:13 ` Sujith
2011-04-20 4:35 ` Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 05/22] ath9k_hw: Add initvals.h for ar9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 08/22] ath9k_hw: Initialize tx and rx gain table from " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 09/22] ath9k_hw: Read spur frequency information from eeprom for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 10/22] ath9k_hw: Configure RF channel freqency " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` Vasanthakumar Thiagarajan [this message]
2011-04-19 13:59 ` [PATCH V2 13/22] ath9k_hw: Don't configure AR_CH0_THERM " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 14/22] ath9k_hw: Skip internal regulator configuration " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 15/22] ath9k_hw: Configure tuning capacitance value for AR9340 as well Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 16/22] ath9k_hw: Enable byte Tx/Rx data swap for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 17/22] ath9k_hw: Configure chain switch table and attenuation control only for active chains Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 18/22] ath9k_hw: Read iq calibration data " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 19/22] ath9k: Add AR9340 platform id to id table Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 21/22] ath9k_hw: Disable INTR_HOST1_FATAL to avoid interrupt strom with ar9430 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 22/22] ath9k_hw: Enable AR9340 support Vasanthakumar Thiagarajan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303221560-25139-12-git-send-email-vasanth@atheros.com \
--to=vasanth@atheros.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).