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-sam9260ek.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-sam9260ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index fdfa144cbe76..b1a358492d88 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #include "generic.h" | 50 | #include "generic.h" |
51 | 51 | ||
52 | 52 | ||
53 | static void __init ek_map_io(void) | 53 | static void __init ek_init_early(void) |
54 | { | 54 | { |
55 | /* Initialize processor: 18.432 MHz crystal */ | 55 | /* Initialize processor: 18.432 MHz crystal */ |
56 | at91sam9260_initialize(18432000); | 56 | at91sam9260_initialize(18432000); |
@@ -355,7 +355,8 @@ MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") | |||
355 | /* Maintainer: Atmel */ | 355 | /* Maintainer: Atmel */ |
356 | .boot_params = AT91_SDRAM_BASE + 0x100, | 356 | .boot_params = AT91_SDRAM_BASE + 0x100, |
357 | .timer = &at91sam926x_timer, | 357 | .timer = &at91sam926x_timer, |
358 | .map_io = ek_map_io, | 358 | .map_io = at91sam9260_map_io, |
359 | .init_early = ek_init_early, | ||
359 | .init_irq = ek_init_irq, | 360 | .init_irq = ek_init_irq, |
360 | .init_machine = ek_board_init, | 361 | .init_machine = ek_board_init, |
361 | MACHINE_END | 362 | MACHINE_END |