diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-12-23 22:00:02 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2012-03-04 18:43:09 -0500 |
commit | 2ba168a913192ebe44ca1da06d46f4e13037392f (patch) | |
tree | f9ad1c3a784de6d4dcd16e0ad7fe7819ba06838b /arch/m68k/platform | |
parent | fa1fc24662d57170259948314b0759376eb75777 (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>
Diffstat (limited to 'arch/m68k/platform')
-rw-r--r-- | arch/m68k/platform/523x/config.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c index 94e93943cbf8..b47a6886b8ae 100644 --- a/arch/m68k/platform/523x/config.c +++ b/arch/m68k/platform/523x/config.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/machdep.h> | 19 | #include <asm/machdep.h> |
20 | #include <asm/coldfire.h> | 20 | #include <asm/coldfire.h> |
21 | #include <asm/mcfsim.h> | 21 | #include <asm/mcfsim.h> |
22 | #include <asm/mcfuart.h> | ||
23 | 22 | ||
24 | /***************************************************************************/ | 23 | /***************************************************************************/ |
25 | 24 | ||
@@ -67,18 +66,10 @@ void __init config_BSP(char *commandp, int size) | |||
67 | { | 66 | { |
68 | mach_reset = m523x_cpu_reset; | 67 | mach_reset = m523x_cpu_reset; |
69 | mach_sched_init = hw_timer_init; | 68 | mach_sched_init = hw_timer_init; |
70 | } | 69 | m523x_fec_init(); |
71 | |||
72 | /***************************************************************************/ | ||
73 | |||
74 | static int __init init_BSP(void) | ||
75 | { | ||
76 | #ifdef CONFIG_SPI_COLDFIRE_QSPI | 70 | #ifdef CONFIG_SPI_COLDFIRE_QSPI |
77 | m523x_qspi_init(); | 71 | m523x_qspi_init(); |
78 | #endif | 72 | #endif |
79 | return 0; | ||
80 | } | 73 | } |
81 | 74 | ||
82 | arch_initcall(init_BSP); | ||
83 | |||
84 | /***************************************************************************/ | 75 | /***************************************************************************/ |