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

Commit c9f1e326 authored by Christian Lamparter's avatar Christian Lamparter Committed by Kalle Valo
Browse files

ath9k: use correct OTP register offsets for the AR9340 and AR9550 



This patch fixes the OTP register definitions for the AR934x and AR9550
WMAC SoC.

Previously, the ath9k driver was unable to initialize the integrated
WMAC on an Aerohive AP121:

| ath: phy0: timeout (1000 us) on reg 0x30018: 0xbadc0ffe & 0x00000007 != 0x00000004
| ath: phy0: timeout (1000 us) on reg 0x30018: 0xbadc0ffe & 0x00000007 != 0x00000004
| ath: phy0: Unable to initialize hardware; initialization status: -5
| ath9k ar934x_wmac: failed to initialize device
| ath9k: probe of ar934x_wmac failed with error -5

It turns out that the AR9300_OTP_STATUS and AR9300_OTP_DATA
definitions contain a typo.

Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: stable@vger.kernel.org
Fixes: add295a4 "ath9k: use correct OTP register offsets for AR9550"
Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarChris Blake <chrisrblake93@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 07460b92

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

+2 −2
Original line number Diff line number Diff line
@@ -75,13 +75,13 @@ 
#define AR9300_OTP_BASE \

		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000)

#define AR9300_OTP_STATUS \

		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30018 : 0x15f18)

		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x31018 : 0x15f18)

#define AR9300_OTP_STATUS_TYPE		0x7

#define AR9300_OTP_STATUS_VALID		0x4

#define AR9300_OTP_STATUS_ACCESS_BUSY	0x2

#define AR9300_OTP_STATUS_SM_BUSY	0x1

#define AR9300_OTP_READ_DATA \

		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c)

		((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3101c : 0x15f1c)



enum targetPowerHTRates {

	HT_TARGET_RATE_0_8_16,