From f4c976837516468150d491c87a012bd75ecc7a79 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 15 Dec 2010 21:58:50 +0000
Subject: [PATCH] --- yaml --- r: 225846 b: refs/heads/master c:
 0af85dda39d9b673aca8c0ebae004ea70f3efc93 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/Kconfig                 | 1 +
 trunk/arch/arm/mach-vexpress/v2m.c     | 4 ++++
 trunk/arch/arm/plat-versatile/Makefile | 5 +++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 335a862d3d4b..f34d25968d88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1da0c89c66753860ccfe81eb327c25db46c2a24a
+refs/heads/master: 0af85dda39d9b673aca8c0ebae004ea70f3efc93
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 34311f40d713..17b5ff0db1dc 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -268,6 +268,7 @@ config ARCH_VEXPRESS
 	select COMMON_CLKDEV
 	select GENERIC_CLOCKEVENTS
 	select HAVE_CLK
+	select HAVE_SCHED_CLOCK
 	select ICST
 	select PLAT_VERSATILE
 	help
diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c
index 7eaa232180a5..8c283100a9a0 100644
--- a/trunk/arch/arm/mach-vexpress/v2m.c
+++ b/trunk/arch/arm/mach-vexpress/v2m.c
@@ -22,6 +22,8 @@
 #include <mach/clkdev.h>
 #include <mach/motherboard.h>
 
+#include <plat/sched_clock.h>
+
 #include <plat/timer-sp.h>
 
 #include "core.h"
@@ -50,6 +52,8 @@ void __init v2m_map_io(struct map_desc *tile, size_t num)
 
 static void __init v2m_timer_init(void)
 {
+	versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
+
 	writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL);
 	writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);
 
diff --git a/trunk/arch/arm/plat-versatile/Makefile b/trunk/arch/arm/plat-versatile/Makefile
index 5cf88e8427b1..8bb6ba6d3572 100644
--- a/trunk/arch/arm/plat-versatile/Makefile
+++ b/trunk/arch/arm/plat-versatile/Makefile
@@ -1,7 +1,8 @@
 obj-y	:= clock.o
 obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
-obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o
-obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o
+ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
+obj-y	+= sched-clock.o
+endif
 ifeq ($(CONFIG_LEDS_CLASS),y)
 obj-$(CONFIG_ARCH_REALVIEW) += leds.o
 obj-$(CONFIG_ARCH_VERSATILE) += leds.o