瀏覽代碼

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>
Alberto Panizzo 16 年之前
父節點
當前提交
4e0f088106
共有 1 個文件被更改,包括 1 次插入15 次删除
  1. 1 15
      arch/arm/mach-mx3/armadillo5x0.c

+ 1 - 15
arch/arm/mach-mx3/armadillo5x0.c

@@ -274,20 +274,6 @@ static void __init armadillo5x0_init(void)
 	mxc_register_device(&mx3_fb, &mx3fb_pdata);
 	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)
 static void __init armadillo5x0_timer_init(void)
 {
 {
 	mx31_clocks_init(26000000);
 	mx31_clocks_init(26000000);
@@ -302,7 +288,7 @@ MACHINE_START(ARMADILLO5X0, "Armadillo-500")
 	.phys_io	= AIPS1_BASE_ADDR,
 	.phys_io	= AIPS1_BASE_ADDR,
 	.io_pg_offst	= ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.io_pg_offst	= ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.boot_params	= PHYS_OFFSET + 0x00000100,
 	.boot_params	= PHYS_OFFSET + 0x00000100,
-	.map_io		= armadillo5x0_map_io,
+	.map_io		= mx31_map_io,
 	.init_irq	= mxc_init_irq,
 	.init_irq	= mxc_init_irq,
 	.timer		= &armadillo5x0_timer,
 	.timer		= &armadillo5x0_timer,
 	.init_machine	= armadillo5x0_init,
 	.init_machine	= armadillo5x0_init,