1 files changed, 77 insertions, 21 deletions

diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 150519fb38ec..66915282a463 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -30,6 +30,7 @@
 #include <linux/tty.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
+#include <linux/serial_8250.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -132,7 +133,7 @@ void __init ixdp2x01_init_irq(void)
 
 
 /*************************************************************************
- * IXDP2x01 memory map and serial ports
+ * IXDP2x01 memory map
  *************************************************************************/
 static struct map_desc ixdp2x01_io_desc __initdata = {
         .virtual        = IXDP2X01_VIRT_CPLD_BASE, 
@@ -141,40 +142,78 @@ static struct map_desc ixdp2x01_io_desc __initdata = {
         .type           = MT_DEVICE
 };
 
-static struct uart_port ixdp2x01_serial_ports[2] = {
+static void __init ixdp2x01_map_io(void)
+{
+        ixp2000_map_io();
+        iotable_init(&ixdp2x01_io_desc, 1);
+}
+
+
+/*************************************************************************
+ * IXDP2x01 serial ports
+ *************************************************************************/
+static struct plat_serial8250_port ixdp2x01_serial_port1[] = {
         {
-                .membase        = (char *)(IXDP2X01_UART1_VIRT_BASE),
                 .mapbase        = (unsigned long)IXDP2X01_UART1_PHYS_BASE,
+                .membase        = (char *)IXDP2X01_UART1_VIRT_BASE,
                 .irq            = IRQ_IXDP2X01_UART1,
-                .flags          = UPF_SKIP_TEST,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
                 .iotype         = UPIO_MEM32,
                 .regshift       = 2,
                 .uartclk        = IXDP2X01_UART_CLK,
-                .line           = 1,
-                .type           = PORT_16550A,
-                .fifosize       = 16
-        }, {
-                .membase        = (char *)(IXDP2X01_UART2_VIRT_BASE),
+        },
+        { }
+};
+
+static struct resource ixdp2x01_uart_resource1 = {
+        .start          = IXDP2X01_UART1_PHYS_BASE,
+        .end            = IXDP2X01_UART1_PHYS_BASE + 0xffff,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device ixdp2x01_serial_device1 = {
+        .name           = "serial8250",
+        .id             = PLAT8250_DEV_PLATFORM1,
+        .dev            = {
+                .platform_data          = ixdp2x01_serial_port1,
+        },
+        .num_resources  = 1,
+        .resource       = &ixdp2x01_uart_resource1,
+};
+
+static struct plat_serial8250_port ixdp2x01_serial_port2[] = {
+        {
                 .mapbase        = (unsigned long)IXDP2X01_UART2_PHYS_BASE,
+                .membase        = (char *)IXDP2X01_UART2_VIRT_BASE,
                 .irq            = IRQ_IXDP2X01_UART2,
-                .flags          = UPF_SKIP_TEST,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
                 .iotype         = UPIO_MEM32,
                 .regshift       = 2,
                 .uartclk        = IXDP2X01_UART_CLK,
-                .line           = 2,
-                .type           = PORT_16550A,
-                .fifosize       = 16
         }, 
+        { }
 };
 
-static void __init ixdp2x01_map_io(void)
-{
-        ixp2000_map_io();       
+static struct resource ixdp2x01_uart_resource2 = {
+        .start          = IXDP2X01_UART2_PHYS_BASE,
+        .end            = IXDP2X01_UART2_PHYS_BASE + 0xffff,
+        .flags          = IORESOURCE_MEM,
+};
 
-        iotable_init(&ixdp2x01_io_desc, 1);
+static struct platform_device ixdp2x01_serial_device2 = {
+        .name           = "serial8250",
+        .id             = PLAT8250_DEV_PLATFORM2,
+        .dev            = {
+                .platform_data          = ixdp2x01_serial_port2,
+        },
+        .num_resources  = 1,
+        .resource       = &ixdp2x01_uart_resource2,
+};
 
-        early_serial_setup(&ixdp2x01_serial_ports[0]);
-        early_serial_setup(&ixdp2x01_serial_ports[1]);
+static void ixdp2x01_uart_init(void)
+{
+        platform_device_register(&ixdp2x01_serial_device1);
+        platform_device_register(&ixdp2x01_serial_device2);
 }
 
 
@@ -284,7 +323,7 @@ static int ixdp2x01_pci_setup(int nr, struct pci_sys_data *sys)
 {
         sys->mem_offset = 0xe0000000;
 
-        if (machine_is_ixdp2801())
+        if (machine_is_ixdp2801() || machine_is_ixdp28x5())
                 sys->mem_offset -= ((*IXP2000_PCI_ADDR_EXT & 0xE000) << 16);
 
         return ixp2000_pci_setup(nr, sys);
@@ -300,7 +339,8 @@ struct hw_pci ixdp2x01_pci __initdata = {
 
 int __init ixdp2x01_pci_init(void)
 {
-        if (machine_is_ixdp2401() || machine_is_ixdp2801())
+        if (machine_is_ixdp2401() || machine_is_ixdp2801() ||\
+                machine_is_ixdp28x5())
                 pci_common_init(&ixdp2x01_pci);
 
         return 0;
@@ -373,6 +413,7 @@ static void __init ixdp2x01_init_machine(void)
 
         platform_add_devices(ixdp2x01_devices, ARRAY_SIZE(ixdp2x01_devices));
         ixp2000_uart_init();
+        ixdp2x01_uart_init();
 }
 
 
@@ -400,6 +441,21 @@ MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
         .timer          = &ixdp2x01_timer,
         .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
+
+/*
+ * IXDP28x5 is basically an IXDP2801 with a different CPU but Intel
+ * changed the machine ID in the bootloader
+ */
+MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform")
+        /* Maintainer: MontaVista Software, Inc. */
+        .phys_io        = IXP2000_UART_PHYS_BASE,
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
+        .timer          = &ixdp2x01_timer,
+        .init_machine   = ixdp2x01_init_machine,
+MACHINE_END
 #endif