diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-07 10:35:19 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 08:23:48 -0500 |
| commit | 3dac219615b88010601ee52e7b5fd1c32ef789ea (patch) | |
| tree | e2be4a211f7fe7df748e90a30d84b432895fc4c7 /arch/arm/mach-imx/mach-mx1ads.c | |
| parent | 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 (diff) | |
ARM: imx: use .init_early to initialize cpu type and reset address
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-imx/mach-mx1ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx1ads.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c index 1f446e5eb636..47cf56ac6d5b 100644 --- a/arch/arm/mach-imx/mach-mx1ads.c +++ b/arch/arm/mach-imx/mach-mx1ads.c | |||
| @@ -144,17 +144,19 @@ struct sys_timer mx1ads_timer = { | |||
| 144 | 144 | ||
| 145 | MACHINE_START(MX1ADS, "Freescale MX1ADS") | 145 | MACHINE_START(MX1ADS, "Freescale MX1ADS") |
| 146 | /* Maintainer: Sascha Hauer, Pengutronix */ | 146 | /* Maintainer: Sascha Hauer, Pengutronix */ |
| 147 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 147 | .boot_params = MX1_PHYS_OFFSET + 0x100, |
| 148 | .map_io = mx1_map_io, | 148 | .map_io = mx1_map_io, |
| 149 | .init_irq = mx1_init_irq, | 149 | .init_early = imx1_init_early, |
| 150 | .timer = &mx1ads_timer, | 150 | .init_irq = mx1_init_irq, |
| 151 | .init_machine = mx1ads_init, | 151 | .timer = &mx1ads_timer, |
| 152 | .init_machine = mx1ads_init, | ||
| 152 | MACHINE_END | 153 | MACHINE_END |
| 153 | 154 | ||
| 154 | MACHINE_START(MXLADS, "Freescale MXLADS") | 155 | MACHINE_START(MXLADS, "Freescale MXLADS") |
| 155 | .boot_params = MX1_PHYS_OFFSET + 0x100, | 156 | .boot_params = MX1_PHYS_OFFSET + 0x100, |
| 156 | .map_io = mx1_map_io, | 157 | .map_io = mx1_map_io, |
| 157 | .init_irq = mx1_init_irq, | 158 | .init_early = imx1_init_early, |
| 158 | .timer = &mx1ads_timer, | 159 | .init_irq = mx1_init_irq, |
| 159 | .init_machine = mx1ads_init, | 160 | .timer = &mx1ads_timer, |
| 161 | .init_machine = mx1ads_init, | ||
| 160 | MACHINE_END | 162 | MACHINE_END |