aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/hw.c
diff options
context:
space:
mode:
authorSenthil Balasubramanian <senthilkumar@atheros.com>2010-04-15 17:38:30 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-16 15:43:23 -0400
commit84e2169b0fead5d87de0a29f17a06fba904bc46b (patch)
tree3944401030192a6dad6ae9e4bc07c5da6b10a8f2 /drivers/net/wireless/ath/ath9k/hw.c
parent1f3f06184006dff1ec439c56dcee9a99ed93e985 (diff)
ath9k_hw: prevent reset control register zeroing on AR9003 reset
Also, no need for the udelay(2) on AR9003 hardware. Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> 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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 034b6fdf01f3..601dbf79cc0d 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1385,9 +1385,11 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah)
1385 REG_WRITE(ah, AR_RC, AR_RC_AHB); 1385 REG_WRITE(ah, AR_RC, AR_RC_AHB);
1386 1386
1387 REG_WRITE(ah, AR_RTC_RESET, 0); 1387 REG_WRITE(ah, AR_RTC_RESET, 0);
1388 udelay(2);
1389 1388
1390 if (!AR_SREV_9100(ah)) 1389 if (!AR_SREV_9300_20_OR_LATER(ah))
1390 udelay(2);
1391
1392 if (!AR_SREV_9100(ah) && !AR_SREV_9300_20_OR_LATER(ah))
1391 REG_WRITE(ah, AR_RC, 0); 1393 REG_WRITE(ah, AR_RC, 0);
1392 1394
1393 REG_WRITE(ah, AR_RTC_RESET, 1); 1395 REG_WRITE(ah, AR_RTC_RESET, 1);