linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/20] clocksource: arm_global_timer: Switch to sched_clock_register()
Date: Mon, 30 Dec 2013 11:19:27 +0100	[thread overview]
Message-ID: <1388398779-11222-8-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1388398779-11222-1-git-send-email-daniel.lezcano@linaro.org>

From: Stephen Boyd <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. While we're here increase the number of bits that
sched_clock can handle to 64 to make full use of the counter.

Cc: Stuart Menefy <stuart.menefy@st.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Acked-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/arm_global_timer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index c639b1a..0fc31d0 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -202,7 +202,7 @@ static struct clocksource gt_clocksource = {
 };
 
 #ifdef CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
-static u32 notrace gt_sched_clock_read(void)
+static u64 notrace gt_sched_clock_read(void)
 {
 	return gt_counter_read();
 }
@@ -217,7 +217,7 @@ static void __init gt_clocksource_init(void)
 	writel(GT_CONTROL_TIMER_ENABLE, gt_base + GT_CONTROL);
 
 #ifdef CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
-	setup_sched_clock(gt_sched_clock_read, 32, gt_clk_rate);
+	sched_clock_register(gt_sched_clock_read, 64, gt_clk_rate);
 #endif
 	clocksource_register_hz(&gt_clocksource, gt_clk_rate);
 }
-- 
1.7.9.5

  parent reply	other threads:[~2013-12-30 10:19 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-30 10:14 [GIT PULL] clockevents/clocksource : new material for 3.14 Daniel Lezcano
2013-12-30 10:19 ` [PATCH 01/20] clockevent: sun4i: Fill the irq field in the clockevent structure Daniel Lezcano
2013-12-30 10:19   ` [PATCH 02/20] clocksource: sun4i: Change CPU mask to cpu_possible_mask Daniel Lezcano
2013-12-30 10:19   ` [PATCH 03/20] clocksource: sun4i: Increase a bit the clock event and sources rating Daniel Lezcano
2013-12-30 10:19   ` [PATCH 04/20] clocksource: Add Allwinner SoCs HS timers driver Daniel Lezcano
2013-12-30 10:19   ` [PATCH 05/20] ARM: sun5i: a10s: Add support for the High Speed Timers Daniel Lezcano
2013-12-30 10:19   ` [PATCH 06/20] ARM: sun5i: a13: " Daniel Lezcano
2013-12-30 10:19   ` [PATCH 07/20] ARM: sun7i: a20: " Daniel Lezcano
2013-12-30 10:19   ` Daniel Lezcano [this message]
2013-12-30 10:19   ` [PATCH 09/20] clocksource: cadence_ttc_timer: Switch to sched_clock_register() Daniel Lezcano
2013-12-30 10:19   ` [PATCH 10/20] clocksource: sun4i: " Daniel Lezcano
2013-12-30 10:19   ` [PATCH 11/20] clocksource: orion: " Daniel Lezcano
2013-12-30 10:19   ` [PATCH 12/20] clocksource: clksrc-of: Warn if no clock sources are found Daniel Lezcano
2013-12-30 10:19   ` [PATCH 13/20] clocksource: armada-370-xp: Enable timer divider only when needed Daniel Lezcano
2013-12-30 10:19   ` [PATCH 14/20] clocksource: sh_tmu: Remove unnecessary platform_set_drvdata() Daniel Lezcano
2013-12-30 10:19   ` [PATCH 15/20] clocksource: sh_mtu2: " Daniel Lezcano
2013-12-30 10:19   ` [PATCH 16/20] clocksource: misc drivers: Remove deprecated IRQF_DISABLED Daniel Lezcano
2013-12-30 10:19   ` [PATCH 17/20] clocksource: tegra: " Daniel Lezcano
2013-12-30 10:19   ` [PATCH 18/20] clocksource: vt8500: " Daniel Lezcano
2013-12-30 10:19   ` [PATCH 19/20] clocksource: bcm_kona_timer: Remove unused bcm_timer_ids Daniel Lezcano
2013-12-30 10:19   ` [PATCH 20/20] clocksource: sh_cmt: Add clk_prepare/unprepare support Daniel Lezcano
2014-01-12 16:33 ` [GIT PULL] clockevents/clocksource : new material for 3.14 Ingo Molnar
2014-01-13  8:27   ` Daniel Lezcano

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=1388398779-11222-8-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.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).