Merge branch 'misc' into devel

[linux-2.6-block.git] / arch / arm / mach-versatile / core.c

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 8c1ca1d63538f9b0dbfda7152972bb41b05014a0..13a83e45a33b03b79aa138af7b3b7ffa3d6a4786 100644 (file)
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -48,7 +48,9 @@
 #include <asm/mach/map.h>
 #include <mach/hardware.h>
 #include <mach/platform.h>
-#include <plat/timer-sp.h>
+#include <asm/hardware/timer-sp.h>
+
+#include <plat/sched_clock.h>
 
 #include "core.h"
 
@@ -884,6 +886,12 @@ void __init versatile_init(void)
 #endif
 }
 
+/*
+ * The sched_clock counter
+ */
+#define REFCOUNTER             (__io_address(VERSATILE_SYS_BASE) + \
+                                VERSATILE_SYS_24MHz_OFFSET)
+
 /*
  * Where is the timer (VA)?
  */
@@ -899,6 +907,8 @@ static void __init versatile_timer_init(void)
 {
        u32 val;
 
+       versatile_sched_clock_init(REFCOUNTER, 24000000);
+
        /* 
         * set clock frequency: 
         *      VERSATILE_REFCLK is 32KHz