From 4934eb18ff1a757d1b6cb35d765b3ab34ed9653a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?=
 <ukleinek@informatik.uni-freiburg.de>
Date: Thu, 19 Jul 2007 22:13:05 +0100
Subject: [PATCH] --- yaml --- r: 62661 b: refs/heads/master c:
 26c671c6b7c02bc9f9c42331e6ecbeccdf67164c h: refs/heads/master i:   62659:
 5ee9f582b2b08f50c549598df3dfaff6b2a34d2a v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-ns9xxx/irq.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f9e4e8a84a68..ba177d3a9e54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3945a567d0c1d6721994a88f58f028c27d8249d2
+refs/heads/master: 26c671c6b7c02bc9f9c42331e6ecbeccdf67164c
diff --git a/trunk/arch/arm/mach-ns9xxx/irq.c b/trunk/arch/arm/mach-ns9xxx/irq.c
index cd8f8365b62e..b8c7b00522e6 100644
--- a/trunk/arch/arm/mach-ns9xxx/irq.c
+++ b/trunk/arch/arm/mach-ns9xxx/irq.c
@@ -21,6 +21,15 @@ static void ns9xxx_ack_irq_timer(unsigned int irq)
 {
 	u32 tc = SYS_TC(irq - IRQ_TIMER0);
 
+	/*
+	 * If the timer is programmed to halt on terminal count, the
+	 * timer must be disabled before clearing the interrupt.
+	 */
+	if (REGGET(tc, SYS_TCx, REN) == 0) {
+		REGSET(tc, SYS_TCx, TEN, DIS);
+		SYS_TC(irq - IRQ_TIMER0) = tc;
+	}
+
 	REGSET(tc, SYS_TCx, INTC, SET);
 	SYS_TC(irq - IRQ_TIMER0) = tc;