diff options
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 0198504ef6b0..d8e47e502785 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c | |||
@@ -96,7 +96,7 @@ static void local_timer_ctrl_clrset(u32 clr, u32 set) | |||
96 | local_base + TIMER_CTRL_OFF); | 96 | local_base + TIMER_CTRL_OFF); |
97 | } | 97 | } |
98 | 98 | ||
99 | static u32 notrace armada_370_xp_read_sched_clock(void) | 99 | static u64 notrace armada_370_xp_read_sched_clock(void) |
100 | { | 100 | { |
101 | return ~readl(timer_base + TIMER0_VAL_OFF); | 101 | return ~readl(timer_base + TIMER0_VAL_OFF); |
102 | } | 102 | } |
@@ -258,7 +258,7 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np) | |||
258 | /* | 258 | /* |
259 | * Set scale and timer for sched_clock. | 259 | * Set scale and timer for sched_clock. |
260 | */ | 260 | */ |
261 | setup_sched_clock(armada_370_xp_read_sched_clock, 32, timer_clk); | 261 | sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk); |
262 | 262 | ||
263 | /* | 263 | /* |
264 | * Setup free-running clocksource timer (interrupts | 264 | * Setup free-running clocksource timer (interrupts |