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

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

ath9k_hw: move the cck channel 14 INI to the AR9002 hw code 



This is specific to the AR9002 family only.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b3950e6a

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

+15 −0
Original line number Diff line number Diff line
@@ -229,6 +229,21 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah) 
	}

}



/* Support for Japan ch.14 (2484) spread */

void ar9002_hw_cck_chan14_spread(struct ath_hw *ah)

{

	if (AR_SREV_9287_11_OR_LATER(ah)) {

		INIT_INI_ARRAY(&ah->iniCckfirNormal,

		       ar9287Common_normal_cck_fir_coeff_92871_1,

		       ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_92871_1),

		       2);

		INIT_INI_ARRAY(&ah->iniCckfirJapan2484,

		       ar9287Common_japan_2484_cck_fir_coeff_92871_1,

		       ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_92871_1),

		       2);

	}

}



/*

 * Helper for ASPM support.

 *

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

+2 −9
Original line number Diff line number Diff line
@@ -712,15 +712,8 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
	else

		ath9k_hw_disablepcie(ah);



	/* Support for Japan ch.14 (2484) spread */

	if (AR_SREV_9287_11_OR_LATER(ah)) {

		INIT_INI_ARRAY(&ah->iniCckfirNormal,

		       ar9287Common_normal_cck_fir_coeff_92871_1,

		       ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_92871_1), 2);

		INIT_INI_ARRAY(&ah->iniCckfirJapan2484,

		       ar9287Common_japan_2484_cck_fir_coeff_92871_1,

		       ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_92871_1), 2);

	}

	if (!AR_SREV_9300_20_OR_LATER(ah))

		ar9002_hw_cck_chan14_spread(ah);



	r = ath9k_hw_post_init(ah);

	if (r)

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

+2 −0
Original line number Diff line number Diff line
@@ -838,6 +838,8 @@ void ath9k_hw_htc_resetinit(struct ath_hw *ah); 
void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,

				   u32 *coef_mantissa, u32 *coef_exponent);



void ar9002_hw_cck_chan14_spread(struct ath_hw *ah);



/*

 * Code specifric to AR9003, we stuff these here to avoid callbacks

 * for older families