diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-07 16:35:20 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 14:23:49 +0100 |
| commit | 97976e223be3091a91da103358c3c6cffff7db81 (patch) | |
| tree | 3f658a7775f0049a3365d8d1c94fed0b6fedc903 /arch/arm/mach-mx3/mm.c | |
| parent | 3dac219615b88010601ee52e7b5fd1c32ef789ea (diff) | |
| download | linux-3.10-97976e223be3091a91da103358c3c6cffff7db81.tar.gz linux-3.10-97976e223be3091a91da103358c3c6cffff7db81.tar.bz2 linux-3.10-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/mm.c')
| -rw-r--r-- | arch/arm/mach-mx3/mm.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c index 47118f76024..3387319b096 100644 --- a/arch/arm/mach-mx3/mm.c +++ b/arch/arm/mach-mx3/mm.c @@ -52,10 +52,13 @@ static struct map_desc mx31_io_desc[] __initdata = { */ 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_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); @@ -77,11 +80,14 @@ static struct map_desc mx35_io_desc[] __initdata = { 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_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_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); |