Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/

[sfrench/cifs-2.6.git] / arch / arm / mach-ixp2000 / enp2611.c

diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index 9aa54de447407d615211860f693fe6a6879f2f28..61f6006241bd9d3ba3548de387cdf531e23e80f3 100644 (file)
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -32,7 +32,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -63,6 +63,35 @@ static struct sys_timer enp2611_timer = {
 };
 
 
+/*************************************************************************
+ * ENP-2611 I/O
+ *************************************************************************/
+static struct map_desc enp2611_io_desc[] __initdata = {
+       {
+               .virtual        = ENP2611_CALEB_VIRT_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_CALEB_PHYS_BASE),
+               .length         = ENP2611_CALEB_SIZE,
+               .type           = MT_IXP2000_DEVICE,
+       }, {
+               .virtual        = ENP2611_PM3386_0_VIRT_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE),
+               .length         = ENP2611_PM3386_0_SIZE,
+               .type           = MT_IXP2000_DEVICE,
+       }, {
+               .virtual        = ENP2611_PM3386_1_VIRT_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE),
+               .length         = ENP2611_PM3386_1_SIZE,
+               .type           = MT_IXP2000_DEVICE,
+       }
+};
+
+void __init enp2611_map_io(void)
+{
+       ixp2000_map_io();
+       iotable_init(enp2611_io_desc, ARRAY_SIZE(enp2611_io_desc));
+}
+
+
 /*************************************************************************
  * ENP-2611 PCI
  *************************************************************************/
@@ -229,7 +258,7 @@ MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
        .phys_io        = IXP2000_UART_PHYS_BASE,
        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
        .boot_params    = 0x00000100,
-       .map_io         = ixp2000_map_io,
+       .map_io         = enp2611_map_io,
        .init_irq       = ixp2000_init_irq,
        .timer          = &enp2611_timer,
        .init_machine   = enp2611_init_machine,