From 59b25d2c25a30d7fb2f32ee314debf428c45c7ab Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 31 Jan 2012 23:38:23 +0100
Subject: [PATCH] --- yaml --- r: 297581 b: refs/heads/master c:
 a9d6d15131b0519363b0c94734ee80955c411093 h: refs/heads/master i:   297579:
 bc811c99324bc5ede2661464b25253c0007fd7bb v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-integrator/Kconfig         | 1 +
 trunk/arch/arm/mach-integrator/integrator_ap.c | 7 +++++++
 trunk/arch/arm/plat-versatile/Kconfig          | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 14781e1fef3e..5142d1d101ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9d4861fc32b995b1616775614459b8f266c803c
+refs/heads/master: a9d6d15131b0519363b0c94734ee80955c411093
diff --git a/trunk/arch/arm/mach-integrator/Kconfig b/trunk/arch/arm/mach-integrator/Kconfig
index 350e26636a06..5a6148ab6dac 100644
--- a/trunk/arch/arm/mach-integrator/Kconfig
+++ b/trunk/arch/arm/mach-integrator/Kconfig
@@ -5,6 +5,7 @@ menu "Integrator Options"
 config ARCH_INTEGRATOR_AP
 	bool "Support Integrator/AP and Integrator/PP2 platforms"
 	select CLKSRC_MMIO
+	select HAVE_SCHED_CLOCK
 	select MIGHT_HAVE_PCI
 	select SERIAL_AMBA_PL010
 	select SERIAL_AMBA_PL010_CONSOLE
diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c
index 21a1d6cbef40..4dde28b9dc07 100644
--- a/trunk/arch/arm/mach-integrator/integrator_ap.c
+++ b/trunk/arch/arm/mach-integrator/integrator_ap.c
@@ -42,6 +42,7 @@
 #include <asm/setup.h>
 #include <asm/param.h>		/* HZ */
 #include <asm/mach-types.h>
+#include <asm/sched_clock.h>
 
 #include <mach/lm.h>
 
@@ -325,6 +326,11 @@ static void __init ap_init(void)
 
 static unsigned long timer_reload;
 
+static u32 notrace integrator_read_sched_clock(void)
+{
+	return -readl((void __iomem *) TIMER2_VA_BASE + TIMER_VALUE);
+}
+
 static void integrator_clocksource_init(unsigned long inrate)
 {
 	void __iomem *base = (void __iomem *)TIMER2_VA_BASE;
@@ -341,6 +347,7 @@ static void integrator_clocksource_init(unsigned long inrate)
 
 	clocksource_mmio_init(base + TIMER_VALUE, "timer2",
 			rate, 200, 16, clocksource_mmio_readl_down);
+	setup_sched_clock(integrator_read_sched_clock, 16, rate);
 }
 
 static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE;
diff --git a/trunk/arch/arm/plat-versatile/Kconfig b/trunk/arch/arm/plat-versatile/Kconfig
index 52353beb369d..aa63f38f2848 100644
--- a/trunk/arch/arm/plat-versatile/Kconfig
+++ b/trunk/arch/arm/plat-versatile/Kconfig
@@ -11,7 +11,7 @@ config PLAT_VERSATILE_LEDS
 	depends on ARCH_REALVIEW || ARCH_VERSATILE
 
 config PLAT_VERSATILE_SCHED_CLOCK
-	def_bool y if !ARCH_INTEGRATOR_AP
+	def_bool y
 	select HAVE_SCHED_CLOCK
 
 endif