mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init

Browse source 
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>
This commit is contained in:
Daniel Lezcano 2015-11-12 18:05:11 +01:00
parent 05de7ed679
commit 157dfadef8
1 changed files with 2 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/clocksource/timer-sun5i.c
View file

@ -152,13 +152,6 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; 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, static int sun5i_rate_cb_clksrc(struct notifier_block *nb,
unsigned long event, void *data) 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, writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
base + TIMER_CTL_REG(1)); base + TIMER_CTL_REG(1));
cs->clksrc.name = node->name; ret = clocksource_mmio_init(base + TIMER_CNTVAL_LO_REG(1), node->name,
cs->clksrc.rating = 340; rate, 340, 32, clocksource_mmio_readl_down);
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);
if (ret) { if (ret) {
pr_err("Couldn't register clock source.\n"); pr_err("Couldn't register clock source.\n");
goto err_remove_notifier; goto err_remove_notifier;