Skip to content

Commit

Permalink
ARM: iop: Switch to sched_clock_register()
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
  • Loading branch information
Stephen Boyd authored and Kevin Hilman committed Nov 21, 2013
1 parent 5994d01 commit c66af54
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/plat-iop/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static struct clocksource iop_clocksource = {
/*
* IOP sched_clock() implementation via its clocksource.
*/
static u32 notrace iop_read_sched_clock(void)
static u64 notrace iop_read_sched_clock(void)
{
return 0xffffffffu - read_tcr1();
}
Expand Down Expand Up @@ -142,7 +142,7 @@ void __init iop_init_time(unsigned long tick_rate)
{
u32 timer_ctl;

setup_sched_clock(iop_read_sched_clock, 32, tick_rate);
sched_clock_register(iop_read_sched_clock, 32, tick_rate);

ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ);
iop_tick_rate = tick_rate;
Expand Down

0 comments on commit c66af54

Please sign in to comment.