summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop32x
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-09-18 23:12:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-25 10:25:37 +0100
commit7ae1f7ec525c32db441836ab0ab010b85cb819a2 (patch)
tree25d87bd43198bdc3868c20cf3e8d44e8e343f0e6 /arch/arm/mach-iop32x
parent3f7e5815f4b774270e6506962de37af85aa9c830 (diff)
[ARM] 3818/1: iop3xx: introduce arch/arm/plat-iop for shared iop32x/iop33x code
Introduce the arch/arm/plat-iop directory, for code shared between the iop32x and iop33x, and move the common memory map setup bits there. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop32x')
-rw-r--r--arch/arm/mach-iop32x/iq31244-mm.c3
-rw-r--r--arch/arm/mach-iop32x/iq80321-mm.c3
-rw-r--r--arch/arm/mach-iop32x/setup.c22
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 ffc6692c95ad..fba22d5d908f 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 5f702a7ff622..b6a3079ad29e 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 729678799271..48d806474f40 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]);
}