diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2010-06-17 00:59:01 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-18 15:05:12 -0400 |
commit | 4e63f768c3b85ae2b3ea6251231fd5cc46ec598d (patch) | |
tree | f628c0fc48b125aeaac2c262c2b6bad43013555d /drivers | |
parent | 1baf8a90bd5ad61bc0c55521cc097586531e7eb7 (diff) |
ath9k_htc: Update supported product list
This patch adds USB IDs for some more supported
devices.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hif_usb.c | 20 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 9 |
2 files changed, 15 insertions, 14 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 5f3ea7091ae0..74bc80f50292 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c | |||
@@ -17,9 +17,17 @@ | |||
17 | #include "htc.h" | 17 | #include "htc.h" |
18 | 18 | ||
19 | static struct usb_device_id ath9k_hif_usb_ids[] = { | 19 | static struct usb_device_id ath9k_hif_usb_ids[] = { |
20 | { USB_DEVICE(0x0cf3, 0x9271) }, | 20 | { USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */ |
21 | { USB_DEVICE(0x0cf3, 0x1006) }, | 21 | { USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */ |
22 | { USB_DEVICE(0x0cf3, 0x7010) }, | 22 | { USB_DEVICE(0x0cf3, 0x7010) }, /* Atheros */ |
23 | { USB_DEVICE(0x0cf3, 0x7015) }, /* Atheros */ | ||
24 | { USB_DEVICE(0x0846, 0x9030) }, /* Netgear N150 */ | ||
25 | { USB_DEVICE(0x0846, 0x9018) }, /* Netgear WNDA3200 */ | ||
26 | { USB_DEVICE(0x07D1, 0x3A10) }, /* Dlink Wireless 150 */ | ||
27 | { USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */ | ||
28 | { USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */ | ||
29 | { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */ | ||
30 | { USB_DEVICE(0x083A, 0xA704) }, /* SMC Networks */ | ||
23 | { }, | 31 | { }, |
24 | }; | 32 | }; |
25 | 33 | ||
@@ -879,17 +887,15 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface, | |||
879 | /* Find out which firmware to load */ | 887 | /* Find out which firmware to load */ |
880 | 888 | ||
881 | switch(hif_dev->device_id) { | 889 | switch(hif_dev->device_id) { |
882 | case 0x9271: | ||
883 | case 0x1006: | ||
884 | hif_dev->fw_name = "ar9271.fw"; | ||
885 | break; | ||
886 | case 0x7010: | 890 | case 0x7010: |
891 | case 0x9018: | ||
887 | if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202) | 892 | if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202) |
888 | hif_dev->fw_name = "ar7010_1_1.fw"; | 893 | hif_dev->fw_name = "ar7010_1_1.fw"; |
889 | else | 894 | else |
890 | hif_dev->fw_name = "ar7010.fw"; | 895 | hif_dev->fw_name = "ar7010.fw"; |
891 | break; | 896 | break; |
892 | default: | 897 | default: |
898 | hif_dev->fw_name = "ar9271.fw"; | ||
893 | break; | 899 | break; |
894 | } | 900 | } |
895 | 901 | ||
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index a63ae88abf3e..148b43317fdb 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |||
@@ -244,17 +244,12 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid) | |||
244 | */ | 244 | */ |
245 | 245 | ||
246 | switch(devid) { | 246 | switch(devid) { |
247 | case 0x9271: | ||
248 | case 0x1006: | ||
249 | priv->htc->credits = 33; | ||
250 | break; | ||
251 | case 0x7010: | 247 | case 0x7010: |
248 | case 0x9018: | ||
252 | priv->htc->credits = 45; | 249 | priv->htc->credits = 45; |
253 | break; | 250 | break; |
254 | default: | 251 | default: |
255 | dev_err(priv->dev, "ath9k_htc: Unsupported device id: 0x%x\n", | 252 | priv->htc->credits = 33; |
256 | devid); | ||
257 | goto err; | ||
258 | } | 253 | } |
259 | 254 | ||
260 | ret = htc_init(priv->htc); | 255 | ret = htc_init(priv->htc); |