diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-04-30 17:22:05 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-06-11 13:09:09 +1000 |
| commit | 851377bca613175473b6dafd6c7d1bfbcf24efe2 (patch) | |
| tree | 8dffe80fa34c49761857739fad02d8ef8f4345dc | |
| parent | eb7c874d5c81dae6d7b80857e9f0dab1a5d05ebd (diff) | |
| download | blackbird-op-linux-851377bca613175473b6dafd6c7d1bfbcf24efe2.tar.gz blackbird-op-linux-851377bca613175473b6dafd6c7d1bfbcf24efe2.zip | |
m68knommu: add CPU reset code for the 5206 ColdFire
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68knommu/platform/5206/config.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/m68knommu/platform/5206/config.c b/arch/m68knommu/platform/5206/config.c index 53a5920c2b71..f6f79874e9af 100644 --- a/arch/m68knommu/platform/5206/config.c +++ b/arch/m68knommu/platform/5206/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> @@ -21,10 +20,6 @@ /***************************************************************************/ -void coldfire_reset(void); - -/***************************************************************************/ - static struct mcf_platform_uart m5206_uart_platform[] = { { .mapbase = MCF_MBAR + MCFUART_BASE1, @@ -109,10 +104,21 @@ void mcf_settimericr(unsigned int timer, unsigned int level) /***************************************************************************/ +void m5206_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); - mach_reset = coldfire_reset; + mach_reset = m5206_cpu_reset; } /***************************************************************************/ |
