summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-flexibity.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD2011-04-28 14:19:32 +0200
committerJean-Christophe PLAGNIOL-VILLARD2011-05-25 17:04:34 +0200
commit1b021a3b23a40be89c4f3fbe6f4696aa15141f26 (patch)
tree09267f2ba276d7e648fd802f10af6b67ea57dc8a /arch/arm/mach-at91/board-flexibity.c
parentat91/board-eco920: remove at91_beeper ressource as no driver at91_beeper exist (diff)
downloadkernel-qcow2-linux-1b021a3b23a40be89c4f3fbe6f4696aa15141f26.tar.gz
kernel-qcow2-linux-1b021a3b23a40be89c4f3fbe6f4696aa15141f26.tar.xz
kernel-qcow2-linux-1b021a3b23a40be89c4f3fbe6f4696aa15141f26.zip
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-flexibity.c')
-rw-r--r--arch/arm/mach-at91/board-flexibity.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c
index c8a62dc8fa65..934542f624b6 100644
--- a/arch/arm/mach-at91/board-flexibity.c
+++ b/arch/arm/mach-at91/board-flexibity.c
@@ -37,7 +37,7 @@
#include "generic.h"
-static void __init flexibity_map_io(void)
+static void __init flexibity_init_early(void)
{
/* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000);
@@ -156,7 +156,8 @@ MACHINE_START(FLEXIBITY, "Flexibity Connect")
/* Maintainer: Maxim Osipov */
.boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer,
- .map_io = flexibity_map_io,
+ .map_io = at91sam9260_map_io,
+ .init_early = flexibity_init_early,
.init_irq = flexibity_init_irq,
.init_machine = flexibity_board_init,
MACHINE_END