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-neocore926.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-neocore926.c')
-rw-r--r-- | arch/arm/mach-at91/board-neocore926.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c index fe5f1d47e6e2..004b76da64f5 100644 --- a/arch/arm/mach-at91/board-neocore926.c +++ b/arch/arm/mach-at91/board-neocore926.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #include "generic.h" | 51 | #include "generic.h" |
52 | 52 | ||
53 | 53 | ||
54 | static void __init neocore926_map_io(void) | 54 | static void __init neocore926_init_early(void) |
55 | { | 55 | { |
56 | /* Initialize processor: 20 MHz crystal */ | 56 | /* Initialize processor: 20 MHz crystal */ |
57 | at91sam9263_initialize(20000000); | 57 | at91sam9263_initialize(20000000); |
@@ -389,7 +389,8 @@ MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926") | |||
389 | /* Maintainer: ADENEO */ | 389 | /* Maintainer: ADENEO */ |
390 | .boot_params = AT91_SDRAM_BASE + 0x100, | 390 | .boot_params = AT91_SDRAM_BASE + 0x100, |
391 | .timer = &at91sam926x_timer, | 391 | .timer = &at91sam926x_timer, |
392 | .map_io = neocore926_map_io, | 392 | .map_io = at91sam9263_map_io, |
393 | .init_early = neocore926_init_early, | ||
393 | .init_irq = neocore926_init_irq, | 394 | .init_irq = neocore926_init_irq, |
394 | .init_machine = neocore926_board_init, | 395 | .init_machine = neocore926_board_init, |
395 | MACHINE_END | 396 | MACHINE_END |