diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-07 10:35:21 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 08:23:49 -0500 |
commit | ab130421269aec9bf83d8ef5b7ceda80e2619599 (patch) | |
tree | 46c0acbead33b9d4bfb4be32d5777ce4afdf7413 /arch/arm/mach-mx5/mm-mx50.c | |
parent | 97976e223be3091a91da103358c3c6cffff7db81 (diff) |
ARM: mx5: 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-mx5/mm-mx50.c')
-rw-r--r-- | arch/arm/mach-mx5/mm-mx50.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/mm-mx50.c b/arch/arm/mach-mx5/mm-mx50.c index 8c6540e58390..69b34269dae5 100644 --- a/arch/arm/mach-mx5/mm-mx50.c +++ b/arch/arm/mach-mx5/mm-mx50.c | |||
@@ -44,10 +44,14 @@ static struct map_desc mx50_io_desc[] __initdata = { | |||
44 | */ | 44 | */ |
45 | void __init mx50_map_io(void) | 45 | void __init mx50_map_io(void) |
46 | { | 46 | { |
47 | iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc)); | ||
48 | } | ||
49 | |||
50 | void __init imx50_init_early(void) | ||
51 | { | ||
47 | mxc_set_cpu_type(MXC_CPU_MX50); | 52 | mxc_set_cpu_type(MXC_CPU_MX50); |
48 | mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR)); | 53 | mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR)); |
49 | mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR)); | 54 | mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR)); |
50 | iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc)); | ||
51 | } | 55 | } |
52 | 56 | ||
53 | int imx50_register_gpios(void); | 57 | int imx50_register_gpios(void); |