lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
This is specific to the AR9002 family only.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez
2010-04-15 17:39:04 -04:00
committed by John W. Linville
parent b3950e6a52
commit d8f492b7d9
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wireless/ath/ath9k/ar9002_hw.c
View File

@@ -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. * Helper for ASPM support.
* *

11
drivers/net/wireless/ath/ath9k/hw.c
View File

@@ -712,15 +712,8 @@ static int __ath9k_hw_init(struct ath_hw *ah)
else else
ath9k_hw_disablepcie(ah); ath9k_hw_disablepcie(ah);
/* Support for Japan ch.14 (2484) spread */ if (!AR_SREV_9300_20_OR_LATER(ah))
if (AR_SREV_9287_11_OR_LATER(ah)) { ar9002_hw_cck_chan14_spread(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);
}
r = ath9k_hw_post_init(ah); r = ath9k_hw_post_init(ah);
if (r) if (r)

2
drivers/net/wireless/ath/ath9k/hw.h
View File

@@ -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, void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
u32 *coef_mantissa, u32 *coef_exponent); 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 * Code specifric to AR9003, we stuff these here to avoid callbacks
* for older families * for older families