From: Lorenzo Bianconi Date: Thu, 12 Dec 2013 17:10:16 +0000 (+0100) Subject: ath9k: fix 5/10MHz channel width initialization on ar9003 X-Git-Tag: accepted/tizen/common/20141203.182822~719^2~3^2^2~163 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=935d00ccf7321d704a1bf8e982dd6934165c1327;p=platform%2Fkernel%2Flinux-arm64.git ath9k: fix 5/10MHz channel width initialization on ar9003 Move ath9k_hw_set_rfmode() after ath9k_hw_process_ini() in order to avoid AR_PHY_MODE register is overwritten with default values by ar9003_hw_process_ini() Signed-off-by: Lorenzo Bianconi Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 4ee24b1..1de98b8 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1485,7 +1485,6 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah, if (AR_SREV_9330(ah)) ar9003_hw_internal_regulator_apply(ah); ath9k_hw_init_pll(ah, chan); - ath9k_hw_set_rfmode(ah, chan); return true; } @@ -1954,6 +1953,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, if (r) return r; + ath9k_hw_set_rfmode(ah, chan); + if (ath9k_hw_mci_is_enabled(ah)) ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep);