Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion
  [SERIAL] amba-pl010: Remove accessor macros
  [SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI)
  [SERIAL] icom: select FW_LOADER

6 files changed, 110 insertions, 272 deletions

diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index f9d4968c1d..66915282a4 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);
 }
 
 
@@ -374,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();
 }
 
 
diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
deleted file mode 100644
index 809f89ab96..0000000000
--- a/drivers/serial/8250_acpi.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Matthew Wilcox for Hewlett-Packard
- * Copyright (C) 2004 Hewlett-Packard Co
- *      Bjorn Helgaas <bjorn.helgaas@hp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/acpi.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/serial_core.h>
-
-#include <acpi/acpi_bus.h>
-
-#include <asm/io.h>
-
-#include "8250.h"
-
-struct serial_private {
-        int     line;
-};
-
-static acpi_status acpi_serial_mmio(struct uart_port *port,
-                                    struct acpi_resource_address64 *addr)
-{
-        port->mapbase = addr->minimum;
-        port->iotype = UPIO_MEM;
-        port->flags |= UPF_IOREMAP;
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_port(struct uart_port *port,
-                                    struct acpi_resource_io *io)
-{
-        if (io->address_length) {
-                port->iobase = io->minimum;
-                port->iotype = UPIO_PORT;
-        } else
-                printk(KERN_ERR "%s: zero-length IO port range?\n", __FUNCTION__);
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_ext_irq(struct uart_port *port,
-                                       struct acpi_resource_extended_irq *ext_irq)
-{
-        int rc;
-
-        if (ext_irq->interrupt_count > 0) {
-                rc = acpi_register_gsi(ext_irq->interrupts[0],
-                           ext_irq->triggering, ext_irq->polarity);
-                if (rc < 0)
-                        return AE_ERROR;
-                port->irq = rc;
-        }
-        return AE_OK;
-}
-
-static acpi_status acpi_serial_irq(struct uart_port *port,
-                                   struct acpi_resource_irq *irq)
-{
-        int rc;
-
-        if (irq->interrupt_count > 0) {