clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
authorDaniel Lezcano <daniel.lezcano@linaro.org>
Thu, 12 Nov 2015 17:05:11 +0000 (18:05 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 15 Dec 2015 08:42:30 +0000 (09:42 +0100)
The current code to initialize, register and read the clocksource is
already factored out in mmio.c via the clocksource_mmio_init function.

The only difference is the readl vs readl_relaxed.

Factor out the code with the clocksource_mmio_init function.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
drivers/clocksource/timer-sun5i.c

index bca9573..24c83f9 100644 (file)
@@ -152,13 +152,6 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static cycle_t sun5i_clksrc_read(struct clocksource *clksrc)
-{
-       struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc);
-
-       return ~readl(cs->timer.base + TIMER_CNTVAL_LO_REG(1));
-}
-
 static int sun5i_rate_cb_clksrc(struct notifier_block *nb,
                                unsigned long event, void *data)
 {
@@ -217,13 +210,8 @@ static int __init sun5i_setup_clocksource(struct device_node *node,
        writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
               base + TIMER_CTL_REG(1));
 
-       cs->clksrc.name = node->name;
-       cs->clksrc.rating = 340;
-       cs->clksrc.read = sun5i_clksrc_read;
-       cs->clksrc.mask = CLOCKSOURCE_MASK(32);
-       cs->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS;
-
-       ret = clocksource_register_hz(&cs->clksrc, rate);
+       ret = clocksource_mmio_init(base + TIMER_CNTVAL_LO_REG(1), node->name,
+                                   rate, 340, 32, clocksource_mmio_readl_down);
        if (ret) {
                pr_err("Couldn't register clock source.\n");
                goto err_remove_notifier;