aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/board-mop500.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-02-28 23:03:31 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-19 14:29:44 -0400
commitcc2c13342508d52cf08ea81f639b5de69607fd5d (patch)
tree9dc95cddf0db231f714b583d41872f5682c7fa10 /arch/arm/mach-ux500/board-mop500.c
parent3e3c62ca5395df48319b808379bc9fd487ff3c29 (diff)
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>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 803aec1d6728..c2b4a35cf01b 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -17,11 +17,9 @@
17#include <linux/amba/pl022.h> 17#include <linux/amba/pl022.h>
18#include <linux/spi/spi.h> 18#include <linux/spi/spi.h>
19 19
20#include <asm/localtimer.h>
21#include <asm/mach-types.h> 20#include <asm/mach-types.h>
22#include <asm/mach/arch.h> 21#include <asm/mach/arch.h>
23 22
24#include <plat/mtu.h>
25#include <plat/i2c.h> 23#include <plat/i2c.h>
26 24
27#include <mach/hardware.h> 25#include <mach/hardware.h>
@@ -201,22 +199,6 @@ static struct platform_device *platform_devs[] __initdata = {
201 &i2c_controller3, 199 &i2c_controller3,
202}; 200};
203 201
204static void __init u8500_timer_init(void)
205{
206#ifdef CONFIG_LOCAL_TIMERS
207 /* Setup the local timer base */
208 twd_base = __io_address(U8500_TWD_BASE);
209#endif
210 /* Setup the MTU base */
211 mtu_base = __io_address(U8500_MTU0_BASE);
212
213 nmdk_timer_init();
214}
215
216static struct sys_timer u8500_timer = {
217 .init = u8500_timer_init,
218};
219
220static void __init u8500_init_machine(void) 202static void __init u8500_init_machine(void)
221{ 203{
222 int i; 204 int i;