From: Christian Lamparter <chunkeey@googlemail.com>
To: Rajkumar Manoharan <rmanoharan@atheros.com>
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org
Subject: Re: [PATCH] ath9k_htc: Add new devices into AR7010
Date: Wed, 10 Nov 2010 13:35:14 +0100 [thread overview]
Message-ID: <201011101335.14311.chunkeey@googlemail.com> (raw)
In-Reply-To: <1289389041-26938-1-git-send-email-rmanoharan@atheros.com>
On Wednesday 10 November 2010 12:37:21 Rajkumar Manoharan wrote:
> Treat PIDs (0xA704, 0x1200) as AR7010 devices.
just a though, but instead of relying only on the pid and
hope for no collisions. you could put a @driver_info flag
for all AR7010 devices into the usb_device_id table and
remove the per-device "cases".
Best Regards,
Chr
> ---
> diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
> index 0e12277..dfb6560 100644
> --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
> +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
> @@ -811,6 +811,8 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
> case 0x7010:
> case 0x7015:
> case 0x9018:
> + case 0xA704: <--
> + case 0x1200: <--
> firm_offset = AR7010_FIRMWARE_TEXT;
> break;
> default:
> @@ -933,6 +935,8 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
> case 0x7010:
> case 0x7015:
> case 0x9018:
> + case 0xA704:
> + case 0x1200:
> if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
> hif_dev->fw_name = FIRMWARE_AR7010_1_1;
> else
> diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> index 3d7b97f..7c8a38d 100644
> --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> @@ -249,6 +249,8 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
> case 0x7010:
> case 0x7015:
> case 0x9018:
> + case 0xA704:
> + case 0x1200:
> priv->htc->credits = 45;
> break;
> default:
> diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
> index fa05b71..52ee82d 100644
> --- a/drivers/net/wireless/ath/ath9k/reg.h
> +++ b/drivers/net/wireless/ath/ath9k/reg.h
> @@ -866,7 +866,9 @@
> #define AR_DEVID_7010(_ah) \
> (((_ah)->hw_version.devid == 0x7010) || \
> ((_ah)->hw_version.devid == 0x7015) || \
> - ((_ah)->hw_version.devid == 0x9018))
> + ((_ah)->hw_version.devid == 0x9018) || \
> + ((_ah)->hw_version.devid == 0xA704) || \
> + ((_ah)->hw_version.devid == 0x1200))
>
> #define AR_RADIO_SREV_MAJOR 0xf0
> #define AR_RAD5133_SREV_MAJOR 0xc0
next prev parent reply other threads:[~2010-11-10 12:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-10 11:37 [PATCH] ath9k_htc: Add new devices into AR7010 Rajkumar Manoharan
2010-11-10 12:35 ` Christian Lamparter [this message]
2010-11-10 13:13 ` Rajkumar Manoharan
2010-11-11 13:23 ` Rajkumar Manoharan
2010-11-11 14:12 ` Christian Lamparter
2010-11-11 15:21 ` Rajkumar Manoharan
2010-11-11 15:28 ` John W. Linville
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=201011101335.14311.chunkeey@googlemail.com \
--to=chunkeey@googlemail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rmanoharan@atheros.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).