7 files changed, 23 insertions, 51 deletions

diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c
index 6c318dbe158a..235947844f27 100644
--- a/arch/m68k/platform/520x/config.c
+++ b/arch/m68k/platform/520x/config.c
@@ -74,17 +74,8 @@ static void __init m520x_fec_init(void)
 
 /***************************************************************************/
 
-static void m520x_cpu_reset(void)
-{
-        local_irq_disable();
-        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
-        mach_reset = m520x_cpu_reset;
         mach_sched_init = hw_timer_init;
         m520x_uarts_init();
         m520x_fec_init();
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index 88de2133f47d..c8b405d5a961 100644
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -54,17 +54,8 @@ static void __init m523x_fec_init(void)
 
 /***************************************************************************/
 
-static void m523x_cpu_reset(void)
-{
-        local_irq_disable();
-        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
-        mach_reset = m523x_cpu_reset;
         mach_sched_init = hw_timer_init;
         m523x_fec_init();
 #ifdef CONFIG_SPI_COLDFIRE_QSPI
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c
index 38655051bf59..7ed848c3b848 100644
--- a/arch/m68k/platform/527x/config.c
+++ b/arch/m68k/platform/527x/config.c
@@ -87,17 +87,8 @@ static void __init m527x_fec_init(void)
 
 /***************************************************************************/
 
-static void m527x_cpu_reset(void)
-{
-        local_irq_disable();
-        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
-        mach_reset = m527x_cpu_reset;
         mach_sched_init = hw_timer_init;
         m527x_uarts_init();
         m527x_fec_init();
diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
index d203b1ba4ebb..d4492926614c 100644
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/528x/config.c
@@ -60,14 +60,6 @@ static void __init m528x_fec_init(void)
 
 /***************************************************************************/
 
-static void m528x_cpu_reset(void)
-{
-        local_irq_disable();
-        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
-}
-
-/***************************************************************************/
-
 #ifdef CONFIG_WILDFIRE
 void wildfire_halt(void)
 {
@@ -103,7 +95,6 @@ void __init config_BSP(char *commandp, int size)
 #ifdef CONFIG_WILDFIREMOD
         mach_halt = wildfiremod_halt;
 #endif
-        mach_reset = m528x_cpu_reset;
         mach_sched_init = hw_timer_init;
         m528x_uarts_init();
         m528x_fec_init();
diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
index 56b21fd84b3f..2bec3477b739 100644
--- a/arch/m68k/platform/532x/config.c
+++ b/arch/m68k/platform/532x/config.c
@@ -61,14 +61,6 @@ static void __init m532x_fec_init(void)
 
 /***************************************************************************/
 
-static void m532x_cpu_reset(void)
-{
-        local_irq_disable();
-        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
 #if !defined(CONFIG_BOOTPARAM)
@@ -83,7 +75,6 @@ void __init config_BSP(char *commandp, int size)
 #endif
 
         mach_sched_init = hw_timer_init;
-        mach_reset = m532x_cpu_reset;
         m532x_uarts_init();
         m532x_fec_init();
 #ifdef CONFIG_SPI_COLDFIRE_QSPI
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index bccab9331ee1..a0815c61dec1 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -17,14 +17,14 @@ asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 obj-$(CONFIG_COLDFIRE)  += cache.o clk.o device.o dma.o entry.o vectors.o
 obj-$(CONFIG_M5206)     += timers.o intc.o reset.o
 obj-$(CONFIG_M5206e)    += timers.o intc.o reset.o
-obj-$(CONFIG_M520x)     += pit.o intc-simr.o
-obj-$(CONFIG_M523x)     += pit.o dma_timer.o intc-2.o
+obj-$(CONFIG_M520x)     += pit.o intc-simr.o reset.o
+obj-$(CONFIG_M523x)     += pit.o dma_timer.o intc-2.o reset.o
 obj-$(CONFIG_M5249)     += timers.o intc.o reset.o
-obj-$(CONFIG_M527x)     += pit.o intc-2.o
+obj-$(CONFIG_M527x)     += pit.o intc-2.o reset.o
 obj-$(CONFIG_M5272)     += timers.o
-obj-$(CONFIG_M528x)     += pit.o intc-2.o
+obj-$(CONFIG_M528x)     += pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)     += timers.o intc.o reset.o
-obj-$(CONFIG_M532x)     += timers.o intc-simr.o
+obj-$(CONFIG_M532x)     += timers.o intc-simr.o reset.o
 obj-$(CONFIG_M5407)     += timers.o intc.o reset.o
 obj-$(CONFIG_M54xx)     += sltimers.o intc-2.o
 
diff --git a/arch/m68k/platform/coldfire/reset.c b/arch/m68k/platform/coldfire/reset.c
index 5ed78d3546d2..933e54eacc69 100644
--- a/arch/m68k/platform/coldfire/reset.c
+++ b/arch/m68k/platform/coldfire/reset.c
@@ -15,7 +15,15 @@
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 
-void mcf_cpu_reset(void)
+/*
+ *      There are 2 common methods amongst the ColdFure parts for reseting
+ *      the CPU. But there are couple of exceptions, the 5272 and the 547x
+ *      have something completely special to them, and we let their specific
+ *      subarch code handle them.
+ */
+
+#ifdef MCFSIM_SYPCR
+static void mcf_cpu_reset(void)
 {
         local_irq_disable();
         /* Set watchdog to soft reset, and enabled */
@@ -23,6 +31,15 @@ void mcf_cpu_reset(void)
         for (;;)
                 /* wait for watchdog to timeout */;
 }
+#endif
+
+#ifdef MCF_RCR
+static void mcf_cpu_reset(void)
+{
+        local_irq_disable();
+        __raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
+}
+#endif
 
 static int __init mcf_setup_reset(void)
 {