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-cpu9krea.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-cpu9krea.c')
-rw-r--r-- | arch/arm/mach-at91/board-cpu9krea.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 3838594578f3..34fd892edff4 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "sam9_smc.h" | 47 | #include "sam9_smc.h" |
48 | #include "generic.h" | 48 | #include "generic.h" |
49 | 49 | ||
50 | static void __init cpu9krea_map_io(void) | 50 | static void __init cpu9krea_init_early(void) |
51 | { | 51 | { |
52 | /* Initialize processor: 18.432 MHz crystal */ | 52 | /* Initialize processor: 18.432 MHz crystal */ |
53 | at91sam9260_initialize(18432000); | 53 | at91sam9260_initialize(18432000); |
@@ -377,7 +377,8 @@ MACHINE_START(CPUAT9G20, "Eukrea CPU9G20") | |||
377 | /* Maintainer: Eric Benard - EUKREA Electromatique */ | 377 | /* Maintainer: Eric Benard - EUKREA Electromatique */ |
378 | .boot_params = AT91_SDRAM_BASE + 0x100, | 378 | .boot_params = AT91_SDRAM_BASE + 0x100, |
379 | .timer = &at91sam926x_timer, | 379 | .timer = &at91sam926x_timer, |
380 | .map_io = cpu9krea_map_io, | 380 | .map_io = at91sam9260_map_io, |
381 | .init_early = cpu9krea_init_early, | ||
381 | .init_irq = cpu9krea_init_irq, | 382 | .init_irq = cpu9krea_init_irq, |
382 | .init_machine = cpu9krea_board_init, | 383 | .init_machine = cpu9krea_board_init, |
383 | MACHINE_END | 384 | MACHINE_END |