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

Commit b99a7be4 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k_hw: Define devid and mac version for AR9340 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 534f0e29

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

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
		return -EOPNOTSUPP;

	}



	if (AR_SREV_9271(ah) || AR_SREV_9100(ah))

	if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah))

		ah->is_pciexpress = false;



	ah->hw_version.phyRev = REG_READ(ah, AR_PHY_CHIP_ID);

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

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define AR9287_DEVID_PCI	0x002d

#define AR9287_DEVID_PCIE	0x002e

#define AR9300_DEVID_PCIE	0x0030

#define AR9300_DEVID_AR9340	0x0031

#define AR9300_DEVID_AR9485_PCIE 0x0032



#define AR5416_AR9100_DEVID	0x000b

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

+4 −0
Original line number Diff line number Diff line
@@ -790,6 +790,7 @@ 
#define AR_SREV_VERSION_9485		0x240

#define AR_SREV_REVISION_9485_10	0

#define AR_SREV_REVISION_9485_11        1

#define AR_SREV_VERSION_9340		0x300



#define AR_SREV_5416(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -869,6 +870,9 @@ 
	(AR_SREV_9485(_ah) && \

	 ((_ah)->hw_version.macRev == AR_SREV_REVISION_9485_11))



#define AR_SREV_9340(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9340))



#define AR_SREV_9285E_20(_ah) \

    (AR_SREV_9285_12_OR_LATER(_ah) && \

     ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))