aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91cap9.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-04-28 08:19:32 -0400
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-05-25 11:04:34 -0400
commit1b021a3b23a40be89c4f3fbe6f4696aa15141f26 (patch)
tree09267f2ba276d7e648fd802f10af6b67ea57dc8a /arch/arm/mach-at91/at91cap9.c
parent1cef3e15721dc9e75f9b661270153e1d6f5e0993 (diff)
at91: fix map_io init usage
switch early init to init_early and introduce soc map_io with this Patch we will not do any more early device setup during the map io tks to Russell to point the new call back Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Patrice Vilchez <patrice.vilchez@atmel.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Andrew Victor <linux@maxim.org.za>
Diffstat (limited to 'arch/arm/mach-at91/at91cap9.c')
-rw-r--r--arch/arm/mach-at91/at91cap9.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index 73376170fb91..69df2bb4a703 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -303,11 +303,14 @@ static void at91cap9_poweroff(void)
303 * AT91CAP9 processor initialization 303 * AT91CAP9 processor initialization
304 * -------------------------------------------------------------------- */ 304 * -------------------------------------------------------------------- */
305 305
306void __init at91cap9_initialize(unsigned long main_clock) 306void __init at91cap9_map_io(void)
307{ 307{
308 /* Map peripherals */ 308 /* Map peripherals */
309 iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc)); 309 iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc));
310}
310 311
312void __init at91cap9_initialize(unsigned long main_clock)
313{
311 at91_arch_reset = at91cap9_reset; 314 at91_arch_reset = at91cap9_reset;
312 pm_power_off = at91cap9_poweroff; 315 pm_power_off = at91cap9_poweroff;
313 at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); 316 at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);