diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-16 16:16:34 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-16 16:16:34 +0100 |
commit | 32dc496b47eb31f7a1d115a2708e8ef1d054e1fb (patch) | |
tree | b0ae57b9b55a0277395934ea75de00f8f54d227a /arch/arm/mach-mx3/qong.c | |
parent | 8cd50e8e2b416c7f07b267ab3457c6c25a540ba9 (diff) | |
parent | c5ab660db9a98187667d017bb9425f0c1dc76ac1 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/qong.c')
-rw-r--r-- | arch/arm/mach-mx3/qong.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/mach-mx3/qong.c b/arch/arm/mach-mx3/qong.c index 6c4283cec6f..5a01e48fd8f 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, |