diff options
author | 2019-05-23 20:16:02 +0200 | |
---|---|---|
committer | 2019-06-25 19:49:18 +0200 | |
commit | 8925ed4b10345915d576ba2fc6b319e6eae3d8b8 (patch) | |
tree | 317b9fd384ce3d07cbe5c639291f647d2d2f912e /drivers/clocksource | |
parent | clocksource/drivers/timer-meson6: Update with SPDX Licence identifier (diff) | |
download | linux-8925ed4b10345915d576ba2fc6b319e6eae3d8b8.tar.gz linux-8925ed4b10345915d576ba2fc6b319e6eae3d8b8.tar.bz2 linux-8925ed4b10345915d576ba2fc6b319e6eae3d8b8.zip |
clocksource/drivers/ixp4xx: Implement delay timer
This adds delay timer functionality to the IXP4xx
timer driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/timer-ixp4xx.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c index 5c2190b654cd..9396745e1c17 100644 --- a/drivers/clocksource/timer-ixp4xx.c +++ b/drivers/clocksource/timer-ixp4xx.c @@ -75,14 +75,19 @@ to_ixp4xx_timer(struct clock_event_device *evt) return container_of(evt, struct ixp4xx_timer, clkevt); } -static u64 notrace ixp4xx_read_sched_clock(void) +static unsigned long ixp4xx_read_timer(void) { return __raw_readl(local_ixp4xx_timer->base + IXP4XX_OSTS_OFFSET); } +static u64 notrace ixp4xx_read_sched_clock(void) +{ + return ixp4xx_read_timer(); +} + static u64 ixp4xx_clocksource_read(struct clocksource *c) { - return __raw_readl(local_ixp4xx_timer->base + IXP4XX_OSTS_OFFSET); + return ixp4xx_read_timer(); } static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id) @@ -224,6 +229,13 @@ static __init int ixp4xx_timer_register(void __iomem *base, sched_clock_register(ixp4xx_read_sched_clock, 32, timer_freq); +#ifdef CONFIG_ARM + /* Also use this timer for delays */ + tmr->delay_timer.read_current_timer = ixp4xx_read_timer; + tmr->delay_timer.freq = timer_freq; + register_current_timer_delay(&tmr->delay_timer); +#endif + return 0; } |