aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-mx31_3ds.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-02-07 10:35:20 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-02-10 08:23:49 -0500
commit97976e223be3091a91da103358c3c6cffff7db81 (patch)
tree3f658a7775f0049a3365d8d1c94fed0b6fedc903 /arch/arm/mach-mx3/mach-mx31_3ds.c
parent3dac219615b88010601ee52e7b5fd1c32ef789ea (diff)
ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxer
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-mx3/mach-mx31_3ds.c')
-rw-r--r--arch/arm/mach-mx3/mach-mx31_3ds.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 6c16c403c242..3d0ded92a8a2 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -373,9 +373,10 @@ static struct sys_timer mx31_3ds_timer = {
373 */ 373 */
374MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 374MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
375 /* Maintainer: Freescale Semiconductor, Inc. */ 375 /* Maintainer: Freescale Semiconductor, Inc. */
376 .boot_params = MX3x_PHYS_OFFSET + 0x100, 376 .boot_params = MX3x_PHYS_OFFSET + 0x100,
377 .map_io = mx31_map_io, 377 .map_io = mx31_map_io,
378 .init_irq = mx31_init_irq, 378 .init_early = imx31_init_early,
379 .init_machine = mxc_board_init, 379 .init_irq = mx31_init_irq,
380 .timer = &mx31_3ds_timer, 380 .timer = &mx31_3ds_timer,
381 .init_machine = mxc_board_init,
381MACHINE_END 382MACHINE_END