From bf62e8626963d0002315facb786a8833d404e21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 7 Aug 2007 21:08:21 +0100 Subject: [ARM] 4545/1: ns9xxx: simplify irq ack'ing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now the drivers are responsible to clear the irq in the respective device, which seems to be the normal thing to do. So the ack'ing of the timer irq moved to time.c. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King --- arch/arm/mach-ns9xxx/time.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'arch/arm/mach-ns9xxx/time.c') diff --git a/arch/arm/mach-ns9xxx/time.c b/arch/arm/mach-ns9xxx/time.c index b97d0c5..3327d30 100644 --- a/arch/arm/mach-ns9xxx/time.c +++ b/arch/arm/mach-ns9xxx/time.c @@ -24,10 +24,24 @@ static u32 usecs_per_tick; static irqreturn_t ns9xxx_timer_interrupt(int irq, void *dev_id) { + int timerno = irq - IRQ_TIMER0; + u32 tc; + write_seqlock(&xtime_lock); timer_tick(); write_sequnlock(&xtime_lock); + /* clear irq */ + tc = SYS_TC(timerno); + if (REGGET(tc, SYS_TCx, REN) == SYS_TCx_REN_DIS) { + REGSET(tc, SYS_TCx, TEN, DIS); + SYS_TC(timerno) = tc; + } + REGSET(tc, SYS_TCx, INTC, SET); + SYS_TC(timerno) = tc; + REGSET(tc, SYS_TCx, INTC, UNSET); + SYS_TC(timerno) = tc; + return IRQ_HANDLED; } -- cgit v1.1