diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-07 10:35:20 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 08:23:49 -0500 |
commit | 97976e223be3091a91da103358c3c6cffff7db81 (patch) | |
tree | 3f658a7775f0049a3365d8d1c94fed0b6fedc903 /arch/arm/mach-mx3/mach-pcm037.c | |
parent | 3dac219615b88010601ee52e7b5fd1c32ef789ea (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-pcm037.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index b752f6bc20a2..7d444f714f30 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c | |||
@@ -675,9 +675,10 @@ struct sys_timer pcm037_timer = { | |||
675 | 675 | ||
676 | MACHINE_START(PCM037, "Phytec Phycore pcm037") | 676 | MACHINE_START(PCM037, "Phytec Phycore pcm037") |
677 | /* Maintainer: Pengutronix */ | 677 | /* Maintainer: Pengutronix */ |
678 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 678 | .boot_params = MX3x_PHYS_OFFSET + 0x100, |
679 | .map_io = mx31_map_io, | 679 | .map_io = mx31_map_io, |
680 | .init_irq = mx31_init_irq, | 680 | .init_early = imx31_init_early, |
681 | .init_machine = mxc_board_init, | 681 | .init_irq = mx31_init_irq, |
682 | .timer = &pcm037_timer, | 682 | .timer = &pcm037_timer, |
683 | .init_machine = mxc_board_init, | ||
683 | MACHINE_END | 684 | MACHINE_END |