summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIlya Yanok <yanok@emcraft.com>2009-03-14 19:51:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-04-16 12:57:15 +0200
commit248ca85f0135dcb03bc054cd172453b36aad6571 (patch)
treedddc4cb2c7dd8c87ba118abe26b4bba79d2381c9 /arch
parentmx31ads: imoux pins should be passed in as unsigned int (diff)
downloadlinux-248ca85f0135dcb03bc054cd172453b36aad6571.tar.xz
linux-248ca85f0135dcb03bc054cd172453b36aad6571.zip
qong: remove AIPS[12] mappings from machine-specific iotable
AIPS[12] are no mapped from generic MX3 code so we don't need to map them from machine-specific map_io function anymore. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx3/qong.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/mach-mx3/qong.c b/arch/arm/mach-mx3/qong.c
index 6c4283cec6f4..5a01e48fd8f1 100644
--- a/arch/arm/mach-mx3/qong.c
+++ b/arch/arm/mach-mx3/qong.c
@@ -251,32 +251,6 @@ static void __init qong_init_fpga(void)
}
/*
- * This structure defines the MX31 memory map.
- */
-static struct map_desc qong_io_desc[] __initdata = {
- {
- .virtual = AIPS1_BASE_ADDR_VIRT,
- .pfn = __phys_to_pfn(AIPS1_BASE_ADDR),
- .length = AIPS1_SIZE,
- .type = MT_DEVICE_NONSHARED
- }, {
- .virtual = AIPS2_BASE_ADDR_VIRT,
- .pfn = __phys_to_pfn(AIPS2_BASE_ADDR),
- .length = AIPS2_SIZE,
- .type = MT_DEVICE_NONSHARED
- }
-};
-
-/*
- * Set up static virtual mappings.
- */
-static void __init qong_map_io(void)
-{
- mxc_map_io();
- iotable_init(qong_io_desc, ARRAY_SIZE(qong_io_desc));
-}
-
-/*
* Board specific initialization.
*/
static void __init mxc_board_init(void)
@@ -305,7 +279,7 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
.phys_io = AIPS1_BASE_ADDR,
.io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
- .map_io = qong_map_io,
+ .map_io = mxc_map_io,
.init_irq = mxc_init_irq,
.init_machine = mxc_board_init,
.timer = &qong_timer,