From: Andrew Victor <andrew@sanpeople.com>
Date: Fri, 1 Dec 2006 09:15:04 +0000 (+0100)
Subject: [ARM] 3955/1: AT91: Clear timer interrupt when resuming
X-Git-Tag: v2.6.20-rc1~15^2^2~16
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d100f25956e8626afeafbb38558ca8c58df1cb6b;p=linux-2.6-omap-h63xx.git

[ARM] 3955/1: AT91: Clear timer interrupt when resuming

Attached is a patch for at91rm9200_time.c which removes
the 'BUG: soft lockup detected on CPU#0!' message when
exiting suspended states.

Patch from Savin Zlobec

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c
index 8e9c049c8b7..b999e192a7e 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200_time.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c
@@ -101,6 +101,9 @@ void at91rm9200_timer_reset(void)
 	/* Set Period Interval timer */
 	at91_sys_write(AT91_ST_PIMR, LATCH);
 
+	/* Clear any pending interrupts */
+	(void) at91_sys_read(AT91_ST_SR);
+
 	/* Enable Period Interval Timer interrupt */
 	at91_sys_write(AT91_ST_IER, AT91_ST_PITS);
 }