projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| c06f7f46 GKH |
1 | From 7cbf2611dac8d5f76fe64795a9426b8c97e6c3f8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Rajkumar Manoharan <rmanoharan@atheros.com> | |
| 3 | Date: Wed, 10 Nov 2010 17:51:25 +0530 | |
| 4 | Subject: ath9k_htc: Add new devices into AR7010 | |
| 5 | ||
| 6 | From: Rajkumar Manoharan <rmanoharan@atheros.com> | |
| 7 | ||
| 8 | commit 7cbf2611dac8d5f76fe64795a9426b8c97e6c3f8 upstream. | |
| 9 | ||
| 10 | Treat new PIDs (0xA704, 0x1200) as AR7010 devices. | |
| 11 | ||
| 12 | Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com> | |
| 13 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 15 | ||
| 16 | --- | |
| 17 | drivers/net/wireless/ath/ath9k/hif_usb.c | 4 ++++ | |
| 18 | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 ++ | |
| 19 | drivers/net/wireless/ath/ath9k/reg.h | 4 +++- | |
| 20 | 3 files changed, 9 insertions(+), 1 deletion(-) | |
| 21 | ||
| 22 | --- a/drivers/net/wireless/ath/ath9k/hif_usb.c | |
| 23 | +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c | |
| 24 | @@ -803,6 +803,8 @@ static int ath9k_hif_usb_download_fw(str | |
| 25 | case 0x7010: | |
| 26 | case 0x7015: | |
| 27 | case 0x9018: | |
| 28 | + case 0xA704: | |
| 29 | + case 0x1200: | |
| 30 | firm_offset = AR7010_FIRMWARE_TEXT; | |
| 31 | break; | |
| 32 | default: | |
| 33 | @@ -909,6 +911,8 @@ static int ath9k_hif_usb_probe(struct us | |
| 34 | case 0x7010: | |
| 35 | case 0x7015: | |
| 36 | case 0x9018: | |
| 37 | + case 0xA704: | |
| 38 | + case 0x1200: | |
| 39 | if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202) | |
| 40 | hif_dev->fw_name = FIRMWARE_AR7010_1_1; | |
| 41 | else | |
| 42 | --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |
| 43 | +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |
| 44 | @@ -247,6 +247,8 @@ static int ath9k_init_htc_services(struc | |
| 45 | case 0x7010: | |
| 46 | case 0x7015: | |
| 47 | case 0x9018: | |
| 48 | + case 0xA704: | |
| 49 | + case 0x1200: | |
| 50 | priv->htc->credits = 45; | |
| 51 | break; | |
| 52 | default: | |
| 53 | --- a/drivers/net/wireless/ath/ath9k/reg.h | |
| 54 | +++ b/drivers/net/wireless/ath/ath9k/reg.h | |
| 55 | @@ -901,7 +901,9 @@ | |
| 56 | #define AR_DEVID_7010(_ah) \ | |
| 57 | (((_ah)->hw_version.devid == 0x7010) || \ | |
| 58 | ((_ah)->hw_version.devid == 0x7015) || \ | |
| 59 | - ((_ah)->hw_version.devid == 0x9018)) | |
| 60 | + ((_ah)->hw_version.devid == 0x9018) || \ | |
| 61 | + ((_ah)->hw_version.devid == 0xA704) || \ | |
| 62 | + ((_ah)->hw_version.devid == 0x1200)) | |
| 63 | ||
| 64 | #define AR9287_HTC_DEVID(_ah) \ | |
| 65 | (((_ah)->hw_version.devid == 0x7015) || \ |