diff options
Diffstat (limited to 'arch')
| -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 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/param.h> | 13 | #include <linux/param.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/interrupt.h> | ||
| 16 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 17 | #include <asm/machdep.h> | 16 | #include <asm/machdep.h> |
| 18 | #include <asm/coldfire.h> | 17 | #include <asm/coldfire.h> |
| @@ -21,10 +20,6 @@ | |||
| 21 | 20 | ||
| 22 | /***************************************************************************/ | 21 | /***************************************************************************/ |
| 23 | 22 | ||
| 24 | void coldfire_reset(void); | ||
| 25 | |||
| 26 | /***************************************************************************/ | ||
| 27 | |||
| 28 | static struct mcf_platform_uart m5206_uart_platform[] = { | 23 | static struct mcf_platform_uart m5206_uart_platform[] = { |
| 29 | { | 24 | { |
| 30 | .mapbase = MCF_MBAR + MCFUART_BASE1, | 25 | .mapbase = MCF_MBAR + MCFUART_BASE1, |
| @@ -109,10 +104,21 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
| 109 | 104 | ||
| 110 | /***************************************************************************/ | 105 | /***************************************************************************/ |
| 111 | 106 | ||
| 107 | void m5206_cpu_reset(void) | ||
| 108 | { | ||
| 109 | local_irq_disable(); | ||
| 110 | /* Set watchdog to soft reset, and enabled */ | ||
| 111 | __raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR); | ||
| 112 | for (;;) | ||
| 113 | /* wait for watchdog to timeout */; | ||
| 114 | } | ||
| 115 | |||
| 116 | /***************************************************************************/ | ||
| 117 | |||
| 112 | void __init config_BSP(char *commandp, int size) | 118 | void __init config_BSP(char *commandp, int size) |
| 113 | { | 119 | { |
| 114 | mcf_setimr(MCFSIM_IMR_MASKALL); | 120 | mcf_setimr(MCFSIM_IMR_MASKALL); |
| 115 | mach_reset = coldfire_reset; | 121 | mach_reset = m5206_cpu_reset; |
| 116 | } | 122 | } |
| 117 | 123 | ||
| 118 | /***************************************************************************/ | 124 | /***************************************************************************/ |
