diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-16 00:26:22 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-11-22 00:41:01 +0100 |
| commit | c66af54139d49e792ee11d6fee1147d47688ef5e (patch) | |
| tree | 2239adbf4f563c3e388fed3f05758383ac7b360a | |
| parent | ARM: u300: Switch to sched_clock_register() (diff) | |
| download | linux-c66af54139d49e792ee11d6fee1147d47688ef5e.tar.xz linux-c66af54139d49e792ee11d6fee1147d47688ef5e.zip | |
ARM: iop: 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>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | arch/arm/plat-iop/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 29606bd75f3f..d70b73364a3f 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c @@ -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(); } @@ -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; |