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: Add HW IDs for QCA956x

Signed-off-by: Miaoqing Pan <miaoqing@qca.qualcomm.com>
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Miaoqing Pan and committed by
Kalle Valo 2131fabb 350b193e

+13
+4
drivers/net/wireless/ath/ath9k/ahb.c
··· 43 43 .name = "qca953x_wmac", 44 44 .driver_data = AR9300_DEVID_AR953X, 45 45 }, 46 + { 47 + .name = "qca956x_wmac", 48 + .driver_data = AR9300_DEVID_QCA956X, 49 + }, 46 50 {}, 47 51 }; 48 52
+4
drivers/net/wireless/ath/ath9k/hw.c
··· 246 246 case AR9300_DEVID_AR953X: 247 247 ah->hw_version.macVersion = AR_SREV_VERSION_9531; 248 248 return; 249 + case AR9300_DEVID_QCA956X: 250 + ah->hw_version.macVersion = AR_SREV_VERSION_9561; 249 251 } 250 252 251 253 val = REG_READ(ah, AR_SREV) & AR_SREV_ID; ··· 541 539 case AR_SREV_VERSION_9550: 542 540 case AR_SREV_VERSION_9565: 543 541 case AR_SREV_VERSION_9531: 542 + case AR_SREV_VERSION_9561: 544 543 break; 545 544 default: 546 545 ath_err(common, ··· 642 639 case AR9485_DEVID_AR1111: 643 640 case AR9300_DEVID_AR9565: 644 641 case AR9300_DEVID_AR953X: 642 + case AR9300_DEVID_QCA956X: 645 643 break; 646 644 default: 647 645 if (common->bus_ops->ath_bus_type == ATH_USB)
+1
drivers/net/wireless/ath/ath9k/hw.h
··· 54 54 #define AR9485_DEVID_AR1111 0x0037 55 55 #define AR9300_DEVID_AR9565 0x0036 56 56 #define AR9300_DEVID_AR953X 0x003d 57 + #define AR9300_DEVID_QCA956X 0x003f 57 58 58 59 #define AR5416_AR9100_DEVID 0x000b 59 60
+4
drivers/net/wireless/ath/ath9k/reg.h
··· 814 814 #define AR_SREV_REVISION_9531_10 0 815 815 #define AR_SREV_REVISION_9531_11 1 816 816 #define AR_SREV_REVISION_9531_20 2 817 + #define AR_SREV_VERSION_9561 0x600 817 818 818 819 #define AR_SREV_5416(_ah) \ 819 820 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \ ··· 974 973 #define AR_SREV_9531_20(_ah) \ 975 974 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \ 976 975 ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_20)) 976 + 977 + #define AR_SREV_9561(_ah) \ 978 + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9561)) 977 979 978 980 /* NOTE: When adding chips newer than Peacock, add chip check here */ 979 981 #define AR_SREV_9580_10_OR_LATER(_ah) \