aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91rm9200
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-12-01 10:15:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-01 13:53:55 +0000
commitd100f25956e8626afeafbb38558ca8c58df1cb6b (patch)
tree9f51f0bf1cef5d20ad0f9722d77db97b60a82ef0 /arch/arm/mach-at91rm9200
parent86ad76bb2db7029343f681359c4b328fd8c36ae8 (diff)
downloadlinux-2.6.34-ux500-d100f25956e8626afeafbb38558ca8c58df1cb6b.tar.gz
[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>
Diffstat (limited to 'arch/arm/mach-at91rm9200')
-rw-r--r--arch/arm/mach-at91rm9200/at91rm9200_time.c3
1 files changed, 3 insertions, 0 deletions
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);
}