leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: mx3: use .init_early to initialize cpu type, reset address and iomuxer

Browse Source 
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>
This commit is contained in:
Uwe Kleine-König 2011-02-07 16:35:20 +01:00 committed by Sascha Hauer
parent 3dac219615
commit 97976e223b
15 changed files with 90 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-mx3/mach-armadillo5x0.c
View File

@ -569,9 +569,10 @@ static struct sys_timer armadillo5x0_timer = {
MACHINE_START(ARMADILLO5X0, "Armadillo-500") 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_irq = mx31_init_irq, .init_early = imx31_init_early,
.timer = &armadillo5x0_timer, .init_irq = mx31_init_irq,
.init_machine = armadillo5x0_init, .timer = &armadillo5x0_timer,
.init_machine = armadillo5x0_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-cpuimx35.c
View File

@ -184,9 +184,10 @@ struct sys_timer eukrea_cpuimx35_timer = {
MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35") 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_irq = mx35_init_irq, .init_ext3_fs = imx35_init_early,
.init_machine = mxc_board_init, .init_irq = mx35_init_irq,
.timer = &eukrea_cpuimx35_timer, .timer = &eukrea_cpuimx35_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-kzm_arm11_01.c
View File

@ -274,9 +274,10 @@ static struct sys_timer kzm_timer = {
* initialize __mach_desc_KZM_ARM11_01 data structure. * initialize __mach_desc_KZM_ARM11_01 data structure.
*/ */
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_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = kzm_board_init, .init_irq = mx31_init_irq,
.timer = &kzm_timer, .timer = &kzm_timer,
.init_machine = kzm_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-mx31_3ds.c
View File

@ -373,9 +373,10 @@ static struct sys_timer mx31_3ds_timer = {
*/ */
MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 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_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = mxc_board_init, .init_irq = mx31_init_irq,
.timer = &mx31_3ds_timer, .timer = &mx31_3ds_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-mx31ads.c
View File

@ -550,9 +550,10 @@ static struct sys_timer mx31ads_timer = {
*/ */
MACHINE_START(MX31ADS, "Freescale MX31ADS") 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_irq = mx31ads_init_irq, .init_early = imx31_init_early,
.init_machine = mxc_board_init, .init_irq = mx31ads_init_irq,
.timer = &mx31ads_timer, .timer = &mx31ads_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

12
arch/arm/mach-mx3/mach-mx31lilly.c
View File

@ -347,10 +347,10 @@ static struct sys_timer mx31lilly_timer = {
}; };
MACHINE_START(LILLY1131, "INCO startec LILLY-1131") MACHINE_START(LILLY1131, "INCO startec LILLY-1131")
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx31_map_io, .map_io = mx31_map_io,
.init_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = mx31lilly_board_init, .init_irq = mx31_init_irq,
.timer = &mx31lilly_timer, .timer = &mx31lilly_timer,
.init_machine = mx31lilly_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-mx31lite.c
View File

@ -281,9 +281,10 @@ struct sys_timer mx31lite_timer = {
MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM") MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")
/* Maintainer: Freescale Semiconductor, Inc. */ /* Maintainer: Freescale Semiconductor, Inc. */
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx31lite_map_io, .map_io = mx31lite_map_io,
.init_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = mxc_board_init, .init_irq = mx31_init_irq,
.timer = &mx31lite_timer, .timer = &mx31lite_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

12
arch/arm/mach-mx3/mach-mx31moboard.c
View File

@ -564,10 +564,10 @@ struct sys_timer mx31moboard_timer = {
MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")
/* Maintainer: Valentin Longchamp, EPFL Mobots group */ /* Maintainer: Valentin Longchamp, EPFL Mobots group */
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx31_map_io, .map_io = mx31_map_io,
.init_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = mxc_board_init, .init_irq = mx31_init_irq,
.timer = &mx31moboard_timer, .timer = &mx31moboard_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-mx35_3ds.c
View File

@ -193,9 +193,10 @@ struct sys_timer mx35pdk_timer = {
MACHINE_START(MX35_3DS, "Freescale MX35PDK") MACHINE_START(MX35_3DS, "Freescale MX35PDK")
/* Maintainer: Freescale Semiconductor, Inc */ /* Maintainer: Freescale Semiconductor, Inc */
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx35_map_io, .map_io = mx35_map_io,
.init_irq = mx35_init_irq, .init_early = imx35_init_early,
.init_machine = mxc_board_init, .init_irq = mx35_init_irq,
.timer = &mx35pdk_timer, .timer = &mx35pdk_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-pcm037.c
View File

@ -675,9 +675,10 @@ struct sys_timer pcm037_timer = {
MACHINE_START(PCM037, "Phytec Phycore pcm037") MACHINE_START(PCM037, "Phytec Phycore pcm037")
/* Maintainer: Pengutronix */ /* Maintainer: Pengutronix */
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx31_map_io, .map_io = mx31_map_io,
.init_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = mxc_board_init, .init_irq = mx31_init_irq,
.timer = &pcm037_timer, .timer = &pcm037_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

12
arch/arm/mach-mx3/mach-pcm043.c
View File

@ -403,10 +403,10 @@ struct sys_timer pcm043_timer = {
MACHINE_START(PCM043, "Phytec Phycore pcm043") MACHINE_START(PCM043, "Phytec Phycore pcm043")
/* Maintainer: Pengutronix */ /* Maintainer: Pengutronix */
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx35_map_io, .map_io = mx35_map_io,
.init_irq = mx35_init_irq, .init_early = imx35_init_early,
.init_machine = mxc_board_init, .init_irq = mx35_init_irq,
.timer = &pcm043_timer, .timer = &pcm043_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

11
arch/arm/mach-mx3/mach-qong.c
View File

@ -270,9 +270,10 @@ static struct sys_timer qong_timer = {
MACHINE_START(QONG, "Dave/DENX QongEVB-LITE") MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
/* Maintainer: DENX Software Engineering GmbH */ /* Maintainer: DENX Software Engineering GmbH */
.boot_params = MX3x_PHYS_OFFSET + 0x100, .boot_params = MX3x_PHYS_OFFSET + 0x100,
.map_io = mx31_map_io, .map_io = mx31_map_io,
.init_irq = mx31_init_irq, .init_early = imx31_init_early,
.init_machine = mxc_board_init, .init_irq = mx31_init_irq,
.timer = &qong_timer, .timer = &qong_timer,
.init_machine = mxc_board_init,
MACHINE_END MACHINE_END

9
arch/arm/mach-mx3/mach-vpr200.c
View File

@ -320,8 +320,9 @@ struct sys_timer vpr200_timer = {
MACHINE_START(VPR200, "VPR200") MACHINE_START(VPR200, "VPR200")
/* Maintainer: Creative Product Design */ /* Maintainer: Creative Product Design */
.map_io = mx35_map_io, .map_io = mx35_map_io,
.init_irq = mx35_init_irq, .init_early = imx35_init_early,
.init_machine = vpr200_board_init, .init_irq = mx35_init_irq,
.timer = &vpr200_timer, .timer = &vpr200_timer,
.init_machine = vpr200_board_init,
MACHINE_END MACHINE_END

14
arch/arm/mach-mx3/mm.c
View File

@ -51,11 +51,14 @@ static struct map_desc mx31_io_desc[] __initdata = {
* for the IO modules. * for the IO modules.
*/ */
void __init mx31_map_io(void) void __init mx31_map_io(void)
{
iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
}
void __init imx31_init_early(void)
{ {
mxc_set_cpu_type(MXC_CPU_MX31); mxc_set_cpu_type(MXC_CPU_MX31);
mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
} }
int imx31_register_gpios(void); int imx31_register_gpios(void);
@ -76,12 +79,15 @@ static struct map_desc mx35_io_desc[] __initdata = {
}; };
void __init mx35_map_io(void) void __init mx35_map_io(void)
{
iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
}
void __init imx35_init_early(void)
{ {
mxc_set_cpu_type(MXC_CPU_MX35); mxc_set_cpu_type(MXC_CPU_MX35);
mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
} }
int imx35_register_gpios(void); int imx35_register_gpios(void);

3
arch/arm/plat-mxc/include/mach/common.h
View File

@ -28,6 +28,9 @@ extern void imx1_init_early(void);
extern void imx21_init_early(void); extern void imx21_init_early(void);
extern void imx25_init_early(void); extern void imx25_init_early(void);
extern void imx27_init_early(void); extern void imx27_init_early(void);
extern void imx31_init_early(void);
extern void imx35_init_early(void);
extern void imx50_init_early(void);
extern void mxc_init_irq(void __iomem *); extern void mxc_init_irq(void __iomem *);
extern void tzic_init_irq(void __iomem *); extern void tzic_init_irq(void __iomem *);
extern void mx1_init_irq(void); extern void mx1_init_irq(void);