From: Stephen Boyd <sboyd@codeaurora.org> To: John Stultz <john.stultz@linaro.org> Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Thomas Gleixner <tglx@linutronix.de>, Russell King <linux@arm.linux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Christopher Covington <cov@codeaurora.org>, Shawn Guo <shawn.guo@linaro.org> Subject: [PATCH v4 10/17] clocksource: mxs_timer: Switch to sched_clock_register() Date: Thu, 18 Jul 2013 16:21:23 -0700 [thread overview] Message-ID: <1374189690-10810-11-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1374189690-10810-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: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clocksource/mxs_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index 0f5e65f..445b68a 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -222,7 +222,7 @@ static struct clocksource clocksource_mxs = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static u32 notrace mxs_read_sched_clock_v2(void) +static u64 notrace mxs_read_sched_clock_v2(void) { return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); } @@ -236,7 +236,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) else { clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); - setup_sched_clock(mxs_read_sched_clock_v2, 32, c); + sched_clock_register(mxs_read_sched_clock_v2, 32, c); } return 0; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 10/17] clocksource: mxs_timer: Switch to sched_clock_register() Date: Thu, 18 Jul 2013 16:21:23 -0700 [thread overview] Message-ID: <1374189690-10810-11-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1374189690-10810-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: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clocksource/mxs_timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index 0f5e65f..445b68a 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -222,7 +222,7 @@ static struct clocksource clocksource_mxs = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static u32 notrace mxs_read_sched_clock_v2(void) +static u64 notrace mxs_read_sched_clock_v2(void) { return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); } @@ -236,7 +236,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) else { clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); - setup_sched_clock(mxs_read_sched_clock_v2, 32, c); + sched_clock_register(mxs_read_sched_clock_v2, 32, c); } return 0; -- 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-18 23:21 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-18 23:21 [PATCH v4 00/17] 64-bit friendly generic sched_clock() Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 01/17] clocksource: Extract max nsec calculation into separate function Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 02/17] sched_clock: Use seqcount instead of rolling our own Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-19 9:03 ` Will Deacon 2013-07-19 9:03 ` Will Deacon 2013-07-19 9:03 ` Will Deacon 2013-07-19 14:20 ` Nicolas Pitre 2013-07-19 14:20 ` Nicolas Pitre 2013-07-19 14:20 ` Nicolas Pitre 2013-07-19 14:27 ` Russell King - ARM Linux 2013-07-19 14:27 ` Russell King - ARM Linux 2013-07-19 14:27 ` Russell King - ARM Linux 2013-07-18 23:21 ` [PATCH v4 03/17] sched_clock: Use an hrtimer instead of timer Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-22 18:21 ` John Stultz 2013-07-22 18:21 ` John Stultz 2013-07-22 18:45 ` Stephen Boyd 2013-07-22 18:45 ` Stephen Boyd 2013-07-22 18:58 ` Stephen Boyd 2013-07-22 18:58 ` Stephen Boyd 2013-07-22 19:07 ` Russell King - ARM Linux 2013-07-22 19:07 ` Russell King - ARM Linux 2013-07-22 20:48 ` John Stultz 2013-07-22 20:48 ` John Stultz 2013-07-22 20:50 ` Stephen Boyd 2013-07-22 20:50 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 04/17] sched_clock: Add support for >32 bit sched_clock Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-19 9:23 ` Baruch Siach 2013-07-19 9:23 ` Baruch Siach 2013-07-19 16:29 ` Stephen Boyd 2013-07-19 16:29 ` Stephen Boyd 2013-07-19 16:29 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 05/17] arch_timer: Move to generic sched_clock framework Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-10-02 17:44 ` Will Deacon 2013-10-02 17:44 ` Will Deacon 2013-10-02 17:44 ` Will Deacon 2013-10-14 18:44 ` Kevin Hilman 2013-10-14 18:44 ` Kevin Hilman 2013-10-14 18:55 ` Stephen Boyd 2013-10-14 18:55 ` Stephen Boyd 2013-10-14 20:14 ` Kevin Hilman 2013-10-14 20:14 ` Kevin Hilman 2013-10-14 20:18 ` John Stultz 2013-10-14 20:18 ` John Stultz 2013-10-14 20:18 ` John Stultz 2013-10-14 20:14 ` John Stultz 2013-10-14 20:14 ` John Stultz 2013-10-14 20:14 ` John Stultz 2013-07-18 23:21 ` [PATCH v4 06/17] sched_clock: Remove sched_clock_func() hook Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 07/17] clocksource: bcm2835: Switch to sched_clock_register() Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-19 19:34 ` Stephen Warren 2013-07-19 19:34 ` Stephen Warren 2013-07-30 10:04 ` Daniel Lezcano 2013-07-30 10:04 ` Daniel Lezcano 2013-07-30 16:12 ` John Stultz 2013-07-30 16:12 ` John Stultz 2013-07-18 23:21 ` [PATCH v4 08/17] ocksource: dbx500-prcmu: " Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-19 0:18 ` Stephen Boyd 2013-07-19 0:18 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 09/17] clocksource: dw_apb_timer_of: " Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd [this message] 2013-07-18 23:21 ` [PATCH v4 10/17] clocksource: mxs_timer: " Stephen Boyd 2013-07-22 8:10 ` Shawn Guo 2013-07-22 8:10 ` Shawn Guo 2013-07-22 8:10 ` Shawn Guo 2013-07-22 16:23 ` Stephen Boyd 2013-07-22 16:23 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 11/17] clocksource: nomadik: " Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 12/17] clocksource: samsung_pwm_timer: " Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 13/17] clocksource: tegra: " Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-19 19:34 ` Stephen Warren 2013-07-19 19:34 ` Stephen Warren 2013-07-18 23:21 ` [PATCH v4 14/17] clocksource: time-armada-370-xp: " Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-08-06 9:04 ` Gregory CLEMENT 2013-08-06 9:04 ` Gregory CLEMENT 2013-07-18 23:21 ` [PATCH v4 15/17] clocksource: sirf: Switch to sched_clock_register() and use 64 bits Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 16/17] clocksource: vf_pit_timer: Switch to sched_clock_register() Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:21 ` [PATCH v4 17/17] sched_clock: Deprecate setup_sched_clock() Stephen Boyd 2013-07-18 23:21 ` Stephen Boyd 2013-07-18 23:59 ` [PATCH v4 00/17] 64-bit friendly generic sched_clock() John Stultz 2013-07-18 23:59 ` John Stultz 2013-07-19 0:23 ` Stephen Boyd 2013-07-19 0:23 ` Stephen Boyd 2013-10-02 17:47 ` Will Deacon 2013-10-02 17:47 ` Will Deacon 2013-10-02 17:47 ` Will Deacon 2013-10-02 18:02 ` John Stultz 2013-10-02 18:02 ` John Stultz 2013-10-02 18:02 ` John Stultz 2013-10-02 18:13 ` Will Deacon 2013-10-02 18:13 ` Will Deacon 2013-10-02 18:13 ` Will Deacon 2013-07-20 20:51 ` Linus Walleij 2013-07-20 20:51 ` Linus Walleij 2013-07-20 20:51 ` Linus Walleij 2013-07-22 16:24 ` Stephen Boyd 2013-07-22 16:24 ` Stephen Boyd 2013-07-22 16:24 ` Stephen Boyd 2013-07-22 17:07 ` John Stultz 2013-07-22 17:07 ` John Stultz 2013-07-24 14:44 ` Christopher Covington 2013-07-24 14:44 ` Christopher Covington
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=1374189690-10810-11-git-send-email-sboyd@codeaurora.org \ --to=sboyd@codeaurora.org \ --cc=catalin.marinas@arm.com \ --cc=cov@codeaurora.org \ --cc=john.stultz@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=shawn.guo@linaro.org \ --cc=tglx@linutronix.de \ --cc=will.deacon@arm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.