From c8c27044708343057f88aa9e9eb79f20c80df0f6 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@freescale.com>
Date: Tue, 25 Oct 2005 23:02:59 -0500
Subject: [PATCH] --- yaml --- r: 11647 b: refs/heads/master c:
 0fd6f717948083d480f38e97f62cc116faf0e534 h: refs/heads/master i:   11645:
 255f82605e4733bfd47509c15d04d474c731aae9   11643:
 505b49469c1f4c1aa07b03d28025dc3ba54e33d2   11639:
 2c8bb51991e94a4d85e68b587778c7d5e19d5e74   11631:
 52f1f2be17e9b5b6d1f320dd56c55d22f3f029f9   11615:
 44b19b6c3599dcd24d40e76c3fd24093c1e39686   11583:
 8c32a76d4e0c8d9ed6f5f386dbcc5965969cabed   11519:
 c5cb1be122448aba9a51583dc5fcbe16ccb18884 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/powerpc/kernel/time.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 27a1bd4c4481..659806585b9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab590ccb428f874bb8f9cec1265cc1f9cb38b601
+refs/heads/master: 0fd6f717948083d480f38e97f62cc116faf0e534
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
index 82f2cabb4f47..9f264c2f02c3 100644
--- a/trunk/arch/powerpc/kernel/time.c
+++ b/trunk/arch/powerpc/kernel/time.c
@@ -610,6 +610,17 @@ void __init generic_calibrate_decr(void)
 			ppc_proc_freq = *fp;
 		}
 	}
+#ifdef CONFIG_BOOKE
+	/* Set the time base to zero */
+	mtspr(SPRN_TBWL, 0);
+	mtspr(SPRN_TBWU, 0);
+
+	/* Clear any pending timer interrupts */
+	mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS);
+
+	/* Enable decrementer interrupt */
+	mtspr(SPRN_TCR, TCR_DIE);
+#endif
 	if (!node_found)
 		printk(KERN_ERR "WARNING: Estimating processor frequency "
 				"(not found)\n");