diff options
author | Ilya Yanok <yanok@emcraft.com> | 2009-03-14 14:51:59 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-16 06:57:15 -0400 |
commit | 248ca85f0135dcb03bc054cd172453b36aad6571 (patch) | |
tree | dddc4cb2c7dd8c87ba118abe26b4bba79d2381c9 /arch | |
parent | 9070e7afb80473c2b5c932152391b52e1e89c637 (diff) |
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.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 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) | |||
251 | } | 251 | } |
252 | 252 | ||
253 | /* | 253 | /* |
254 | * This structure defines the MX31 memory map. | ||
255 | */ | ||
256 | static struct map_desc qong_io_desc[] __initdata = { | ||
257 | { | ||
258 | .virtual = AIPS1_BASE_ADDR_VIRT, | ||
259 | .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), | ||
260 | .length = AIPS1_SIZE, | ||
261 | .type = MT_DEVICE_NONSHARED | ||
262 | }, { | ||
263 | .virtual = AIPS2_BASE_ADDR_VIRT, | ||
264 | .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), | ||
265 | .length = AIPS2_SIZE, | ||
266 | .type = MT_DEVICE_NONSHARED | ||
267 | } | ||
268 | }; | ||
269 | |||
270 | /* | ||
271 | * Set up static virtual mappings. | ||
272 | */ | ||
273 | static void __init qong_map_io(void) | ||
274 | { | ||
275 | mxc_map_io(); | ||
276 | iotable_init(qong_io_desc, ARRAY_SIZE(qong_io_desc)); | ||
277 | } | ||
278 | |||
279 | /* | ||
280 | * Board specific initialization. | 254 | * Board specific initialization. |
281 | */ | 255 | */ |
282 | static void __init mxc_board_init(void) | 256 | static void __init mxc_board_init(void) |
@@ -305,7 +279,7 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE") | |||
305 | .phys_io = AIPS1_BASE_ADDR, | 279 | .phys_io = AIPS1_BASE_ADDR, |
306 | .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, | 280 | .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, |
307 | .boot_params = PHYS_OFFSET + 0x100, | 281 | .boot_params = PHYS_OFFSET + 0x100, |
308 | .map_io = qong_map_io, | 282 | .map_io = mxc_map_io, |
309 | .init_irq = mxc_init_irq, | 283 | .init_irq = mxc_init_irq, |
310 | .init_machine = mxc_board_init, | 284 | .init_machine = mxc_board_init, |
311 | .timer = &qong_timer, | 285 | .timer = &qong_timer, |