From 798390404fd46701b5cfcc873b45961c07112281 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Thu, 30 Apr 2009 17:03:09 +1000
Subject: [PATCH] --- yaml --- r: 147791 b: refs/heads/master c:
 c18e52c7696e39c7cb23cd083bbda5652c338b79 h: refs/heads/master i:   147789:
 f12be5097e7d7f43198c3bcb65ea310f1e3704ed   147787:
 bd08dbd25e8cdd731930f7f39a2ff6667add61d6   147783:
 be0098cbb6bec308c7e6ad64ce2a7baa92515678   147775:
 c1ce99c2dfec664e93e87eb5e3b1e773f07e8e28 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/m68knommu/platform/5307/config.c | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c0e040fe35b5..8bc0605993ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 293ca0f75415dd8373c716bf9755569daca7ba5d
+refs/heads/master: c18e52c7696e39c7cb23cd083bbda5652c338b79
diff --git a/trunk/arch/m68knommu/platform/5307/config.c b/trunk/arch/m68knommu/platform/5307/config.c
index 44803bf70a6e..39da9e9ff674 100644
--- a/trunk/arch/m68knommu/platform/5307/config.c
+++ b/trunk/arch/m68knommu/platform/5307/config.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
@@ -22,8 +21,6 @@
 
 /***************************************************************************/
 
-void coldfire_reset(void);
-
 extern unsigned int mcf_timervector;
 extern unsigned int mcf_profilevector;
 extern unsigned int mcf_timerlevel;
@@ -119,6 +116,17 @@ void mcf_settimericr(unsigned int timer, unsigned int level)
 
 /***************************************************************************/
 
+void m5307_cpu_reset(void)
+{
+	local_irq_disable();
+	/* Set watchdog to soft reset, and enabled */
+	__raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);
+	for (;;)
+		/* wait for watchdog to timeout */;
+}
+
+/***************************************************************************/
+
 void __init config_BSP(char *commandp, int size)
 {
 	mcf_setimr(MCFSIM_IMR_MASKALL);
@@ -134,7 +142,7 @@ void __init config_BSP(char *commandp, int size)
 	mcf_timerlevel = 6;
 #endif
 
-	mach_reset = coldfire_reset;
+	mach_reset = m5307_cpu_reset;
 
 #ifdef CONFIG_BDM_DISABLE
 	/*