From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/17] ARM: OMAP2+: Switch to sched_clock_register()
Date: Fri, 15 Nov 2013 15:26:18 -0800 [thread overview]
Message-ID: <1384557985-9414-11-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1384557985-9414-1-git-send-email-sboyd@codeaurora.org>
The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Santosh Shilimkar<santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 3ca81e0..ec084d1 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -379,7 +379,7 @@ static struct clocksource clocksource_gpt = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
-static u32 notrace dmtimer_read_sched_clock(void)
+static u64 notrace dmtimer_read_sched_clock(void)
{
if (clksrc.reserved)
return __omap_dm_timer_read_counter(&clksrc,
@@ -471,7 +471,7 @@ static void __init omap2_gptimer_clocksource_init(int gptimer_id,
__omap_dm_timer_load_start(&clksrc,
OMAP_TIMER_CTRL_ST | OMAP_TIMER_CTRL_AR, 0,
OMAP_TIMER_NONPOSTED);
- setup_sched_clock(dmtimer_read_sched_clock, 32, clksrc.rate);
+ sched_clock_register(dmtimer_read_sched_clock, 32, clksrc.rate);
if (clocksource_register_hz(&clocksource_gpt, clksrc.rate))
pr_err("Could not register clocksource %s\n",
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-11-15 23:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-15 23:26 [PATCH 00/17] Convert ARM sched_clock users to sched_clock_register() Stephen Boyd
2013-11-15 23:26 ` [PATCH 01/17] ARM: timer-sp: Switch " Stephen Boyd
2013-11-15 23:26 ` [PATCH 02/17] ARM: clps711x: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 03/17] ARM: davinci: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 04/17] ARM: imx: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 05/17] ARM: integrator: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 06/17] ARM: IXP4xx: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 07/17] ARM: mmp: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 08/17] ARM: msm: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 09/17] ARM: OMAP1: " Stephen Boyd
2013-11-15 23:26 ` Stephen Boyd [this message]
2013-11-15 23:26 ` [PATCH 11/17] ARM: pxa: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 12/17] ARM: sa1100: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 13/17] ARM: u300: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 14/17] ARM: iop: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 15/17] ARM: OMAP: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 16/17] ARM: orion: " Stephen Boyd
2013-11-15 23:26 ` [PATCH 17/17] ARM: versatile: " Stephen Boyd
2013-11-21 23:10 ` [PATCH 00/17] Convert ARM sched_clock users " Kevin Hilman
2013-11-21 23:21 ` Stephen Boyd
2013-11-21 23:53 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384557985-9414-11-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).