diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-11 08:27:25 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-21 14:04:39 -0400 |
commit | e96a0309f8545d539c1bf4acd5b58727a8f39818 (patch) | |
tree | 275af35c4378ce5b4fd0ed724319f027b13989b5 /arch/arm/mach-orion5x | |
parent | 5a2f55019391218d8c08c6f9d32591d91200de77 (diff) |
arm: plat-orion: use void __iomem pointers for time functions
The functions for time management now take void __iomem pointers, so
we remove the temporary "unsigned long" casts from the mach-*/common.c
files.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 79f9ffb9a142..58b754ff701c 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -203,7 +203,7 @@ void __init orion5x_wdt_init(void) | |||
203 | ****************************************************************************/ | 203 | ****************************************************************************/ |
204 | void __init orion5x_init_early(void) | 204 | void __init orion5x_init_early(void) |
205 | { | 205 | { |
206 | orion_time_set_base((unsigned long) TIMER_VIRT_BASE); | 206 | orion_time_set_base(TIMER_VIRT_BASE); |
207 | } | 207 | } |
208 | 208 | ||
209 | int orion5x_tclk; | 209 | int orion5x_tclk; |
@@ -224,8 +224,7 @@ static void __init orion5x_timer_init(void) | |||
224 | { | 224 | { |
225 | orion5x_tclk = orion5x_find_tclk(); | 225 | orion5x_tclk = orion5x_find_tclk(); |
226 | 226 | ||
227 | orion_time_init((unsigned long) ORION5X_BRIDGE_VIRT_BASE, | 227 | orion_time_init(ORION5X_BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR, |
228 | BRIDGE_INT_TIMER1_CLR, | ||
229 | IRQ_ORION5X_BRIDGE, orion5x_tclk); | 228 | IRQ_ORION5X_BRIDGE, orion5x_tclk); |
230 | } | 229 | } |
231 | 230 | ||