openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: remove (u16) casts from rtc register access 

The RTC register offsets don't fit into 'u16' on the AR913x, so we have
to remove the existing casts.

Changes-licensed-under: ISC

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Tested-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gabor Juhos 2009-01-14 20:17:09 +01:00 committed by John W. Linville
parent 9dbeb91a8b
commit d03a66c17a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/ath9k/hw.c
View File

@ -1011,7 +1011,7 @@ static void ath9k_hw_init_pll(struct ath_hal *ah,
pll |= SM(0xb, AR_RTC_PLL_DIV); pll |= SM(0xb, AR_RTC_PLL_DIV);
} }
} }
REG_WRITE(ah, (u16) (AR_RTC_PLL_CONTROL), pll); REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll);
udelay(RTC_PLL_SETTLE_DELAY); udelay(RTC_PLL_SETTLE_DELAY);
@ -1550,11 +1550,11 @@ static bool ath9k_hw_set_reset(struct ath_hal *ah, int type)
rst_flags |= AR_RTC_RC_MAC_COLD; rst_flags |= AR_RTC_RC_MAC_COLD;
} }
REG_WRITE(ah, (u16) (AR_RTC_RC), rst_flags); REG_WRITE(ah, AR_RTC_RC, rst_flags);
udelay(50); udelay(50);
REG_WRITE(ah, (u16) (AR_RTC_RC), 0); REG_WRITE(ah, AR_RTC_RC, 0);
if (!ath9k_hw_wait(ah, (u16) (AR_RTC_RC), AR_RTC_RC_M, 0)) { if (!ath9k_hw_wait(ah, AR_RTC_RC, AR_RTC_RC_M, 0)) {
DPRINTF(ah->ah_sc, ATH_DBG_RESET, DPRINTF(ah->ah_sc, ATH_DBG_RESET,
"RTC stuck in MAC reset\n"); "RTC stuck in MAC reset\n");
return false; return false;
@ -1576,8 +1576,8 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hal *ah)
REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN | REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |
AR_RTC_FORCE_WAKE_ON_INT); AR_RTC_FORCE_WAKE_ON_INT);
REG_WRITE(ah, (u16) (AR_RTC_RESET), 0); REG_WRITE(ah, AR_RTC_RESET, 0);
REG_WRITE(ah, (u16) (AR_RTC_RESET), 1); REG_WRITE(ah, AR_RTC_RESET, 1);
if (!ath9k_hw_wait(ah, if (!ath9k_hw_wait(ah,
AR_RTC_STATUS, AR_RTC_STATUS,
@ -2619,7 +2619,7 @@ static void ath9k_set_power_sleep(struct ath_hal *ah, int setChip)
if (!AR_SREV_9100(ah)) if (!AR_SREV_9100(ah))
REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF); REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);
REG_CLR_BIT(ah, (u16) (AR_RTC_RESET), REG_CLR_BIT(ah, (AR_RTC_RESET),
AR_RTC_RESET_EN); AR_RTC_RESET_EN);
} }
} }

4
drivers/net/wireless/ath9k/reg.h
View File

@ -953,7 +953,7 @@ enum {
#define AR_RTC_BASE 0x00020000 #define AR_RTC_BASE 0x00020000
#define AR_RTC_RC \ #define AR_RTC_RC \
(AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0000) : 0x7000 ((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0000) : 0x7000)
#define AR_RTC_RC_M 0x00000003 #define AR_RTC_RC_M 0x00000003
#define AR_RTC_RC_MAC_WARM 0x00000001 #define AR_RTC_RC_MAC_WARM 0x00000001
#define AR_RTC_RC_MAC_COLD 0x00000002 #define AR_RTC_RC_MAC_COLD 0x00000002
@ -961,7 +961,7 @@ enum {
#define AR_RTC_RC_WARM_RESET 0x00000008 #define AR_RTC_RC_WARM_RESET 0x00000008
#define AR_RTC_PLL_CONTROL \ #define AR_RTC_PLL_CONTROL \
(AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0014) : 0x7014 ((AR_SREV_9100(ah)) ? (AR_RTC_BASE + 0x0014) : 0x7014)
#define AR_RTC_PLL_DIV 0x0000001f #define AR_RTC_PLL_DIV 0x0000001f
#define AR_RTC_PLL_DIV_S 0 #define AR_RTC_PLL_DIV_S 0