From: Bala Shanmugam <bkamatch@qca.qualcomm.com>
To: Sujith Manoharan <c_manoha@qualcomm.com>
Cc: <linville@tuxdriver.com>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 1/7] ath9k_hw: Add version/revision macros for AR9565
Date: Tue, 11 Sep 2012 18:12:45 +0530 [thread overview]
Message-ID: <504F31C5.4020901@qca.qualcomm.com> (raw)
In-Reply-To: <20557.25427.250740.150293@gargle.gargle.HOWL>
On 09/10/2012 09:19 AM, Sujith Manoharan wrote:
> And recognize the device in the init path.
>
> Signed-off-by: Sujith Manoharan<c_manoha@qca.qualcomm.com>
> ---
> drivers/net/wireless/ath/ath9k/hw.c | 7 +++++--
> drivers/net/wireless/ath/ath9k/hw.h | 1 +
> drivers/net/wireless/ath/ath9k/reg.h | 9 +++++++++
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
> index 48af401..3638626 100644
> --- a/drivers/net/wireless/ath/ath9k/hw.c
> +++ b/drivers/net/wireless/ath/ath9k/hw.c
> @@ -355,7 +355,7 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
> (val& AR_SREV_VERSION2)>> AR_SREV_TYPE2_S;
> ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
>
> - if (AR_SREV_9462(ah))
> + if (AR_SREV_9462(ah) || AR_SREV_9565(ah))
> ah->is_pciexpress = true;
> else
> ah->is_pciexpress = (val&
> @@ -647,6 +647,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)
> case AR_SREV_VERSION_9340:
> case AR_SREV_VERSION_9462:
> case AR_SREV_VERSION_9550:
> + case AR_SREV_VERSION_9565:
> break;
> default:
> ath_err(common,
> @@ -708,7 +709,7 @@ int ath9k_hw_init(struct ath_hw *ah)
> int ret;
> struct ath_common *common = ath9k_hw_common(ah);
>
> - /* These are all the AR5008/AR9001/AR9002 hardware family of chipsets */
> + /* These are all the AR5008/AR9001/AR9002/AR9003 hardware family of chipsets */
> switch (ah->hw_version.devid) {
> case AR5416_DEVID_PCI:
> case AR5416_DEVID_PCIE:
> @@ -728,6 +729,7 @@ int ath9k_hw_init(struct ath_hw *ah)
> case AR9300_DEVID_AR9580:
> case AR9300_DEVID_AR9462:
> case AR9485_DEVID_AR1111:
> + case AR9300_DEVID_AR9565:
> break;
> default:
> if (common->bus_ops->ath_bus_type == ATH_USB)
> @@ -3157,6 +3159,7 @@ static struct {
> { AR_SREV_VERSION_9485, "9485" },
> { AR_SREV_VERSION_9462, "9462" },
> { AR_SREV_VERSION_9550, "9550" },
> + { AR_SREV_VERSION_9565, "9565" },
> };
>
> /* For devices with external radios */
> diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
> index 6599a75..0d17ce0 100644
> --- a/drivers/net/wireless/ath/ath9k/hw.h
> +++ b/drivers/net/wireless/ath/ath9k/hw.h
> @@ -50,6 +50,7 @@
> #define AR9300_DEVID_AR9330 0x0035
> #define AR9300_DEVID_QCA955X 0x0038
> #define AR9485_DEVID_AR1111 0x0037
> +#define AR9300_DEVID_AR9565 0x0036
>
> #define AR5416_AR9100_DEVID 0x000b
>
> diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
> index 87cac8e..6ca34a4 100644
> --- a/drivers/net/wireless/ath/ath9k/reg.h
> +++ b/drivers/net/wireless/ath/ath9k/reg.h
> @@ -801,6 +801,8 @@
> #define AR_SREV_REVISION_9580_10 4 /* AR9580 1.0 */
> #define AR_SREV_VERSION_9462 0x280
> #define AR_SREV_REVISION_9462_20 2
> +#define AR_SREV_VERSION_9565 0x2C0
> +#define AR_SREV_REVISION_9565_10 0
> #define AR_SREV_VERSION_9550 0x400
>
> #define AR_SREV_5416(_ah) \
> @@ -909,6 +911,13 @@
> (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9462)&& \
> ((_ah)->hw_version.macRev>= AR_SREV_REVISION_9462_20))
>
> +#define AR_SREV_9565(_ah) \
> + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565))
> +
> +#define AR_SREV_9565_10(_ah) \
> + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9565)&& \
> + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9565_10)))
> +
There is an extra braces. Please check.
> #define AR_SREV_9550(_ah) \
> (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9550))
>
next prev parent reply other threads:[~2012-09-11 12:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 3:49 [PATCH 1/7] ath9k_hw: Add version/revision macros for AR9565 Sujith Manoharan
2012-09-11 12:42 ` Bala Shanmugam [this message]
2012-09-11 14:39 ` Sujith Manoharan
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=504F31C5.4020901@qca.qualcomm.com \
--to=bkamatch@qca.qualcomm.com \
--cc=c_manoha@qualcomm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.