Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7ec8fb4 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB) 



AR9287 devices (PCI/USB) use different eeprom start location
to read nvram. New devices might endup with same devid. So use
driver_info to set offset, instead of devid. driver_info is
valid for HTC devices alone which is filled in usb_device_id.

Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 64f12170

drivers/net/wireless/ath/ath9k/eeprom_9287.c

+3 −3
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah) 
	int addr, eep_start_loc;

	eep_data = (u16 *)eep;



	if (AR9287_HTC_DEVID(ah))

		eep_start_loc = AR9287_HTC_EEP_START_LOC;

	else

	if (!common->driver_info)

		eep_start_loc = AR9287_EEP_START_LOC;

	else

		eep_start_loc = AR9287_HTC_EEP_START_LOC;



	if (!ath9k_hw_use_flash(ah)) {

		ath_print(common, ATH_DBG_EEPROM,

drivers/net/wireless/ath/ath9k/reg.h

+0 −4
Original line number Diff line number Diff line
@@ -870,10 +870,6 @@ 
	 ((_ah)->hw_version.devid == 0xA704) || \

	 ((_ah)->hw_version.devid == 0x1200))



#define AR9287_HTC_DEVID(_ah) \

	(((_ah)->hw_version.devid == 0x7015) || \

	 ((_ah)->hw_version.devid == 0x1200))



#define AR_RADIO_SREV_MAJOR                   0xf0

#define AR_RAD5133_SREV_MAJOR                 0xc0

#define AR_RAD2133_SREV_MAJOR                 0xd0