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/board-cpuat91.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/board-cpuat91.c')
-rw-r--r-- | arch/arm/mach-at91/board-cpuat91.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index 2f4dd8cdd484..34c9d0c75e42 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c | |||
@@ -50,7 +50,7 @@ static struct gpio_led cpuat91_leds[] = { | |||
50 | }, | 50 | }, |
51 | }; | 51 | }; |
52 | 52 | ||
53 | static void __init cpuat91_map_io(void) | 53 | static void __init cpuat91_init_early(void) |
54 | { | 54 | { |
55 | /* Initialize processor: 18.432 MHz crystal */ | 55 | /* Initialize processor: 18.432 MHz crystal */ |
56 | at91rm9200_initialize(18432000, AT91RM9200_PQFP); | 56 | at91rm9200_initialize(18432000, AT91RM9200_PQFP); |
@@ -177,7 +177,8 @@ MACHINE_START(CPUAT91, "Eukrea") | |||
177 | /* Maintainer: Eric Benard - EUKREA Electromatique */ | 177 | /* Maintainer: Eric Benard - EUKREA Electromatique */ |
178 | .boot_params = AT91_SDRAM_BASE + 0x100, | 178 | .boot_params = AT91_SDRAM_BASE + 0x100, |
179 | .timer = &at91rm9200_timer, | 179 | .timer = &at91rm9200_timer, |
180 | .map_io = cpuat91_map_io, | 180 | .map_io = at91rm9200_map_io, |
181 | .init_early = cpuat91_init_early, | ||
181 | .init_irq = cpuat91_init_irq, | 182 | .init_irq = cpuat91_init_irq, |
182 | .init_machine = cpuat91_board_init, | 183 | .init_machine = cpuat91_board_init, |
183 | MACHINE_END | 184 | MACHINE_END |