diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2010-03-01 05:03:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-19 18:29:44 +0000 |
| commit | cc2c13342508d52cf08ea81f639b5de69607fd5d (patch) | |
| tree | 9dc95cddf0db231f714b583d41872f5682c7fa10 /arch/arm/mach-ux500/cpu-u8500.c | |
| parent | 3e3c62ca5395df48319b808379bc9fd487ff3c29 (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/cpu-u8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-u8500.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu-u8500.c b/arch/arm/mach-ux500/cpu-u8500.c index 397bc1f9ed9..588b0596a63 100644 --- 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, +}; |