linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@codeaurora.org>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	John Stultz <john.stultz@linaro.org>,
	linux-kernel@vger.kernel.org,
	Soren Brinkmann <soren.brinkmann@xilinx.com>,
	Michal Simek <monstr@monstr.eu>
Subject: [PATCH 2/4] clocksource: cadence_ttc_timer: Switch to sched_clock_register()
Date: Fri, 15 Nov 2013 15:48:33 -0800	[thread overview]
Message-ID: <1384559315-18699-3-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1384559315-18699-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: Soren Brinkmann <soren.brinkmann@xilinx.com>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/clocksource/cadence_ttc_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index b2bb3a4b..b865b4e 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -158,7 +158,7 @@ static cycle_t __ttc_clocksource_read(struct clocksource *cs)
 				TTC_COUNT_VAL_OFFSET);
 }
 
-static u32 notrace ttc_sched_clock_read(void)
+static u64 notrace ttc_sched_clock_read(void)
 {
 	return __raw_readl(ttc_sched_clock_val_reg);
 }
@@ -306,7 +306,7 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base)
 	}
 
 	ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;
-	setup_sched_clock(ttc_sched_clock_read, 16,
+	sched_clock_register(ttc_sched_clock_read, 16,
 			clk_get_rate(ttccs->ttc.clk) / PRESCALE);
 }
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation


  parent reply	other threads:[~2013-11-15 23:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-15 23:48 [PATCH 0/4] Convert setup_sched_clock() users in drivers/clocksource Stephen Boyd
2013-11-15 23:48 ` [PATCH 1/4] clocksource: arm_global_timer: Switch to sched_clock_register() Stephen Boyd
2013-11-18  9:51   ` srinivas kandagatla
2013-11-18 17:55   ` Stuart MENEFY
2013-11-15 23:48 ` Stephen Boyd [this message]
2013-11-16  0:08   ` [PATCH 2/4] clocksource: cadence_ttc_timer: " Sören Brinkmann
2013-11-15 23:48 ` [PATCH 3/4] clocksource: sun4i: " Stephen Boyd
2013-11-19 13:57   ` Daniel Lezcano
2013-11-19 15:56   ` Maxime Ripard
2013-11-15 23:48 ` [PATCH 4/4] clocksource: orion: " Stephen Boyd
2013-11-16 13:35   ` Sebastian Hesselbarth
2013-11-19 23:52 ` [PATCH 0/4] Convert setup_sched_clock() users in drivers/clocksource 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=1384559315-18699-3-git-send-email-sboyd@codeaurora.org \
    --to=sboyd@codeaurora.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=monstr@monstr.eu \
    --cc=soren.brinkmann@xilinx.com \
    --cc=tglx@linutronix.de \
    /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).