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_hw: Set proper eeprom offset for AR9287 HTC devices

AR9287 based PCI & USB devices are differed in eeprom start offset.
So set proper the offset for HTC devices to read nvram correctly.

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 b5261cf4 7cbf2611

+5 -1
unified split
+1 -1
drivers/net/wireless/ath/ath9k/eeprom_9287.c
··· 37 37 int addr, eep_start_loc; 38 38 eep_data = (u16 *)eep; 39 39 40 - if (ah->hw_version.devid == 0x7015) 40 + if (AR9287_HTC_DEVID(ah)) 41 41 eep_start_loc = AR9287_HTC_EEP_START_LOC; 42 42 else 43 43 eep_start_loc = AR9287_EEP_START_LOC;
+4
drivers/net/wireless/ath/ath9k/reg.h
··· 870 870 ((_ah)->hw_version.devid == 0xA704) || \ 871 871 ((_ah)->hw_version.devid == 0x1200)) 872 872 873 + #define AR9287_HTC_DEVID(_ah) \ 874 + (((_ah)->hw_version.devid == 0x7015) || \ 875 + ((_ah)->hw_version.devid == 0x1200)) 876 + 873 877 #define AR_RADIO_SREV_MAJOR 0xf0 874 878 #define AR_RAD5133_SREV_MAJOR 0xc0 875 879 #define AR_RAD2133_SREV_MAJOR 0xd0