diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-04-19 15:18:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-23 15:35:31 -0400 |
commit | 7c5adc8d83c344dbad251091879baf1244007564 (patch) | |
tree | 05494972ed0de7a8f9e0f634276400b597a126c2 /drivers/net/wireless/ath/ath9k/hw.c | |
parent | 3e61d3f9b2f6381f6f30d3d0ff874251a3491d05 (diff) |
ath9k_hw: fix and clean up PHY activation delay
The delay calculation is the same for all chips, however some parts of the
code missed the extra delay factor for half/quarter.
Clean up the code and move the delay calculation to a common place.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 4dddffd7c403..e576a92f18a3 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -191,6 +191,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout) | |||
191 | } | 191 | } |
192 | EXPORT_SYMBOL(ath9k_hw_wait); | 192 | EXPORT_SYMBOL(ath9k_hw_wait); |
193 | 193 | ||
194 | void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan, | ||
195 | int hw_delay) | ||
196 | { | ||
197 | if (IS_CHAN_B(chan)) | ||
198 | hw_delay = (4 * hw_delay) / 22; | ||
199 | else | ||
200 | hw_delay /= 10; | ||
201 | |||
202 | if (IS_CHAN_HALF_RATE(chan)) | ||
203 | hw_delay *= 2; | ||
204 | else if (IS_CHAN_QUARTER_RATE(chan)) | ||
205 | hw_delay *= 4; | ||
206 | |||
207 | udelay(hw_delay + BASE_ACTIVATE_DELAY); | ||
208 | } | ||
209 | |||
194 | void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array, | 210 | void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array, |
195 | int column, unsigned int *writecnt) | 211 | int column, unsigned int *writecnt) |
196 | { | 212 | { |