diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-07 10:35:19 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 08:23:48 -0500 |
commit | 3dac219615b88010601ee52e7b5fd1c32ef789ea (patch) | |
tree | e2be4a211f7fe7df748e90a30d84b432895fc4c7 /arch/arm/mach-imx/mach-scb9328.c | |
parent | 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 (diff) |
ARM: imx: use .init_early to initialize cpu type and reset address
This used to be done in .map_io which is supposed to only setup the
memory mapping.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-scb9328.c')
-rw-r--r-- | arch/arm/mach-imx/mach-scb9328.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c index eae878f306c6..dcaee043628e 100644 --- a/arch/arm/mach-imx/mach-scb9328.c +++ b/arch/arm/mach-imx/mach-scb9328.c | |||
@@ -145,10 +145,11 @@ static struct sys_timer scb9328_timer = { | |||
145 | }; | 145 | }; |
146 | 146 | ||
147 | MACHINE_START(SCB9328, "Synertronixx scb9328") | 147 | MACHINE_START(SCB9328, "Synertronixx scb9328") |
148 | /* Sascha Hauer */ | 148 | /* Sascha Hauer */ |
149 | .boot_params = 0x08000100, | 149 | .boot_params = 0x08000100, |
150 | .map_io = mx1_map_io, | 150 | .map_io = mx1_map_io, |
151 | .init_irq = mx1_init_irq, | 151 | .init_early = imx1_init_early, |
152 | .timer = &scb9328_timer, | 152 | .init_irq = mx1_init_irq, |
153 | .init_machine = scb9328_init, | 153 | .timer = &scb9328_timer, |
154 | .init_machine = scb9328_init, | ||
154 | MACHINE_END | 155 | MACHINE_END |