diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-28 08:19:32 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-05-25 11:04:34 -0400 |
commit | 1b021a3b23a40be89c4f3fbe6f4696aa15141f26 (patch) | |
tree | 09267f2ba276d7e648fd802f10af6b67ea57dc8a /arch/arm/mach-at91/at91rm9200.c | |
parent | 1cef3e15721dc9e75f9b661270153e1d6f5e0993 (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/at91rm9200.c')
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 2e9ecad97f3d..164a98ed8888 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -270,11 +270,14 @@ static void at91rm9200_reset(void) | |||
270 | /* -------------------------------------------------------------------- | 270 | /* -------------------------------------------------------------------- |
271 | * AT91RM9200 processor initialization | 271 | * AT91RM9200 processor initialization |
272 | * -------------------------------------------------------------------- */ | 272 | * -------------------------------------------------------------------- */ |
273 | void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks) | 273 | void __init at91rm9200_map_io(void) |
274 | { | 274 | { |
275 | /* Map peripherals */ | 275 | /* Map peripherals */ |
276 | iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); | 276 | iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); |
277 | } | ||
277 | 278 | ||
279 | void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks) | ||
280 | { | ||
278 | at91_arch_reset = at91rm9200_reset; | 281 | at91_arch_reset = at91rm9200_reset; |
279 | at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1) | 282 | at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1) |
280 | | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3) | 283 | | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3) |