diff options
| author | Tero Kristo <tero.kristo@nokia.com> | 2010-06-09 13:53:05 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-06-10 15:37:41 +0300 |
| commit | 856f19145104dcab5b1415c1936c9aa81d83ba04 (patch) | |
| tree | 2d02c275d0b986b87daa4b9ee587aae3f7090ec1 | |
| parent | 99716b662ba527ea66172ba215da8a9d0e567c3e (diff) | |
| download | kernel_samsung_smdk4412-856f19145104dcab5b1415c1936c9aa81d83ba04.zip kernel_samsung_smdk4412-856f19145104dcab5b1415c1936c9aa81d83ba04.tar.gz kernel_samsung_smdk4412-856f19145104dcab5b1415c1936c9aa81d83ba04.tar.bz2 | |
omap: DMTIMER: Ack pending interrupt always when stopping a timer
The kernel timer queue is being run currently from a GP timer running in a one
shot mode, which works in a way that when it expires, it will also stop.
Usually during this situation, the interrupt handler will ack the interrupt,
load a new value to the timer and start it again. During suspend, the
situation is slightly different, as we disable interrupts just before
timekeeping is suspended, which leaves a small window where the timer can
expire before it is stopped, and will leave the interrupt flag pending.
This pending interrupt will prevent ARM sleep entry, thus now we ack it always
when we are attempting to stop a timer.
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
[tony@atomide.com: removed the ifdef to make the patch cover omap1 also]
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index c64875f..44bafda 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -541,11 +541,11 @@ void omap_dm_timer_stop(struct omap_dm_timer *timer) * timer is stopped */ udelay(3500000 / clk_get_rate(timer->fclk) + 1); - /* Ack possibly pending interrupt */ - omap_dm_timer_write_reg(timer, OMAP_TIMER_STAT_REG, - OMAP_TIMER_INT_OVERFLOW); #endif } + /* Ack possibly pending interrupt */ + omap_dm_timer_write_reg(timer, OMAP_TIMER_STAT_REG, + OMAP_TIMER_INT_OVERFLOW); } EXPORT_SYMBOL_GPL(omap_dm_timer_stop); |