diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-04-30 22:58:35 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-06-11 13:09:10 +1000 |
| commit | 55b33f316d25c1ffb13a65de7f846b950b5ef5a6 (patch) | |
| tree | ea8b7d9b038bf128199e92de6bcf47edbe53c301 /arch/m68knommu | |
| parent | 25ce4a908abebf8c7d2e89908d36050e1de9cbec (diff) | |
| download | linux-stable-55b33f316d25c1ffb13a65de7f846b950b5ef5a6.tar.gz linux-stable-55b33f316d25c1ffb13a65de7f846b950b5ef5a6.tar.bz2 linux-stable-55b33f316d25c1ffb13a65de7f846b950b5ef5a6.zip | |
m68knommu: move CPU reset code for the 523x ColdFire into its platform code
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/platform/523x/config.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/m68knommu/platform/523x/config.c b/arch/m68knommu/platform/523x/config.c index 74133f27b30c..961fefebca14 100644 --- a/arch/m68knommu/platform/523x/config.c +++ b/arch/m68knommu/platform/523x/config.c @@ -15,7 +15,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> @@ -24,10 +23,6 @@ /***************************************************************************/ -void coldfire_reset(void); - -/***************************************************************************/ - static struct mcf_platform_uart m523x_uart_platform[] = { { .mapbase = MCF_MBAR + MCFUART_BASE1, @@ -145,13 +140,20 @@ void mcf_autovector(unsigned int vec) { /* Everything is auto-vectored on the 523x */ } +/***************************************************************************/ + +static void m523x_cpu_reset(void) +{ + local_irq_disable(); + __raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR); +} /***************************************************************************/ void __init config_BSP(char *commandp, int size) { mcf_disableall(); - mach_reset = coldfire_reset; + mach_reset = m523x_cpu_reset; m523x_uarts_init(); m523x_fec_init(); } |