diff options
Diffstat (limited to 'arch/arm/mach-mx3/armadillo5x0.c')
-rw-r--r-- | arch/arm/mach-mx3/armadillo5x0.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-mx3/armadillo5x0.c b/arch/arm/mach-mx3/armadillo5x0.c index cac4538e20eb..541181090b37 100644 --- a/arch/arm/mach-mx3/armadillo5x0.c +++ b/arch/arm/mach-mx3/armadillo5x0.c | |||
@@ -274,20 +274,6 @@ static void __init armadillo5x0_init(void) | |||
274 | mxc_register_device(&mx3_fb, &mx3fb_pdata); | 274 | mxc_register_device(&mx3_fb, &mx3fb_pdata); |
275 | } | 275 | } |
276 | 276 | ||
277 | /* | ||
278 | * Set up static virtual mappings. | ||
279 | */ | ||
280 | static void __init armadillo5x0_map_io(void) | ||
281 | { | ||
282 | /* | ||
283 | * Maps: | ||
284 | * - NAND, SDRAM, WEIM, M3IF, EMI controllers | ||
285 | * - AVIC (Vectored Interrupt controller) | ||
286 | * - AIPS1 and AIPS2 | ||
287 | **/ | ||
288 | mxc_map_io(); | ||
289 | } | ||
290 | |||
291 | static void __init armadillo5x0_timer_init(void) | 277 | static void __init armadillo5x0_timer_init(void) |
292 | { | 278 | { |
293 | mx31_clocks_init(26000000); | 279 | mx31_clocks_init(26000000); |
@@ -302,7 +288,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500") | |||
302 | .phys_io = AIPS1_BASE_ADDR, | 288 | .phys_io = AIPS1_BASE_ADDR, |
303 | .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, | 289 | .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, |
304 | .boot_params = PHYS_OFFSET + 0x00000100, | 290 | .boot_params = PHYS_OFFSET + 0x00000100, |
305 | .map_io = armadillo5x0_map_io, | 291 | .map_io = mx31_map_io, |
306 | .init_irq = mxc_init_irq, | 292 | .init_irq = mxc_init_irq, |
307 | .timer = &armadillo5x0_timer, | 293 | .timer = &armadillo5x0_timer, |
308 | .init_machine = armadillo5x0_init, | 294 | .init_machine = armadillo5x0_init, |