diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:21 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:41:01 -0500 |
commit | 5994d01f3c24e1350b6995ae458f6afaf6067223 (patch) | |
tree | 590796f0eb0f4d0e619c0e5b90b344126d039f49 | |
parent | 26cad74c54b497a629f4e101ef338c5edb67fed5 (diff) |
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>
-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 = { | |||
341 | * stamp. (Inspired by OMAP implementation.) | 341 | * stamp. (Inspired by OMAP implementation.) |
342 | */ | 342 | */ |
343 | 343 | ||
344 | static u32 notrace u300_read_sched_clock(void) | 344 | static u64 notrace u300_read_sched_clock(void) |
345 | { | 345 | { |
346 | return readl(u300_timer_base + U300_TIMER_APP_GPT2CC); | 346 | return readl(u300_timer_base + U300_TIMER_APP_GPT2CC); |
347 | } | 347 | } |
@@ -380,7 +380,7 @@ static void __init u300_timer_init_of(struct device_node *np) | |||
380 | clk_prepare_enable(clk); | 380 | clk_prepare_enable(clk); |
381 | rate = clk_get_rate(clk); | 381 | rate = clk_get_rate(clk); |
382 | 382 | ||
383 | setup_sched_clock(u300_read_sched_clock, 32, rate); | 383 | sched_clock_register(u300_read_sched_clock, 32, rate); |
384 | 384 | ||
385 | u300_delay_timer.read_current_timer = &u300_read_current_timer; | 385 | u300_delay_timer.read_current_timer = &u300_read_current_timer; |
386 | u300_delay_timer.freq = rate; | 386 | u300_delay_timer.freq = rate; |