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-usb-a9260.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-usb-a9260.c')
-rw-r--r-- | arch/arm/mach-at91/board-usb-a9260.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c index 07784baeae84..a0c17d5a6477 100644 --- a/arch/arm/mach-at91/board-usb-a9260.c +++ b/arch/arm/mach-at91/board-usb-a9260.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include "generic.h" | 48 | #include "generic.h" |
49 | 49 | ||
50 | 50 | ||
51 | static void __init ek_map_io(void) | 51 | static void __init ek_init_early(void) |
52 | { | 52 | { |
53 | /* Initialize processor: 12.000 MHz crystal */ | 53 | /* Initialize processor: 12.000 MHz crystal */ |
54 | at91sam9260_initialize(12000000); | 54 | at91sam9260_initialize(12000000); |
@@ -230,7 +230,8 @@ MACHINE_START(USB_A9260, "CALAO USB_A9260") | |||
230 | /* Maintainer: calao-systems */ | 230 | /* Maintainer: calao-systems */ |
231 | .boot_params = AT91_SDRAM_BASE + 0x100, | 231 | .boot_params = AT91_SDRAM_BASE + 0x100, |
232 | .timer = &at91sam926x_timer, | 232 | .timer = &at91sam926x_timer, |
233 | .map_io = ek_map_io, | 233 | .map_io = at91sam9260_map_io, |
234 | .init_early = ek_init_early, | ||
234 | .init_irq = ek_init_irq, | 235 | .init_irq = ek_init_irq, |
235 | .init_machine = ek_board_init, | 236 | .init_machine = ek_board_init, |
236 | MACHINE_END | 237 | MACHINE_END |