Skip to content

Commit

Permalink
ARM: orion: 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.

Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
  • Loading branch information
Stephen Boyd authored and Kevin Hilman committed Nov 21, 2013
1 parent 8f0678f commit b44653b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/plat-orion/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static u32 ticks_per_jiffy;
* at least 7.5ns (133MHz TCLK).
*/

static u32 notrace orion_read_sched_clock(void)
static u64 notrace orion_read_sched_clock(void)
{
return ~readl(timer_base + TIMER0_VAL_OFF);
}
Expand Down Expand Up @@ -201,7 +201,7 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask,
/*
* Set scale and timer for sched_clock.
*/
setup_sched_clock(orion_read_sched_clock, 32, tclk);
sched_clock_register(orion_read_sched_clock, 32, tclk);

/*
* Setup free-running clocksource timer (interrupts
Expand Down

0 comments on commit b44653b

Please sign in to comment.