From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/17] ARM: clps711x: Switch to sched_clock_register()
Date: Fri, 15 Nov 2013 15:26:10 -0800 [thread overview]
Message-ID: <1384557985-9414-3-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: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/mach-clps711x/common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index 134641d..a193591 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -259,7 +259,7 @@ asmlinkage void __exception_irq_entry clps711x_handle_irq(struct pt_regs *regs)
} while (1);
}
-static u32 notrace clps711x_sched_clock_read(void)
+static u64 notrace clps711x_sched_clock_read(void)
{
return ~readw_relaxed(CLPS711X_VIRT_BASE + TC1D);
}
@@ -366,7 +366,7 @@ void __init clps711x_timer_init(void)
tmp = clps_readl(SYSCON1) & ~(SYSCON1_TC1S | SYSCON1_TC1M);
clps_writel(tmp, SYSCON1);
- setup_sched_clock(clps711x_sched_clock_read, 16, timl);
+ sched_clock_register(clps711x_sched_clock_read, 16, timl);
clocksource_mmio_init(CLPS711X_VIRT_BASE + TC1D,
"clps711x_clocksource", timl, 300, 16,
--
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 ` Stephen Boyd [this message]
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 ` [PATCH 10/17] ARM: OMAP2+: " Stephen Boyd
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-3-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).