|
|
@@ -111,7 +111,7 @@ static void gpt_irq_acknowledge(void)
|
|
|
|
|
|
static void __iomem *sched_clock_reg;
|
|
|
|
|
|
-static u32 notrace mxc_read_sched_clock(void)
|
|
|
+static u64 notrace mxc_read_sched_clock(void)
|
|
|
{
|
|
|
return sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;
|
|
|
}
|
|
|
@@ -123,7 +123,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)
|
|
|
|
|
|
sched_clock_reg = reg;
|
|
|
|
|
|
- setup_sched_clock(mxc_read_sched_clock, 32, c);
|
|
|
+ sched_clock_register(mxc_read_sched_clock, 32, c);
|
|
|
return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32,
|
|
|
clocksource_mmio_readl_up);
|
|
|
}
|