aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/clocksource/timer-sun5i.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index bddc52233d2a..deebcd6469fc 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -136,7 +136,7 @@ static struct irqaction sun5i_timer_irq = {
136 .dev_id = &sun5i_clockevent, 136 .dev_id = &sun5i_clockevent,
137}; 137};
138 138
139static u32 sun5i_timer_sched_read(void) 139static u64 sun5i_timer_sched_read(void)
140{ 140{
141 return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1)); 141 return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1));
142} 142}
@@ -166,7 +166,7 @@ static void __init sun5i_timer_init(struct device_node *node)
166 writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD, 166 writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
167 timer_base + TIMER_CTL_REG(1)); 167 timer_base + TIMER_CTL_REG(1));
168 168
169 setup_sched_clock(sun5i_timer_sched_read, 32, rate); 169 sched_clock_register(sun5i_timer_sched_read, 32, rate);
170 clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name, 170 clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name,
171 rate, 340, 32, clocksource_mmio_readl_down); 171 rate, 340, 32, clocksource_mmio_readl_down);
172 172