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

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Provide Cirrus EP93xx AMBA PL010 serial support.
  [SERIAL] amba-pl010: allow platforms to specify modem control method
  [SERIAL] Remove obsoleted au1x00_uart driver
  [SERIAL] Small time UART configuration fix for AU1100 processor

10 files changed, 190 insertions, 1483 deletions

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 865427bfad..2d892e4daa 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -30,7 +30,9 @@
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/delay.h>
+#include <linux/termios.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -360,6 +362,68 @@ void __init ep93xx_init_irq(void)
 /*************************************************************************
  * EP93xx peripheral handling
  *************************************************************************/
+#define EP93XX_UART_MCR_OFFSET          (0x0100)
+
+static void ep93xx_uart_set_mctrl(struct amba_device *dev,
+                                  void __iomem *base, unsigned int mctrl)
+{
+        unsigned int mcr;
+
+        mcr = 0;
+        if (!(mctrl & TIOCM_RTS))
+                mcr |= 2;
+        if (!(mctrl & TIOCM_DTR))
+                mcr |= 1;
+
+        __raw_writel(mcr, base + EP93XX_UART_MCR_OFFSET);
+}
+
+static struct amba_pl010_data ep93xx_uart_data = {
+        .set_mctrl      = ep93xx_uart_set_mctrl,
+};
+
+static struct amba_device uart1_device = {
+        .dev            = {
+                .bus_id         = "apb:uart1",
+                .platform_data  = &ep93xx_uart_data,
+        },
+        .res            = {
+                .start  = EP93XX_UART1_PHYS_BASE,
+                .end    = EP93XX_UART1_PHYS_BASE + 0x0fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        .irq            = { IRQ_EP93XX_UART1, NO_IRQ },
+        .periphid       = 0x00041010,
+};
+
+static struct amba_device uart2_device = {
+        .dev            = {
+                .bus_id         = "apb:uart2",
+                .platform_data  = &ep93xx_uart_data,
+        },
+        .res            = {
+                .start  = EP93XX_UART2_PHYS_BASE,
+                .end    = EP93XX_UART2_PHYS_BASE + 0x0fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        .irq            = { IRQ_EP93XX_UART2, NO_IRQ },
+        .periphid       = 0x00041010,
+};
+
+static struct amba_device uart3_device = {
+        .dev            = {
+                .bus_id         = "apb:uart3",
+                .platform_data  = &ep93xx_uart_data,
+        },
+        .res            = {
+                .start  = EP93XX_UART3_PHYS_BASE,
+                .end    = EP93XX_UART3_PHYS_BASE + 0x0fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        .irq            = { IRQ_EP93XX_UART3, NO_IRQ },
+        .periphid       = 0x00041010,
+};
+
 void __init ep93xx_init_devices(void)
 {
         unsigned int v;
@@ -371,4 +435,8 @@ void __init ep93xx_init_devices(void)
         v &= ~EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE;
         __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
         __raw_writel(v, EP93XX_SYSCON_DEVICE_CONFIG);
+
+        amba_device_register(&uart1_device, &iomem_resource);
+        amba_device_register(&uart2_device, &iomem_resource);
+        amba_device_register(&uart3_device, &iomem_resource);
 }
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 20071a2767..576a5e979c 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -15,7 +15,9 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
+#include <linux/termios.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
@@ -28,6 +30,8 @@
 
 #include "common.h"
 
+static struct amba_pl010_data integrator_uart_data;
+
 static struct amba_device rtc_device = {
         .dev            = {
                 .bus_id = "mb:15",
@@ -44,6 +48,7 @@ static struct amba_device rtc_device = {
 static struct amba_device uart0_device = {
         .dev            = {
                 .bus_id = "mb:16",
+                .platform_data = &integrator_uart_data,
         },
         .res            = {
                 .start  = INTEGRATOR_UART0_BASE,
@@ -57,6 +62,7 @@ static struct amba_device uart0_device = {
 static struct amba_device uart1_device = {
         .dev            = {
                 .bus_id = "mb:17",
+                .platform_data = &integrator_uart_data,
         },
         .res            = {
                 .start  = INTEGRATOR_UART1_BASE,
@@ -115,6 +121,46 @@ static int __init integrator_init(void)
 
 arch_initcall(integrator_init);
 
+/*
+ * On the Integrator platform, the port RTS and DTR are provided by
+ * bits in the following SC_CTRLS register bits:
+ *        RTS  DTR
+ *  UART0  7    6
+ *  UART1  5    4
+ */
+#define SC_CTRLC        (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLC_OFFSET)
+#define SC_CTRLS        (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLS_OFFSET)
+
+static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl)
+{
+        unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;
+
+        if (dev == &uart0_device) {
+                rts_mask = 1 << 4;
+                dtr_mask = 1 << 5;
+        } else {
+                rts_mask = 1 << 6;
+                dtr_mask = 1 << 7;
+        }
+
+        if (mctrl & TIOCM_RTS)
+                ctrlc |= rts_mask;
+        else
+                ctrls |= rts_mask;
+
+        if (mctrl & TIOCM_DTR)
+                ctrlc |= dtr_mask;
+        else
+                ctrls |= dtr_mask;
+
+        __raw_writel(ctrls, SC_CTRLS);
+        __raw_writel(ctrlc, SC_CTRLC);
+}
+
+static struct amba_pl010_data integrator_uart_data = {
+        .set_mctrl = integrator_uart_set_mctrl,
+};
+
 #define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_BASE) + INTEGRATOR_HDR_CTRL_OFFSET
 
 static DEFINE_SPINLOCK(cm_lock);
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 1080558c81..307e98c29d 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -94,7 +94,7 @@ void __init plat_setup(void)
 
         argptr = prom_getcmdline();