summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-12-24 13:00:02 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-03-05 09:43:09 +1000
commit2ba168a913192ebe44ca1da06d46f4e13037392f (patch)
treef9ad1c3a784de6d4dcd16e0ad7fe7819ba06838b
parentfa1fc24662d57170259948314b0759376eb75777 (diff)
m68knommu: clean up init code in ColdFire 523x startup
We can move the QSPI init call to the more general config_BSP() code on the 523x platorm setup code. Then we can remove the initcall code all together. We can also remove the un-needed include of mcfuart.h while we are cleaning up here too. Also I noticed that we are not calling the fec_init() code here, and we should be doing that. Put that back in too. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r--arch/m68k/platform/523x/config.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index 94e93943cbf..b47a6886b8a 100644
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -19,7 +19,6 @@
#include <asm/machdep.h>
#include <asm/coldfire.h>
#include <asm/mcfsim.h>
-#include <asm/mcfuart.h>
/***************************************************************************/
@@ -67,18 +66,10 @@ void __init config_BSP(char *commandp, int size)
{
mach_reset = m523x_cpu_reset;
mach_sched_init = hw_timer_init;
-}
-
-/***************************************************************************/
-
-static int __init init_BSP(void)
-{
+ m523x_fec_init();
#ifdef CONFIG_SPI_COLDFIRE_QSPI
m523x_qspi_init();
#endif
- return 0;
}
-arch_initcall(init_BSP);
-
/***************************************************************************/