From patchwork Tue Apr 19 14:03:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasanthakumar Thiagarajan X-Patchwork-Id: 718231 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3JE3RpW015899 for ; Tue, 19 Apr 2011 14:03:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752561Ab1DSODW (ORCPT ); Tue, 19 Apr 2011 10:03:22 -0400 Received: from mail.atheros.com ([12.19.149.2]:57296 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751749Ab1DSODV (ORCPT ); Tue, 19 Apr 2011 10:03:21 -0400 Received: from mail.atheros.com ([10.234.20.105]) by sidewinder.atheros.com for ; Tue, 19 Apr 2011 07:02:55 -0700 Received: from localhost.localdomain (10.12.4.43) by SC1EXHC-01.global.atheros.com (10.234.20.111) with Microsoft SMTP Server id 8.2.213.0; Tue, 19 Apr 2011 07:03:19 -0700 From: Vasanthakumar Thiagarajan To: linville@tuxdriver.com CC: linux-wireless@vger.kernel.org Subject: [PATCH V2 20/22] ath9k_hw: Assign macversion based on devid for built-in wmac Date: Tue, 19 Apr 2011 19:33:23 +0530 Message-ID: <1303221803-25230-5-git-send-email-vasanth@atheros.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1303221803-25230-1-git-send-email-vasanth@atheros.com> References: <1303221803-25230-1-git-send-email-vasanth@atheros.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 14:03:27 +0000 (UTC) Signed-off-by: Vasanthakumar Thiagarajan --- 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 9df2fe8..c725640 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) { @@ -484,9 +495,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); /*