aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/v2m.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-15 16:58:50 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 06:16:00 -0500
commit0af85dda39d9b673aca8c0ebae004ea70f3efc93 (patch)
treea3fad536f3c5cb4e91291efeb26eca93c2f37fd2 /arch/arm/mach-vexpress/v2m.c
parent1da0c89c66753860ccfe81eb327c25db46c2a24a (diff)
ARM: vexpress: add sched_clock() for Versatile Express
Add a sched_clock() implementation to Versatile Express using the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r--arch/arm/mach-vexpress/v2m.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 7eaa232180a5..8c283100a9a0 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -22,6 +22,8 @@
22#include <mach/clkdev.h> 22#include <mach/clkdev.h>
23#include <mach/motherboard.h> 23#include <mach/motherboard.h>
24 24
25#include <plat/sched_clock.h>
26
25#include <plat/timer-sp.h> 27#include <plat/timer-sp.h>
26 28
27#include "core.h" 29#include "core.h"
@@ -50,6 +52,8 @@ void __init v2m_map_io(struct map_desc *tile, size_t num)
50 52
51static void __init v2m_timer_init(void) 53static void __init v2m_timer_init(void)
52{ 54{
55 versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
56
53 writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL); 57 writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL);
54 writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); 58 writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);
55 59