From 389fac4e119afea2c73e342e4b48a799b699e59b Mon Sep 17 00:00:00 2001
From: Ilya Yanok <yanok@emcraft.com>
Date: Sat, 14 Mar 2009 21:51:59 +0300
Subject: [PATCH] --- yaml --- r: 143563 b: refs/heads/master c:
 248ca85f0135dcb03bc054cd172453b36aad6571 h: refs/heads/master i:   143561:
 7e902f7dfd26c94a6e747fd9a87ee369aaa199de   143559:
 97db0d85956c0a1d53605d74e0817da4b9922684 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/arm/mach-mx3/qong.c | 28 +---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index ce4877fad598..fa048181b122 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9070e7afb80473c2b5c932152391b52e1e89c637
+refs/heads/master: 248ca85f0135dcb03bc054cd172453b36aad6571
diff --git a/trunk/arch/arm/mach-mx3/qong.c b/trunk/arch/arm/mach-mx3/qong.c
index 6c4283cec6f4..5a01e48fd8f1 100644
--- a/trunk/arch/arm/mach-mx3/qong.c
+++ b/trunk/arch/arm/mach-mx3/qong.c
@@ -250,32 +250,6 @@ static void __init qong_init_fpga(void)
 	qong_init_dnet();
 }
 
-/*
- * 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.
  */
@@ -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,