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

Commit 2131fabb authored by Miaoqing Pan's avatar Miaoqing Pan Committed by Kalle Valo
Browse files

ath9k: Add HW IDs for QCA956x 



Signed-off-by: default avatarMiaoqing Pan <miaoqing@qca.qualcomm.com>
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 350b193e

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

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ static const struct platform_device_id ath9k_platform_id_table[] = { 
		.name = "qca953x_wmac",

		.driver_data = AR9300_DEVID_AR953X,

	},

	{

		.name = "qca956x_wmac",

		.driver_data = AR9300_DEVID_QCA956X,

	},

	{},

};

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

+4 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah) 
	case AR9300_DEVID_AR953X:

		ah->hw_version.macVersion = AR_SREV_VERSION_9531;

		return;

	case AR9300_DEVID_QCA956X:

		ah->hw_version.macVersion = AR_SREV_VERSION_9561;

	}



	val = REG_READ(ah, AR_SREV) & AR_SREV_ID;
@@ -539,6 +541,7 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
	case AR_SREV_VERSION_9550:

	case AR_SREV_VERSION_9565:

	case AR_SREV_VERSION_9531:

	case AR_SREV_VERSION_9561:

		break;

	default:

		ath_err(common,
@@ -639,6 +642,7 @@ int ath9k_hw_init(struct ath_hw *ah) 
	case AR9485_DEVID_AR1111:

	case AR9300_DEVID_AR9565:

	case AR9300_DEVID_AR953X:

	case AR9300_DEVID_QCA956X:

		break;

	default:

		if (common->bus_ops->ath_bus_type == ATH_USB)

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

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define AR9485_DEVID_AR1111	0x0037

#define AR9300_DEVID_AR9565     0x0036

#define AR9300_DEVID_AR953X     0x003d

#define AR9300_DEVID_QCA956X    0x003f



#define AR5416_AR9100_DEVID	0x000b

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

+4 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ 
#define AR_SREV_REVISION_9531_10        0

#define AR_SREV_REVISION_9531_11        1

#define AR_SREV_REVISION_9531_20        2

#define AR_SREV_VERSION_9561            0x600



#define AR_SREV_5416(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -974,6 +975,9 @@ 
	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \

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



#define AR_SREV_9561(_ah) \

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



/* NOTE: When adding chips newer than Peacock, add chip check here */

#define AR_SREV_9580_10_OR_LATER(_ah) \

	(AR_SREV_9580(_ah))