From a5efbc98744e2a271487faca3d299b60ae133a4c Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurentp@cse-semaphore.com>
Date: Thu, 10 Apr 2008 17:02:38 +0200
Subject: [PATCH] --- yaml --- r: 91581 b: refs/heads/master c:
 872a15deed2f6c2dc14353a6109adde99cfee690 h: refs/heads/master i:   91579:
 f50ab84fc64a32923e84c42d89d07824453f1e92 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/sysdev/cpm2.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5eba9dc9d956..dfa3183f0dc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0585fa5fb74001487e71c9f04875803e1f1174e1
+refs/heads/master: 872a15deed2f6c2dc14353a6109adde99cfee690
diff --git a/trunk/arch/powerpc/sysdev/cpm2.c b/trunk/arch/powerpc/sysdev/cpm2.c
index fa70ee31349e..4ab3f1f5a7c3 100644
--- a/trunk/arch/powerpc/sysdev/cpm2.c
+++ b/trunk/arch/powerpc/sysdev/cpm2.c
@@ -80,6 +80,12 @@ void __init cpm2_reset(void)
 	/* Tell everyone where the comm processor resides.
 	 */
 	cpmp = &cpm2_immr->im_cpm;
+
+#ifndef CONFIG_PPC_EARLY_DEBUG_CPM
+	/* Reset the CPM.
+	 */
+	cpm_command(CPM_CR_RST, 0);
+#endif
 }
 
 static DEFINE_SPINLOCK(cmd_lock);