ARM: 5962/1: ux500: move system timer to cpu file

There is nothing board-specific about the system timer, so move it to
the CPU file.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 803aec1d672823e44854be50a29a931e1914e409..c2b4a35cf01bfe832ac53479b7e063ef39529745 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -17,11 +17,9 @@
 #include <linux/amba/pl022.h>
 #include <linux/spi/spi.h>
 
-#include <asm/localtimer.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <plat/mtu.h>
 #include <plat/i2c.h>
 
 #include <mach/hardware.h>
@@ -201,22 +199,6 @@ static struct platform_device *platform_devs[] __initdata = {
        &i2c_controller3,
 };
 
-static void __init u8500_timer_init(void)
-{
-#ifdef CONFIG_LOCAL_TIMERS
-       /* Setup the local timer base */
-       twd_base = __io_address(U8500_TWD_BASE);
-#endif
-       /* Setup the MTU base */
-       mtu_base = __io_address(U8500_MTU0_BASE);
-
-       nmdk_timer_init();
-}
-
-static struct sys_timer u8500_timer = {
-       .init   = u8500_timer_init,
-};
-
 static void __init u8500_init_machine(void)
 {
        int i;

diff --git a/arch/arm/mach-ux500/cpu-u8500.c b/arch/arm/mach-ux500/cpu-u8500.c
index 397bc1f9ed94aed1b56abfd669b55b0fa5976ae8..588b0596a635936fcc9d072c256cd15a45a2ccf5 100644 (file)
--- a/arch/arm/mach-ux500/cpu-u8500.c
+++ b/arch/arm/mach-ux500/cpu-u8500.c
@@ -14,10 +14,14 @@
 #include <linux/amba/bus.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
+#include <asm/localtimer.h>
 #include <asm/hardware/gic.h>
 #include <asm/mach/map.h>
+#include <plat/mtu.h>
 #include <mach/hardware.h>
+#include <mach/setup.h>
 
 /* add any platform devices here - TODO */
 static struct platform_device *platform_devs[] __initdata = {
@@ -63,3 +67,19 @@ void __init u8500_init_devices(void)
 
        return ;
 }
+
+static void __init u8500_timer_init(void)
+{
+#ifdef CONFIG_LOCAL_TIMERS
+       /* Setup the local timer base */
+       twd_base = __io_address(U8500_TWD_BASE);
+#endif
+       /* Setup the MTU base */
+       mtu_base = __io_address(U8500_MTU0_BASE);
+
+       nmdk_timer_init();
+}
+
+struct sys_timer u8500_timer = {
+       .init   = u8500_timer_init,
+};

diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h
index cf0ce1687f248d1f0308658a10ce5649dc2e8b10..65112bfd7a0cc846a45a930783d686e5294dd8cd 100644 (file)
--- a/arch/arm/mach-ux500/include/mach/setup.h
+++ b/arch/arm/mach-ux500/include/mach/setup.h
@@ -20,4 +20,7 @@ extern void u8500_init_irq(void);
 /* We re-use nomadik_timer for this platform */
 extern void nmdk_timer_init(void);
 
+struct sys_timer;
+extern struct sys_timer u8500_timer;
+
 #endif /*  __ASM_ARCH_SETUP_H */