From patchwork Tue Jan 18 22:26:13 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tony Lindgren <tony@atomide.com>
X-Patchwork-Id: 487681
X-Patchwork-Delegate: tony@atomide.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0IMQV9c030810
	for <patchwork-omap@patchwork.kernel.org>;
	Tue, 18 Jan 2011 22:26:31 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751992Ab1ARW0a (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Tue, 18 Jan 2011 17:26:30 -0500
Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:17337 "EHLO
	mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751440Ab1ARW03 (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Tue, 18 Jan 2011 17:26:29 -0500
Received: from c-24-130-172-179.hsd1.ca.comcast.net ([24.130.172.179]
	helo=localhost.localdomain)
	by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72)
	(envelope-from <tony@atomide.com>)
	id 1PfK0T-000Bhh-2l; Tue, 18 Jan 2011 22:26:29 +0000
Received: from Mutt by mutt-smtp-wrapper.pl 1.2
	(www.zdo.com/articles/mutt-smtp-wrapper.shtml)
X-Mail-Handler: MailHop Outbound by DynDNS
X-Originating-IP: 24.130.172.179
X-Report-Abuse-To: abuse@dyndns.com (see
	http://www.dyndns.com/services/mailhop/outbound_abuse.html
	for abuse reporting information)
X-MHO-User: U2FsdGVkX1+GIJjSoVkHEnpMQrQMXueI
Date: Tue, 18 Jan 2011 14:26:13 -0800
From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Thomas Weber <thomas.weber.linux@googlemail.com>,
	Russell King - ARM Linux <linux@arm.linux.org.uk>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Richard Woodruff <r-woodruff2@ti.com>
Subject: [PATCH] omap1: Fix sched_clock for the MPU timer (Re: State of
	LDP3430 platform)
Message-ID: <20110118222613.GS4957@atomide.com>
References: <alpine.DEB.2.00.1012061125400.13430@utopia.booyaka.com>
	<20101207083720.GB18336@n2100.arm.linux.org.uk>
	<alpine.DEB.2.00.1012071745120.13430@utopia.booyaka.com>
	<alpine.DEB.2.00.1012072012000.13430@utopia.booyaka.com>
	<20110115000301.GT4957@atomide.com>
	<alpine.DEB.2.00.1101151237240.32245@utopia.booyaka.com>
	<20110115233744.GA18159@n2100.arm.linux.org.uk>
	<alpine.DEB.2.00.1101152028580.13225@utopia.booyaka.com>
	<4D3309F9.8090900@gmail.com>
	<alpine.DEB.2.00.1101181234130.13225@utopia.booyaka.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.00.1101181234130.13225@utopia.booyaka.com>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 18 Jan 2011 22:26:31 +0000 (UTC)


--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -44,11 +44,14 @@
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/io.h>
+#include <linux/sched.h>
 
 #include <asm/system.h>
 #include <mach/hardware.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
+#include <asm/sched_clock.h>
+
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
@@ -67,7 +70,7 @@ typedef struct {
 ((volatile omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE +	\
 				 (n)*OMAP_MPU_TIMER_OFFSET))
 
-static inline unsigned long omap_mpu_timer_read(int nr)
+static inline unsigned long notrace omap_mpu_timer_read(int nr)
 {
 	volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
 	return timer->read_tim;
@@ -212,11 +215,21 @@ static struct clocksource clocksource_mpu = {
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static DEFINE_CLOCK_DATA(cd);
+
+static void notrace mpu_update_sched_clock(void)
+{
+	u32 cyc = mpu_read(&clocksource_mpu);
+	update_sched_clock(&cd, cyc, (u32)~0);
+}
+
 static void __init omap_init_clocksource(unsigned long rate)
 {
 	static char err[] __initdata = KERN_ERR
 			"%s: can't register clocksource!\n";
 
+	init_sched_clock(&cd, mpu_update_sched_clock, 32, rate);
+
 	setup_irq(INT_TIMER2, &omap_mpu_timer2_irq);
 	omap_mpu_timer_start(1, ~0, 1);