From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 17/18] ARM: SAMSUNG: Switch to sched_clock_register()
Date: Wed, 31 Jul 2013 15:31:16 -0700 [thread overview]
Message-ID: <1375309877-16617-18-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1375309877-16617-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: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/plat-samsung/samsung-time.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-samsung/samsung-time.c b/arch/arm/plat-samsung/samsung-time.c
index 2957075..1e2119b 100644
--- a/arch/arm/plat-samsung/samsung-time.c
+++ b/arch/arm/plat-samsung/samsung-time.c
@@ -312,7 +312,7 @@ static void __iomem *samsung_timer_reg(void)
* this wraps around for now, since it is just a relative time
* stamp. (Inspired by U300 implementation.)
*/
-static u32 notrace samsung_read_sched_clock(void)
+static u64 notrace samsung_read_sched_clock(void)
{
void __iomem *reg = samsung_timer_reg();
@@ -337,7 +337,7 @@ static void __init samsung_clocksource_init(void)
samsung_time_setup(timer_source.source_id, TCNT_MAX);
samsung_time_start(timer_source.source_id, PERIODIC);
- setup_sched_clock(samsung_read_sched_clock, TSIZE, clock_rate);
+ sched_clock_register(samsung_read_sched_clock, TSIZE, clock_rate);
if (clocksource_mmio_init(samsung_timer_reg(), "samsung_clocksource_timer",
clock_rate, 250, TSIZE, clocksource_mmio_readl_down))
--
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-07-31 22:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-30 18:50 [GIT PULL] 64bit friendly generic sched_clock() base for 3.12 John Stultz
2013-07-31 22:30 ` [PATCH 00/18] Convert arm sched_clock users to sched_clock_register() Stephen Boyd
2013-07-31 22:31 ` [PATCH 01/18] ARM: timer-sp: Switch " Stephen Boyd
2013-07-31 22:31 ` [PATCH 02/18] ARM: clps711x: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 03/18] ARM: davinci: " Stephen Boyd
2013-08-01 5:46 ` Sekhar Nori
2013-07-31 22:31 ` [PATCH 04/18] ARM: imx: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 05/18] ARM: integrator: " Stephen Boyd
2013-08-07 13:52 ` Linus Walleij
2013-07-31 22:31 ` [PATCH 06/18] ARM: IXP4xx: " Stephen Boyd
2013-08-09 7:49 ` Krzysztof Halasa
2013-07-31 22:31 ` [PATCH 07/18] ARM: mmp: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 08/18] ARM: msm: " Stephen Boyd
2013-08-01 16:12 ` David Brown
2013-07-31 22:31 ` [PATCH 09/18] ARM: OMAP1: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 10/18] ARM: OMAP2+: " Stephen Boyd
2013-08-01 0:43 ` Santosh Shilimkar
2013-07-31 22:31 ` [PATCH 11/18] ARM: pxa: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 12/18] ARM: sa1100: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 13/18] ARM: u300: " Stephen Boyd
2013-08-07 18:55 ` Linus Walleij
2013-07-31 22:31 ` [PATCH 14/18] ARM: iop: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 15/18] ARM: OMAP: " Stephen Boyd
2013-07-31 22:31 ` [PATCH 16/18] ARM: orion: " Stephen Boyd
2013-08-01 0:31 ` Jason Cooper
2013-07-31 22:31 ` Stephen Boyd [this message]
2013-08-05 17:22 ` [PATCH 17/18] ARM: SAMSUNG: " Kukjin Kim
2013-07-31 22:31 ` [PATCH 18/18] ARM: versatile: " Stephen Boyd
2013-08-29 21:56 ` [GIT PULL] 64bit friendly generic sched_clock() base for 3.12 John Stultz
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=1375309877-16617-18-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).