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>

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index ba55f631cccc91bf0098f30492f82465fdf15db3..cb655998466d9f89056a036fd4375aeeb6684a9f 100644 (file)
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -185,7 +185,7 @@ void __init dove_i2c_init(void)
  ****************************************************************************/
 void __init dove_init_early(void)
 {
-       orion_time_set_base((unsigned long) TIMER_VIRT_BASE);
+       orion_time_set_base(TIMER_VIRT_BASE);
 }
 
 static int get_tclk(void)
@@ -196,8 +196,7 @@ static int get_tclk(void)
 
 static void __init dove_timer_init(void)
 {
-       orion_time_init((unsigned long) BRIDGE_VIRT_BASE,
-                       BRIDGE_INT_TIMER1_CLR,
+       orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
                        IRQ_DOVE_BRIDGE, get_tclk());
 }
 

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index defceca518417057dedd02e470577c7a91dd7232..55bf9198caeba62de2964b23edd219a44c181fd0 100644 (file)
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -514,7 +514,7 @@ void __init kirkwood_wdt_init(void)
  ****************************************************************************/
 void __init kirkwood_init_early(void)
 {
-       orion_time_set_base((unsigned long) TIMER_VIRT_BASE);
+       orion_time_set_base(TIMER_VIRT_BASE);
 
        /*
         * Some Kirkwood devices allocate their coherent buffers from atomic
@@ -543,8 +543,7 @@ static void __init kirkwood_timer_init(void)
 {
        kirkwood_tclk = kirkwood_find_tclk();
 
-       orion_time_init((unsigned long) BRIDGE_VIRT_BASE,
-                       BRIDGE_INT_TIMER1_CLR,
+       orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
                        IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
 }
 

diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index fcda4a4f830d3d4b34ad6305823336c95dcbabea..f123517a4bb8bb3176f215eabd8cd480b026bb38 100644 (file)
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -338,13 +338,12 @@ void __init mv78xx0_uart3_init(void)
  ****************************************************************************/
 void __init mv78xx0_init_early(void)
 {
-       orion_time_set_base((unsigned long) TIMER_VIRT_BASE);
+       orion_time_set_base(TIMER_VIRT_BASE);
 }
 
 static void mv78xx0_timer_init(void)
 {
-       orion_time_init((unsigned long) BRIDGE_VIRT_BASE,
-                       BRIDGE_INT_TIMER1_CLR,
+       orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
                        IRQ_MV78XX0_TIMER_1, get_tclk());
 }
 

diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 79f9ffb9a1425e87e00ec7d9e4e2f540d7f9be0b..58b754ff701c2e5c96c6632becfef26e3b7ab607 100644 (file)
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -203,7 +203,7 @@ void __init orion5x_wdt_init(void)
  ****************************************************************************/
 void __init orion5x_init_early(void)
 {
-       orion_time_set_base((unsigned long) TIMER_VIRT_BASE);
+       orion_time_set_base(TIMER_VIRT_BASE);
 }
 
 int orion5x_tclk;
@@ -224,8 +224,7 @@ static void __init orion5x_timer_init(void)
 {
        orion5x_tclk = orion5x_find_tclk();
 
-       orion_time_init((unsigned long) ORION5X_BRIDGE_VIRT_BASE,
-                       BRIDGE_INT_TIMER1_CLR,
+       orion_time_init(ORION5X_BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
                        IRQ_ORION5X_BRIDGE, orion5x_tclk);
 }
 

diff --git a/arch/arm/plat-orion/include/plat/time.h b/arch/arm/plat-orion/include/plat/time.h
index 4d5f1f6e18dfb3b1c8b564b3a45cc083a26fc477..07527e417c62e1b1bddb16a7d9e4aa5bed93a6fb 100644 (file)
--- a/arch/arm/plat-orion/include/plat/time.h
+++ b/arch/arm/plat-orion/include/plat/time.h
@@ -11,9 +11,9 @@
 #ifndef __PLAT_TIME_H
 #define __PLAT_TIME_H
 
-void orion_time_set_base(u32 timer_base);
+void orion_time_set_base(void __iomem *timer_base);
 
-void orion_time_init(u32 bridge_base, u32 bridge_timer1_clr_mask,
+void orion_time_init(void __iomem *bridge_base, u32 bridge_timer1_clr_mask,
                     unsigned int irq, unsigned int tclk);
 
 

diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 1ed8d1397fcf76bc60c86e5cb89f79cd5b900e9b..0f4fa863dd552403fa8107efe5df56def7108a26 100644 (file)
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -180,13 +180,13 @@ static struct irqaction orion_timer_irq = {
 };
 
 void __init
-orion_time_set_base(u32 _timer_base)
+orion_time_set_base(void __iomem *_timer_base)
 {
-       timer_base = (void __iomem *)_timer_base;
+       timer_base = _timer_base;
 }
 
 void __init
-orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask,
+orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask,
                unsigned int irq, unsigned int tclk)
 {
        u32 u;
@@ -194,7 +194,7 @@ orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask,
        /*
         * Set SoC-specific data.
         */
-       bridge_base = (void __iomem *)_bridge_base;
+       bridge_base = _bridge_base;
        bridge_timer1_clr_mask = _bridge_timer1_clr_mask;
 
        ticks_per_jiffy = (tclk + HZ/2) / HZ;