summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-12-24 13:06:33 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-03-05 09:43:10 +1000
commitc05793c7332d0f4179068bc6a6120e67b73a09ef (patch)
tree66ee5d20199610157b766cd0bcb1d918c63ca7a2 /arch/m68k
parent9773be5f5fcbabb688bf05f85d594261a53a5ac0 (diff)
downloadlinux-c05793c7332d0f4179068bc6a6120e67b73a09ef.tar.bz2
m68knommu: clean up init code in ColdFire 532x startup
We can move all the init calls in the initcall code into the more general arch setup code (which is config_BSP() here). That makes the 532x consistent with other ColdFire CPUs setup code. It means we can get rid of the initcall setup here all together. Also make sure we set the arch mach_reset function pointer to get the local arch reset code called on reset. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/platform/532x/config.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
index 8c0dd5caae97..56b21fd84b3f 100644
--- a/arch/m68k/platform/532x/config.c
+++ b/arch/m68k/platform/532x/config.c
@@ -83,6 +83,12 @@ 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
+ m532x_qspi_init();
+#endif
#ifdef CONFIG_BDM_DISABLE
/*
@@ -95,20 +101,6 @@ void __init config_BSP(char *commandp, int size)
}
/***************************************************************************/
-
-static int __init init_BSP(void)
-{
- m532x_uarts_init();
- m532x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
- m532x_qspi_init();
-#endif
- return 0;
-}
-
-arch_initcall(init_BSP);
-
-/***************************************************************************/
/* Board initialization */
/***************************************************************************/
/*