mirror of https://github.com/hak5/openwrt.git
61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
|
From 2b4dfbbae2e9e78e09e9e6a82e2d744f54049202 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
Date: Fri, 2 Jan 2009 16:15:39 +0100
|
||
|
|
Subject: [RFC 10/12] 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.
|
||
|
|
|
||
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/ath9k/hw.c | 14 +++++++-------
|
||
|
|
1 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/ath9k/hw.c
|
||
|
|
+++ b/drivers/net/wireless/ath9k/hw.c
|
||
|
|
@@ -1026,7 +1026,7 @@ static void ath9k_hw_init_pll(struct ath
|
||
|
|
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);
|
||
|
|
|
||
|
|
@@ -1566,11 +1566,11 @@ static bool ath9k_hw_set_reset(struct at
|
||
|
|
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);
|
||
|
|
|
||
|
|
- REG_WRITE(ah, (u16) (AR_RTC_RC), 0);
|
||
|
|
- if (!ath9k_hw_wait(ah, (u16) (AR_RTC_RC), AR_RTC_RC_M, 0)) {
|
||
|
|
+ REG_WRITE(ah, (AR_RTC_RC), 0);
|
||
|
|
+ if (!ath9k_hw_wait(ah, (AR_RTC_RC), AR_RTC_RC_M, 0)) {
|
||
|
|
DPRINTF(ah->ah_sc, ATH_DBG_RESET,
|
||
|
|
"RTC stuck in MAC reset\n");
|
||
|
|
return false;
|
||
|
|
@@ -1592,8 +1592,8 @@ static bool ath9k_hw_set_reset_power_on(
|
||
|
|
REG_WRITE(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN |
|
||
|
|
AR_RTC_FORCE_WAKE_ON_INT);
|
||
|
|
|
||
|
|
- REG_WRITE(ah, (u16) (AR_RTC_RESET), 0);
|
||
|
|
- REG_WRITE(ah, (u16) (AR_RTC_RESET), 1);
|
||
|
|
+ REG_WRITE(ah, (AR_RTC_RESET), 0);
|
||
|
|
+ REG_WRITE(ah, (AR_RTC_RESET), 1);
|
||
|
|
|
||
|
|
if (!ath9k_hw_wait(ah,
|
||
|
|
AR_RTC_STATUS,
|
||
|
|
@@ -2662,7 +2662,7 @@ static void ath9k_set_power_sleep(struct
|
||
|
|
if (!AR_SREV_9100(ah))
|
||
|
|
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);
|
||
|
|
}
|
||
|
|
}
|