ARM: clps711x: 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: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
parent
9b12f3a86a
commit
161f408978
|
@ -259,7 +259,7 @@ asmlinkage void __exception_irq_entry clps711x_handle_irq(struct pt_regs *regs)
|
||||||
} while (1);
|
} while (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 notrace clps711x_sched_clock_read(void)
|
static u64 notrace clps711x_sched_clock_read(void)
|
||||||
{
|
{
|
||||||
return ~readw_relaxed(CLPS711X_VIRT_BASE + TC1D);
|
return ~readw_relaxed(CLPS711X_VIRT_BASE + TC1D);
|
||||||
}
|
}
|
||||||
|
@ -366,7 +366,7 @@ void __init clps711x_timer_init(void)
|
||||||
tmp = clps_readl(SYSCON1) & ~(SYSCON1_TC1S | SYSCON1_TC1M);
|
tmp = clps_readl(SYSCON1) & ~(SYSCON1_TC1S | SYSCON1_TC1M);
|
||||||
clps_writel(tmp, SYSCON1);
|
clps_writel(tmp, SYSCON1);
|
||||||
|
|
||||||
setup_sched_clock(clps711x_sched_clock_read, 16, timl);
|
sched_clock_register(clps711x_sched_clock_read, 16, timl);
|
||||||
|
|
||||||
clocksource_mmio_init(CLPS711X_VIRT_BASE + TC1D,
|
clocksource_mmio_init(CLPS711X_VIRT_BASE + TC1D,
|
||||||
"clps711x_clocksource", timl, 300, 16,
|
"clps711x_clocksource", timl, 300, 16,
|
||||||
|
|
Loading…
Reference in New Issue