diff options
| author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2010-12-06 04:27:44 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 16:34:54 -0500 |
| commit | d09b17f73fd8f475f33d0b8311d7b5a0bed67c67 (patch) | |
| tree | 8ab7eb6202be4f1dd176abce164e40e6ea1cd559 /drivers/net/wireless | |
| parent | 47c80de62e9d6d262a829502d689a8b56add8d3d (diff) | |
| download | linux-stable-d09b17f73fd8f475f33d0b8311d7b5a0bed67c67.tar.gz linux-stable-d09b17f73fd8f475f33d0b8311d7b5a0bed67c67.tar.bz2 linux-stable-d09b17f73fd8f475f33d0b8311d7b5a0bed67c67.zip | |
ath9k: Configure pll control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/reg.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index a2f85b75b7f8..9f4398c88c85 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -667,7 +667,12 @@ static void ath9k_hw_init_qos(struct ath_hw *ah) static void ath9k_hw_init_pll(struct ath_hw *ah, struct ath9k_channel *chan) { - u32 pll = ath9k_hw_compute_pll_control(ah, chan); + u32 pll; + + if (AR_SREV_9485(ah)) + REG_WRITE(ah, AR_RTC_PLL_CONTROL2, 0x886666); + + pll = ath9k_hw_compute_pll_control(ah, chan); REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll); diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index 0153ba14a2f8..d3257f783a64 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h @@ -1114,6 +1114,8 @@ enum { #define AR_RTC_PLL_CONTROL \ ((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0014) : 0x7014) +#define AR_RTC_PLL_CONTROL2 0x703c + #define AR_RTC_PLL_DIV 0x0000001f #define AR_RTC_PLL_DIV_S 0 #define AR_RTC_PLL_DIV2 0x00000020 |