diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2013-07-18 16:21:27 -0700 |
|---|---|---|
| committer |   John Stultz <john.stultz@linaro.org> | 2013-07-30 11:24:54 -0700 |
| commit | d9dbcbe0ea29dac15a9ca70c274fec4ef100e187 (patch) | |
| tree | fb41fdb073d630e82e1c6d35a44cb6ad6cf54fef /drivers/clocksource/time-armada-370-xp.c | |
| parent | clocksource: tegra: Switch to sched_clock_register() (diff) | |
| download | linux-dev-d9dbcbe0ea29dac15a9ca70c274fec4ef100e187.tar.xz linux-dev-d9dbcbe0ea29dac15a9ca70c274fec4ef100e187.zip | |
clocksource: time-armada-370-xp: 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.
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource/time-armada-370-xp.c')
| -rw-r--r-- | drivers/clocksource/time-armada-370-xp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index efdca3263afe..2bec8dca74b6 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -71,7 +71,7 @@ static u32 ticks_per_jiffy; static struct clock_event_device __percpu **percpu_armada_370_xp_evt; -static u32 notrace armada_370_xp_read_sched_clock(void) +static u64 notrace armada_370_xp_read_sched_clock(void) { return ~readl(timer_base + TIMER0_VAL_OFF); } @@ -258,7 +258,7 @@ void __init armada_370_xp_timer_init(void) /* * Set scale and timer for sched_clock. */ - setup_sched_clock(armada_370_xp_read_sched_clock, 32, timer_clk); + sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk); /* * Setup free-running clocksource timer (interrupts |