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-cam60.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-cam60.c')
-rw-r--r-- | arch/arm/mach-at91/board-cam60.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index b54e3e6fceb6..3025b905bc30 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include "generic.h" | 45 | #include "generic.h" |
46 | 46 | ||
47 | 47 | ||
48 | static void __init cam60_map_io(void) | 48 | static void __init cam60_init_early(void) |
49 | { | 49 | { |
50 | /* Initialize processor: 10 MHz crystal */ | 50 | /* Initialize processor: 10 MHz crystal */ |
51 | at91sam9260_initialize(10000000); | 51 | at91sam9260_initialize(10000000); |
@@ -200,7 +200,8 @@ MACHINE_START(CAM60, "KwikByte CAM60") | |||
200 | /* Maintainer: KwikByte */ | 200 | /* Maintainer: KwikByte */ |
201 | .boot_params = AT91_SDRAM_BASE + 0x100, | 201 | .boot_params = AT91_SDRAM_BASE + 0x100, |
202 | .timer = &at91sam926x_timer, | 202 | .timer = &at91sam926x_timer, |
203 | .map_io = cam60_map_io, | 203 | .map_io = at91sam9260_map_io, |
204 | .init_early = cam60_init_early, | ||
204 | .init_irq = cam60_init_irq, | 205 | .init_irq = cam60_init_irq, |
205 | .init_machine = cam60_board_init, | 206 | .init_machine = cam60_board_init, |
206 | MACHINE_END | 207 | MACHINE_END |