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

Commit bab1f62e authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k_hw: move init config and default after chip is up 



This allows us to add SREV checks on these helpers.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8525f280

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

+5 −4
Original line number Diff line number Diff line
@@ -409,8 +409,6 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah) 
	ah->hw_version.subvendorid = 0;



	ah->ah_flags = 0;

	if (ah->hw_version.devid == AR5416_AR9100_DEVID)

		ah->hw_version.macVersion = AR_SREV_VERSION_9100;

	if (!AR_SREV_9100(ah))

		ah->ah_flags = AH_USE_EEPROM;
@@ -873,8 +871,8 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
	struct ath_common *common = ath9k_hw_common(ah);

	int r = 0;



	ath9k_hw_init_defaults(ah);

	ath9k_hw_init_config(ah);

	if (ah->hw_version.devid == AR5416_AR9100_DEVID)

		ah->hw_version.macVersion = AR_SREV_VERSION_9100;



	if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {

		ath_print(common, ATH_DBG_FATAL,
@@ -882,6 +880,9 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
		return -EIO;

	}



	ath9k_hw_init_defaults(ah);

	ath9k_hw_init_config(ah);



	ath9k_hw_attach_ops(ah);



	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) {