tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ath9k_htc: Add new devices into AR7010

Treat new PIDs (0xA704, 0x1200) as AR7010 devices.

Cc: stable@kernel.org
Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by Rajkumar Manoharan and committed by John W. Linville 7cbf2611 32b08955

+9 -1
unified split
+4
drivers/net/wireless/ath/ath9k/hif_usb.c
··· 811 811 case 0x7010: 812 812 case 0x7015: 813 813 case 0x9018: 814 + case 0xA704: 815 + case 0x1200: 814 816 firm_offset = AR7010_FIRMWARE_TEXT; 815 817 break; 816 818 default: ··· 935 933 case 0x7010: 936 934 case 0x7015: 937 935 case 0x9018: 936 + case 0xA704: 937 + case 0x1200: 938 938 if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202) 939 939 hif_dev->fw_name = FIRMWARE_AR7010_1_1; 940 940 else
+2
drivers/net/wireless/ath/ath9k/htc_drv_init.c
··· 249 249 case 0x7010: 250 250 case 0x7015: 251 251 case 0x9018: 252 + case 0xA704: 253 + case 0x1200: 252 254 priv->htc->credits = 45; 253 255 break; 254 256 default:
+3 -1
drivers/net/wireless/ath/ath9k/reg.h
··· 866 866 #define AR_DEVID_7010(_ah) \ 867 867 (((_ah)->hw_version.devid == 0x7010) || \ 868 868 ((_ah)->hw_version.devid == 0x7015) || \ 869 - ((_ah)->hw_version.devid == 0x9018)) 869 + ((_ah)->hw_version.devid == 0x9018) || \ 870 + ((_ah)->hw_version.devid == 0xA704) || \ 871 + ((_ah)->hw_version.devid == 0x1200)) 870 872 871 873 #define AR_RADIO_SREV_MAJOR 0xf0 872 874 #define AR_RAD5133_SREV_MAJOR 0xc0