diff options
| author | Alberto Panizzo <maramaopercheseimorto@gmail.com> | 2009-05-25 22:35:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-26 12:34:11 +0200 |
| commit | 4e0f088106c28d0ed8e827338b42404d236deda0 (patch) | |
| tree | 0526aeb38f10a884fe42cc5312e8fb0eb159b719 /arch/arm/mach-mx3 | |
| parent | 4193d2d2d7c8307803d035932d5e33d848a96951 (diff) | |
| download | talos-obmc-linux-4e0f088106c28d0ed8e827338b42404d236deda0.tar.gz talos-obmc-linux-4e0f088106c28d0ed8e827338b42404d236deda0.zip | |
ARM MXC: Atmark Armadillo 500 board support.
On Mon, 25 May 2009 18:33:28 +0200
Valentin Longchamp <valentin.longchamp@epfl.ch> wrote:
> Hello,
>
> I have updated my mxc git tree and given a compilation spin to your
> board support and I have comments. See below.
>
>
> What's the point of declaring this new function, if all it does is
> calling the already existing one ? Furthermore, in the current
> mxc-master tree, mxc_map_io() does not exist anymore, it should be
> mx31_map_io (this breaks compilation for your board).
>
This patch solve those two issues. Until now i based my patches to
vanilla tree. This evening I cloned the mxc-master tree so i could
update the armadillo 500 support within recent platform changes.
The patch:
From e986a8dc262e5292350d95bf65ead75baf3272d7 Mon Sep 17 00:00:00 2001
From: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Date: Mon, 25 May 2009 22:24:03 +0200
Subject: [PATCH] Armadillo 500 removing useless function armadillo5x0_map_io
and use machine specific io mapping
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/armadillo5x0.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-mx3/armadillo5x0.c b/arch/arm/mach-mx3/armadillo5x0.c index cac4538e20eb..541181090b37 100644 --- a/arch/arm/mach-mx3/armadillo5x0.c +++ b/arch/arm/mach-mx3/armadillo5x0.c @@ -274,20 +274,6 @@ static void __init armadillo5x0_init(void) mxc_register_device(&mx3_fb, &mx3fb_pdata); } -/* - * Set up static virtual mappings. - */ -static void __init armadillo5x0_map_io(void) -{ - /* - * Maps: - * - NAND, SDRAM, WEIM, M3IF, EMI controllers - * - AVIC (Vectored Interrupt controller) - * - AIPS1 and AIPS2 - **/ - mxc_map_io(); -} - static void __init armadillo5x0_timer_init(void) { mx31_clocks_init(26000000); @@ -302,7 +288,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500") .phys_io = AIPS1_BASE_ADDR, .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, .boot_params = PHYS_OFFSET + 0x00000100, - .map_io = armadillo5x0_map_io, + .map_io = mx31_map_io, .init_irq = mxc_init_irq, .timer = &armadillo5x0_timer, .init_machine = armadillo5x0_init, |
