From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
To: <linville@tuxdriver.com>
Cc: <linux-wireless@vger.kernel.org>
Subject: [PATCH 20/22] ath9k_hw: Assign macversion based on devid for built-in wmac
Date: Tue, 12 Apr 2011 18:27:20 +0530 [thread overview]
Message-ID: <1302613042-1754-21-git-send-email-vasanth@atheros.com> (raw)
In-Reply-To: <1302613042-1754-1-git-send-email-vasanth@atheros.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
---
drivers/net/wireless/ath/ath9k/hw.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 67556ca..aaf7f7a 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -247,6 +247,17 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
{
u32 val;
+ switch (ah->hw_version.devid) {
+ case AR5416_AR9100_DEVID:
+ ah->hw_version.macVersion = AR_SREV_VERSION_9100;
+ break;
+ case AR9300_DEVID_AR9340:
+ ah->hw_version.macVersion = AR_SREV_VERSION_9340;
+ val = REG_READ(ah, AR_SREV);
+ ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
+ return;
+ }
+
val = REG_READ(ah, AR_SREV) & AR_SREV_ID;
if (val == 0xFF) {
@@ -487,9 +498,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah);
int r = 0;
- if (ah->hw_version.devid == AR5416_AR9100_DEVID)
- ah->hw_version.macVersion = AR_SREV_VERSION_9100;
-
ath9k_hw_read_revisions(ah);
/*
--
1.7.0.4
prev parent reply other threads:[~2011-04-12 13:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-12 12:57 [PATCH 00/22] Add support for AR9340 Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 01/22] ath9k_hw: Define devid and mac version " Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 02/22] ath9k_hw: Take care of few host interface register changes " Vasanthakumar Thiagarajan
2011-04-13 11:05 ` Kalle Valo
2011-04-19 5:56 ` Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 05/22] ath9k_hw: Add initvals.h for ar9340 Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 08/22] ath9k_hw: Initialize tx and rx gain table from " Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 12/22] ath9k_hw: Fix register offset AR_PHY_65NM_CH0_THERM for AR9340 Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 13/22] ath9k_hw: Don't configure AR_CH0_THERM " Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 16/22] ath9k_hw: Enable byte Tx/Rx data swap " Vasanthakumar Thiagarajan
2011-04-12 12:57 ` [PATCH 19/22] ath9k: Add AR9340 platform id to id table Vasanthakumar Thiagarajan
2011-04-12 12:57 ` Vasanthakumar Thiagarajan [this message]
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=1302613042-1754-21-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).