3 files changed, 4 insertions, 24 deletions
diff --git a/arch/arm/mach-iop32x/iq31244-mm.c b/arch/arm/mach-iop32x/iq31244-mm.c
index ffc6692c95a..fba22d5d908 100644
--- a/arch/arm/mach-iop32x/iq31244-mm.c
+++ b/arch/arm/mach-iop32x/iq31244-mm.c
@@ -21,6 +21,7 @@
 #include <asm/page.h>
 
 #include <asm/mach/map.h>
+#include <asm/hardware/iop3xx.h>
 
 
 /*
@@ -39,7 +40,7 @@ static struct map_desc iq31244_io_desc[] __initdata = {
 
 void __init iq31244_map_io(void)
 {
-	iop321_map_io();
+	iop3xx_map_io();
 
 	iotable_init(iq31244_io_desc, ARRAY_SIZE(iq31244_io_desc));
 }
diff --git a/arch/arm/mach-iop32x/iq80321-mm.c b/arch/arm/mach-iop32x/iq80321-mm.c
index 5f702a7ff62..b6a3079ad29 100644
--- a/arch/arm/mach-iop32x/iq80321-mm.c
+++ b/arch/arm/mach-iop32x/iq80321-mm.c
@@ -21,6 +21,7 @@
 #include <asm/page.h>
 
 #include <asm/mach/map.h>
+#include <asm/hardware/iop3xx.h>
 
 
 /*
@@ -39,7 +40,7 @@ static struct map_desc iq80321_io_desc[] __initdata = {
 
 void __init iq80321_map_io(void)
 {
-	iop321_map_io();
+	iop3xx_map_io();
 
 	iotable_init(iq80321_io_desc, ARRAY_SIZE(iq80321_io_desc));
 }
diff --git a/arch/arm/mach-iop32x/setup.c b/arch/arm/mach-iop32x/setup.c
index 72967879927..48d806474f4 100644
--- a/arch/arm/mach-iop32x/setup.c
+++ b/arch/arm/mach-iop32x/setup.c
@@ -32,23 +32,6 @@
 
 #define IOP321_UART_XTAL 1843200
 
-/*
- * Standard IO mapping for all IOP321 based systems
- */
-static struct map_desc iop321_std_desc[] __initdata = {
-	 {	/* mem mapped registers */
-		.virtual	= IOP321_VIRT_MEM_BASE,
-		.pfn		= __phys_to_pfn(IOP321_PHYS_MEM_BASE),
-		.length		= 0x00002000,
-		.type		= MT_DEVICE
-	 }, {	/* PCI IO space */
-		.virtual	= IOP321_PCI_LOWER_IO_VA,
-		.pfn		= __phys_to_pfn(IOP321_PCI_LOWER_IO_PA),
-		.length		= IOP321_PCI_IO_WINDOW_SIZE,
-		.type		= MT_DEVICE
-	 }
-};
-
 #ifdef CONFIG_ARCH_IQ80321
 #define UARTBASE IQ80321_UART
 #define IRQ_UART IRQ_IQ80321_UART
@@ -126,11 +109,6 @@ void __init iop32x_init(void)
 		platform_add_devices(iop32x_devices,
 				ARRAY_SIZE(iop32x_devices));
 	}
-}
-
-void __init iop321_map_io(void)
-{
-	iotable_init(iop321_std_desc, ARRAY_SIZE(iop321_std_desc));
 	early_serial_setup(&iop321_serial_ports[0]);
 }