summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-kzm_arm11_01.c
diff options
context:
space:
mode:
authorUwe Kleine-König2011-02-07 16:35:20 +0100
committerSascha Hauer2011-02-10 14:23:49 +0100
commit97976e223be3091a91da103358c3c6cffff7db81 (patch)
tree3f658a7775f0049a3365d8d1c94fed0b6fedc903 /arch/arm/mach-mx3/mach-kzm_arm11_01.c
parentARM: imx: use .init_early to initialize cpu type and reset address (diff)
downloadkernel-qcow2-linux-97976e223be3091a91da103358c3c6cffff7db81.tar.gz
kernel-qcow2-linux-97976e223be3091a91da103358c3c6cffff7db81.tar.xz
kernel-qcow2-linux-97976e223be3091a91da103358c3c6cffff7db81.zip
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-kzm_arm11_01.c')
-rw-r--r--arch/arm/mach-mx3/mach-kzm_arm11_01.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
index a5f3eb24e4d5..52b8dd7192c6 100644
--- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
@@ -274,9 +274,10 @@ static struct sys_timer kzm_timer = {
* initialize __mach_desc_KZM_ARM11_01 data structure.
*/
MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
- .boot_params = MX3x_PHYS_OFFSET + 0x100,
- .map_io = kzm_map_io,
- .init_irq = mx31_init_irq,
- .init_machine = kzm_board_init,
- .timer = &kzm_timer,
+ .boot_params = MX3x_PHYS_OFFSET + 0x100,
+ .map_io = kzm_map_io,
+ .init_early = imx31_init_early,
+ .init_irq = mx31_init_irq,
+ .timer = &kzm_timer,
+ .init_machine = kzm_board_init,
MACHINE_END