aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-09-11 08:27:25 -0400
committerJason Cooper <jason@lakedaemon.net>2012-09-21 14:04:39 -0400
commite96a0309f8545d539c1bf4acd5b58727a8f39818 (patch)
tree275af35c4378ce5b4fd0ed724319f027b13989b5 /arch/arm/mach-dove
parent5a2f55019391218d8c08c6f9d32591d91200de77 (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-dove')
-rw-r--r--arch/arm/mach-dove/common.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index ba55f631cccc..cb655998466d 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -185,7 +185,7 @@ void __init dove_i2c_init(void)
185 ****************************************************************************/ 185 ****************************************************************************/
186void __init dove_init_early(void) 186void __init dove_init_early(void)
187{ 187{
188 orion_time_set_base((unsigned long) TIMER_VIRT_BASE); 188 orion_time_set_base(TIMER_VIRT_BASE);
189} 189}
190 190
191static int get_tclk(void) 191static int get_tclk(void)
@@ -196,8 +196,7 @@ static int get_tclk(void)
196 196
197static void __init dove_timer_init(void) 197static void __init dove_timer_init(void)
198{ 198{
199 orion_time_init((unsigned long) BRIDGE_VIRT_BASE, 199 orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
200 BRIDGE_INT_TIMER1_CLR,
201 IRQ_DOVE_BRIDGE, get_tclk()); 200 IRQ_DOVE_BRIDGE, get_tclk());
202} 201}
203 202