diff options
| author | Stephen Boyd | 2013-11-16 00:26:21 +0100 |
|---|---|---|
| committer | Kevin Hilman | 2013-11-22 00:41:01 +0100 |
| commit | 5994d01f3c24e1350b6995ae458f6afaf6067223 (patch) | |
| tree | 590796f0eb0f4d0e619c0e5b90b344126d039f49 /arch/arm/mach-u300/timer.c | |
| parent | ARM: sa1100: Switch to sched_clock_register() (diff) | |
| download | kernel-qcow2-linux-5994d01f3c24e1350b6995ae458f6afaf6067223.tar.gz kernel-qcow2-linux-5994d01f3c24e1350b6995ae458f6afaf6067223.tar.xz kernel-qcow2-linux-5994d01f3c24e1350b6995ae458f6afaf6067223.zip | |
ARM: u300: Switch to sched_clock_register()
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.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
| -rw-r--r-- | arch/arm/mach-u300/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index b5db207dfd1e..d23a1f065171 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -341,7 +341,7 @@ static struct irqaction u300_timer_irq = { * stamp. (Inspired by OMAP implementation.) */ -static u32 notrace u300_read_sched_clock(void) +static u64 notrace u300_read_sched_clock(void) { return readl(u300_timer_base + U300_TIMER_APP_GPT2CC); } @@ -380,7 +380,7 @@ static void __init u300_timer_init_of(struct device_node *np) clk_prepare_enable(clk); rate = clk_get_rate(clk); - setup_sched_clock(u300_read_sched_clock, 32, rate); + sched_clock_register(u300_read_sched_clock, 32, rate); u300_delay_timer.read_current_timer = &u300_read_current_timer; u300_delay_timer.freq = rate; |