Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97976e22 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 3dac2196

arch/arm/mach-mx3/mach-armadillo5x0.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -571,6 +571,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500") 
	/* Maintainer: Alberto Panizzo  */

	/* Maintainer: Alberto Panizzo  */

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.map_io = mx31_map_io,

	.map_io = mx31_map_io,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.init_irq = mx31_init_irq,

	.timer = &armadillo5x0_timer,

	.timer = &armadillo5x0_timer,

	.init_machine = armadillo5x0_init,

	.init_machine = armadillo5x0_init,

arch/arm/mach-mx3/mach-cpuimx35.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -186,7 +186,8 @@ MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35") 
	/* Maintainer: Eukrea Electromatique */

	/* Maintainer: Eukrea Electromatique */

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.map_io = mx35_map_io,

	.map_io = mx35_map_io,

	.init_ext3_fs = imx35_init_early,

	.init_irq = mx35_init_irq,

	.init_irq = mx35_init_irq,

	.init_machine   = mxc_board_init,

	.timer = &eukrea_cpuimx35_timer,

	.timer = &eukrea_cpuimx35_timer,

	.init_machine = mxc_board_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mx3/mach-kzm_arm11_01.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -276,7 +276,8 @@ static struct sys_timer kzm_timer = { 
MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")

MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.map_io = kzm_map_io,

	.map_io = kzm_map_io,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.init_irq = mx31_init_irq,

	.init_machine   = kzm_board_init,

	.timer = &kzm_timer,

	.timer = &kzm_timer,

	.init_machine = kzm_board_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mx3/mach-mx31_3ds.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -375,7 +375,8 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 
	/* Maintainer: Freescale Semiconductor, Inc. */

	/* Maintainer: Freescale Semiconductor, Inc. */

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.map_io = mx31_map_io,

	.map_io = mx31_map_io,

	.init_early = imx31_init_early,

	.init_irq = mx31_init_irq,

	.init_irq = mx31_init_irq,

	.init_machine   = mxc_board_init,

	.timer = &mx31_3ds_timer,

	.timer = &mx31_3ds_timer,

	.init_machine = mxc_board_init,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mx3/mach-mx31ads.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -552,7 +552,8 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS") 
	/* Maintainer: Freescale Semiconductor, Inc. */

	/* Maintainer: Freescale Semiconductor, Inc. */

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.boot_params = MX3x_PHYS_OFFSET + 0x100,

	.map_io = mx31ads_map_io,

	.map_io = mx31ads_map_io,

	.init_early = imx31_init_early,

	.init_irq = mx31ads_init_irq,

	.init_irq = mx31ads_init_irq,

	.init_machine   = mxc_board_init,

	.timer = &mx31ads_timer,

	.timer = &mx31ads_timer,

	.init_machine = mxc_board_init,

MACHINE_END
 
MACHINE_END