Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

73 files changed, 64624 insertions, 0 deletions

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
new file mode 100644
index 000000000000..f8504b0adebc
--- /dev/null
+++ b/drivers/serial/21285.c
@@ -0,0 +1,541 @@
+/*
+ * linux/drivers/char/21285.c
+ *
+ * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
+ *
+ * Based on drivers/char/serial.c
+ *
+ *  $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/device.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/hardware/dec21285.h>
+#include <asm/hardware.h>
+
+#define BAUD_BASE               (mem_fclk_21285/64)
+
+#define SERIAL_21285_NAME       "ttyFB"
+#define SERIAL_21285_MAJOR      204
+#define SERIAL_21285_MINOR      4
+
+#define RXSTAT_DUMMY_READ       0x80000000
+#define RXSTAT_FRAME            (1 << 0)
+#define RXSTAT_PARITY           (1 << 1)
+#define RXSTAT_OVERRUN          (1 << 2)
+#define RXSTAT_ANYERR           (RXSTAT_FRAME|RXSTAT_PARITY|RXSTAT_OVERRUN)
+
+#define H_UBRLCR_BREAK          (1 << 0)
+#define H_UBRLCR_PARENB         (1 << 1)
+#define H_UBRLCR_PAREVN         (1 << 2)
+#define H_UBRLCR_STOPB          (1 << 3)
+#define H_UBRLCR_FIFO           (1 << 4)
+
+static const char serial21285_name[] = "Footbridge UART";
+
+#define tx_enabled(port)        ((port)->unused[0])
+#define rx_enabled(port)        ((port)->unused[1])
+
+/*
+ * The documented expression for selecting the divisor is:
+ *  BAUD_BASE / baud - 1
+ * However, typically BAUD_BASE is not divisible by baud, so
+ * we want to select the divisor that gives us the minimum
+ * error.  Therefore, we want:
+ *  int(BAUD_BASE / baud - 0.5) ->
+ *  int(BAUD_BASE / baud - (baud >> 1) / baud) ->
+ *  int((BAUD_BASE - (baud >> 1)) / baud)
+ */
+
+static void
+serial21285_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        if (tx_enabled(port)) {
+                disable_irq(IRQ_CONTX);
+                tx_enabled(port) = 0;
+        }
+}
+
+static void
+serial21285_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        if (!tx_enabled(port)) {
+                enable_irq(IRQ_CONTX);
+                tx_enabled(port) = 1;
+        }
+}
+
+static void serial21285_stop_rx(struct uart_port *port)
+{
+        if (rx_enabled(port)) {
+                disable_irq(IRQ_CONRX);
+                rx_enabled(port) = 0;
+        }
+}
+
+static void serial21285_enable_ms(struct uart_port *port)
+{
+}
+
+static irqreturn_t serial21285_rx_chars(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = dev_id;
+        struct tty_struct *tty = port->info->tty;
+        unsigned int status, ch, flag, rxs, max_count = 256;
+
+        status = *CSR_UARTFLG;
+        while (!(status & 0x10) && max_count--) {
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /*
+                         * If this failed then we will throw away the
+                         * bytes but must do so to clear interrupts
+                         */
+                }
+
+                ch = *CSR_UARTDR;
+                flag = TTY_NORMAL;
+                port->icount.rx++;
+
+                rxs = *CSR_RXSTAT | RXSTAT_DUMMY_READ;
+                if (rxs & RXSTAT_ANYERR) {
+                        if (rxs & RXSTAT_PARITY)
+                                port->icount.parity++;
+                        else if (rxs & RXSTAT_FRAME)
+                                port->icount.frame++;
+                        if (rxs & RXSTAT_OVERRUN)
+                                port->icount.overrun++;
+
+                        rxs &= port->read_status_mask;
+
+                        if (rxs & RXSTAT_PARITY)
+                                flag = TTY_PARITY;
+                        else if (rxs & RXSTAT_FRAME)
+                                flag = TTY_FRAME;
+                }
+
+                if ((rxs & port->ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+                if ((rxs & RXSTAT_OVERRUN) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+                status = *CSR_UARTFLG;
+        }
+        tty_flip_buffer_push(tty);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = dev_id;
+        struct circ_buf *xmit = &port->info->xmit;
+        int count = 256;
+
+        if (port->x_char) {
+                *CSR_UARTDR = port->x_char;
+                port->icount.tx++;
+                port->x_char = 0;
+                goto out;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                serial21285_stop_tx(port, 0);
+                goto out;
+        }
+
+        do {
+                *CSR_UARTDR = xmit->buf[xmit->tail];
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0 && !(*CSR_UARTFLG & 0x20));
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                serial21285_stop_tx(port, 0);
+
+ out:
+        return IRQ_HANDLED;
+}
+
+static unsigned int serial21285_tx_empty(struct uart_port *port)
+{
+        return (*CSR_UARTFLG & 8) ? 0 : TIOCSER_TEMT;
+}
+
+/* no modem control lines */
+static unsigned int serial21285_get_mctrl(struct uart_port *port)
+{
+        return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+}
+
+static void serial21285_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+static void serial21285_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long flags;
+        unsigned int h_lcr;
+
+        spin_lock_irqsave(&port->lock, flags);
+        h_lcr = *CSR_H_UBRLCR;
+        if (break_state)
+                h_lcr |= H_UBRLCR_BREAK;
+        else
+                h_lcr &= ~H_UBRLCR_BREAK;
+        *CSR_H_UBRLCR = h_lcr;
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int serial21285_startup(struct uart_port *port)
+{
+        int ret;
+
+        tx_enabled(port) = 1;
+        rx_enabled(port) = 1;
+
+        ret = request_irq(IRQ_CONRX, serial21285_rx_chars, 0,
+                          serial21285_name, port);
+        if (ret == 0) {
+                ret = request_irq(IRQ_CONTX, serial21285_tx_chars, 0,
+                                  serial21285_name, port);
+                if (ret)
+                        free_irq(IRQ_CONRX, port);
+        }
+
+        return ret;
+}
+
+static void serial21285_shutdown(struct uart_port *port)
+{
+        free_irq(IRQ_CONTX, port);
+        free_irq(IRQ_CONRX, port);
+}
+
+static void
+serial21285_set_termios(struct uart_port *port, struct termios *termios,
+                        struct termios *old)
+{
+        unsigned long flags;
+        unsigned int baud, quot, h_lcr;
+
+        /*
+         * We don't support modem control lines.
+         */
+        termios->c_cflag &= ~(HUPCL | CRTSCTS | CMSPAR);
+        termios->c_cflag |= CLOCAL;
+
+        /*
+         * We don't support BREAK character recognition.
+         */
+        termios->c_iflag &= ~(IGNBRK | BRKINT);
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = uart_get_divisor(port, baud);
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                h_lcr = 0x00;
+                break;
+        case CS6:
+                h_lcr = 0x20;
+                break;
+        case CS7:
+                h_lcr = 0x40;
+                break;
+        default: /* CS8 */
+                h_lcr = 0x60;
+                break;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                h_lcr |= H_UBRLCR_STOPB;
+        if (termios->c_cflag & PARENB) {
+                h_lcr |= H_UBRLCR_PARENB;
+                if (!(termios->c_cflag & PARODD))
+                        h_lcr |= H_UBRLCR_PAREVN;
+        }
+
+        if (port->fifosize)
+                h_lcr |= H_UBRLCR_FIFO;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        /*
+         * Which character status flags are we interested in?
+         */
+        port->read_status_mask = RXSTAT_OVERRUN;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= RXSTAT_FRAME | RXSTAT_PARITY;
+
+        /*
+         * Which character status flags should we ignore?
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= RXSTAT_FRAME | RXSTAT_PARITY;
+        if (termios->c_iflag & IGNBRK && termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= RXSTAT_OVERRUN;
+
+        /*
+         * Ignore all characters if CREAD is not set.
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= RXSTAT_DUMMY_READ;
+
+        quot -= 1;
+
+        *CSR_UARTCON = 0;
+        *CSR_L_UBRLCR = quot & 0xff;
+        *CSR_M_UBRLCR = (quot >> 8) & 0x0f;
+        *CSR_H_UBRLCR = h_lcr;
+        *CSR_UARTCON = 1;
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *serial21285_type(struct uart_port *port)
+{
+        return port->type == PORT_21285 ? "DC21285" : NULL;
+}
+
+static void serial21285_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, 32);
+}
+
+static int serial21285_request_port(struct uart_port *port)
+{
+        return request_mem_region(port->mapbase, 32, serial21285_name)
+                         != NULL ? 0 : -EBUSY;
+}
+
+static void serial21285_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE && serial21285_request_port(port) == 0)
+                port->type = PORT_21285;
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int serial21285_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        int ret = 0;
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_21285)
+                ret = -EINVAL;
+        if (ser->irq != NO_IRQ)
+                ret = -EINVAL;
+        if (ser->baud_base != port->uartclk / 16)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops serial21285_ops = {
+        .tx_empty       = serial21285_tx_empty,
+        .get_mctrl      = serial21285_get_mctrl,
+        .set_mctrl      = serial21285_set_mctrl,
+        .stop_tx        = serial21285_stop_tx,
+        .start_tx       = serial21285_start_tx,
+        .stop_rx        = serial21285_stop_rx,
+        .enable_ms      = serial21285_enable_ms,
+        .break_ctl      = serial21285_break_ctl,
+        .startup        = serial21285_startup,
+        .shutdown       = serial21285_shutdown,
+        .set_termios    = serial21285_set_termios,
+        .type           = serial21285_type,
+        .release_port   = serial21285_release_port,
+        .request_port   = serial21285_request_port,
+        .config_port    = serial21285_config_port,
+        .verify_port    = serial21285_verify_port,
+};
+
+static struct uart_port serial21285_port = {
+        .mapbase        = 0x42000160,
+        .iotype         = SERIAL_IO_MEM,
+        .irq            = NO_IRQ,
+        .fifosize       = 16,
+        .ops            = &serial21285_ops,
+        .flags          = ASYNC_BOOT_AUTOCONF,
+};
+
+static void serial21285_setup_ports(void)
+{
+        serial21285_port.uartclk = mem_fclk_21285 / 4;
+}
+
+#ifdef CONFIG_SERIAL_21285_CONSOLE
+
+static void
+serial21285_console_write(struct console *co, const char *s,
+                          unsigned int count)
+{
+        int i;
+
+        for (i = 0; i < count; i++) {
+                while (*CSR_UARTFLG & 0x20)
+                        barrier();
+                *CSR_UARTDR = s[i];
+                if (s[i] == '\n') {
+                        while (*CSR_UARTFLG & 0x20)
+                                barrier();
+                        *CSR_UARTDR = '\r';
+                }
+        }
+}
+
+static void __init
+serial21285_get_options(struct uart_port *port, int *baud,
+                        int *parity, int *bits)
+{
+        if (*CSR_UARTCON == 1) {
+                unsigned int tmp;
+
+                tmp = *CSR_H_UBRLCR;
+                switch (tmp & 0x60) {
+                case 0x00:
+                        *bits = 5;
+                        break;
+                case 0x20:
+                        *bits = 6;
+                        break;
+                case 0x40:
+                        *bits = 7;
+                        break;
+                default:
+                case 0x60:
+                        *bits = 8;
+                        break;
+                }
+
+                if (tmp & H_UBRLCR_PARENB) {
+                        *parity = 'o';
+                        if (tmp & H_UBRLCR_PAREVN)
+                                *parity = 'e';
+                }
+
+                tmp = *CSR_L_UBRLCR | (*CSR_M_UBRLCR << 8);
+
+                *baud = port->uartclk / (16 * (tmp + 1));
+        }
+}
+
+static int __init serial21285_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port = &serial21285_port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        if (machine_is_personal_server())
+                baud = 57600;
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                serial21285_get_options(port, &baud, &parity, &bits);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver serial21285_reg;
+
+static struct console serial21285_console =
+{
+        .name           = SERIAL_21285_NAME,
+        .write          = serial21285_console_write,
+        .device         = uart_console_device,
+        .setup          = serial21285_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &serial21285_reg,
+};
+
+static int __init rs285_console_init(void)
+{
+        serial21285_setup_ports();
+        register_console(&serial21285_console);
+        return 0;
+}
+console_initcall(rs285_console_init);
+
+#define SERIAL_21285_CONSOLE    &serial21285_console
+#else
+#define SERIAL_21285_CONSOLE    NULL
+#endif
+
+static struct uart_driver serial21285_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "ttyFB",
+        .dev_name               = "ttyFB",
+        .devfs_name             = "ttyFB",
+        .major                  = SERIAL_21285_MAJOR,
+        .minor                  = SERIAL_21285_MINOR,
+        .nr                     = 1,
+        .cons                   = SERIAL_21285_CONSOLE,
+};
+
+static int __init serial21285_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Serial: 21285 driver $Revision: 1.37 $\n");
+
+        serial21285_setup_ports();
+
+        ret = uart_register_driver(&serial21285_reg);
+        if (ret == 0)
+                uart_add_one_port(&serial21285_reg, &serial21285_port);
+
+        return ret;
+}
+
+static void __exit serial21285_exit(void)
+{
+        uart_remove_one_port(&serial21285_reg, &serial21285_port);
+        uart_unregister_driver(&serial21285_reg);
+}
+
+module_init(serial21285_init);
+module_exit(serial21285_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.37 $");
+MODULE_ALIAS_CHARDEV(SERIAL_21285_MAJOR, SERIAL_21285_MINOR);
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
new file mode 100644
index 000000000000..db92a0ceda79
--- /dev/null
+++ b/drivers/serial/68328serial.c
@@ -0,0 +1,1614 @@
+/* 68328serial.c: Serial port driver for 68328 microcontroller
+ *
+ * Copyright (C) 1995       David S. Miller    <davem@caip.rutgers.edu>
+ * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
+ * Copyright (C) 1998, 1999 D. Jeff Dionne     <jeff@uclinux.org>
+ * Copyright (C) 1999       Vladimir Gurevich  <vgurevic@cisco.com>
+ * Copyright (C) 2002-2003  David McCullough   <davidm@snapgear.com>
+ * Copyright (C) 2002       Greg Ungerer       <gerg@snapgear.com>
+ *
+ * VZ Support/Fixes             Evan Stawnyczy <e@lineo.ca>
+ * Multiple UART support        Daniel Potts <danielp@cse.unsw.edu.au>
+ * Power management support     Daniel Potts <danielp@cse.unsw.edu.au>
+ * VZ Second Serial Port enable Phil Wilshire
+ * 2.4/2.5 port                 David McCullough
+ */
+
+#include <asm/dbg.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/config.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/fcntl.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
+#include <linux/console.h>
+#include <linux/reboot.h>
+#include <linux/keyboard.h>
+#include <linux/init.h>
+#include <linux/pm.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/segment.h>
+#include <asm/delay.h>
+#include <asm/uaccess.h>
+
+/* (es) */
+/* note: perhaps we can murge these files, so that you can just
+ *       define 1 of them, and they can sort that out for themselves
+ */
+#if defined(CONFIG_M68EZ328)
+#include <asm/MC68EZ328.h>
+#else
+#if defined(CONFIG_M68VZ328)
+#include <asm/MC68VZ328.h>
+#else
+#include <asm/MC68328.h>
+#endif /* CONFIG_M68VZ328 */
+#endif /* CONFIG_M68EZ328 */
+
+#include "68328serial.h"
+
+/* Turn off usage of real serial interrupt code, to "support" Copilot */
+#ifdef CONFIG_XCOPILOT_BUGS
+#undef USE_INTS
+#else
+#define USE_INTS
+#endif
+
+static struct m68k_serial m68k_soft[NR_PORTS];
+struct m68k_serial *IRQ_ports[NR_IRQS];
+
+static unsigned int uart_irqs[NR_PORTS] = UART_IRQ_DEFNS;
+
+/* multiple ports are contiguous in memory */
+m68328_uart *uart_addr = (m68328_uart *)USTCNT_ADDR;
+
+struct tty_struct m68k_ttys;
+struct m68k_serial *m68k_consinfo = 0;
+
+#define M68K_CLOCK (16667000) /* FIXME: 16MHz is likely wrong */
+
+#ifdef CONFIG_CONSOLE
+extern wait_queue_head_t keypress_wait; 
+#endif
+
+struct tty_driver *serial_driver;
+
+/* serial subtype definitions */
+#define SERIAL_TYPE_NORMAL      1
+ 
+/* number of characters left in xmit buffer before we ask for more */
+#define WAKEUP_CHARS 256
+
+/* Debugging... DEBUG_INTR is bad to use when one of the zs
+ * lines is your console ;(
+ */
+#undef SERIAL_DEBUG_INTR
+#undef SERIAL_DEBUG_OPEN
+#undef SERIAL_DEBUG_FLOW
+
+#define RS_ISR_PASS_LIMIT 256
+
+#define _INLINE_ inline
+
+static void change_speed(struct m68k_serial *info);
+
+/*
+ *      Setup for console. Argument comes from the boot command line.
+ */
+
+#if defined(CONFIG_M68EZ328ADS) || defined(CONFIG_ALMA_ANS) || defined(CONFIG_DRAGONIXVZ)
+#define CONSOLE_BAUD_RATE       115200
+#define DEFAULT_CBAUD           B115200
+#else
+        /* (es) */
+        /* note: this is messy, but it works, again, perhaps defined somewhere else?*/
+        #ifdef CONFIG_M68VZ328
+        #define CONSOLE_BAUD_RATE       19200
+        #define DEFAULT_CBAUD           B19200
+        #endif
+        /* (/es) */
+#endif
+
+#ifndef CONSOLE_BAUD_RATE
+#define CONSOLE_BAUD_RATE       9600
+#define DEFAULT_CBAUD           B9600
+#endif
+
+
+static int m68328_console_initted = 0;
+static int m68328_console_baud    = CONSOLE_BAUD_RATE;
+static int m68328_console_cbaud   = DEFAULT_CBAUD;
+
+
+/*
+ * tmp_buf is used as a temporary buffer by serial_write.  We need to
+ * lock it in case the memcpy_fromfs blocks while swapping in a page,
+ * and some other program tries to do a serial write at the same time.
+ * Since the lock will only come under contention when the system is
+ * swapping and available memory is low, it makes sense to share one
+ * buffer across all the serial ports, since it significantly saves
+ * memory if large numbers of serial ports are open.
+ */
+static unsigned char tmp_buf[SERIAL_XMIT_SIZE]; /* This is cheating */
+DECLARE_MUTEX(tmp_buf_sem);
+
+static inline int serial_paranoia_check(struct m68k_serial *info,
+                                        char *name, const char *routine)
+{
+#ifdef SERIAL_PARANOIA_CHECK
+        static const char *badmagic =
+                "Warning: bad magic number for serial struct %s in %s\n";
+        static const char *badinfo =
+                "Warning: null m68k_serial for %s in %s\n";
+
+        if (!info) {
+                printk(badinfo, name, routine);
+                return 1;
+        }
+        if (info->magic != SERIAL_MAGIC) {
+                printk(badmagic, name, routine);
+                return 1;
+        }
+#endif
+        return 0;
+}
+
+/*
+ * This is used to figure out the divisor speeds and the timeouts
+ */
+static int baud_table[] = {
+        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
+        9600, 19200, 38400, 57600, 115200, 0 };
+
+#define BAUD_TABLE_SIZE (sizeof(baud_table)/sizeof(baud_table[0]))
+
+/* Sets or clears DTR/RTS on the requested line */
+static inline void m68k_rtsdtr(struct m68k_serial *ss, int set)
+{
+        if (set) {
+                /* set the RTS/CTS line */
+        } else {
+                /* clear it */
+        }
+        return;
+}
+
+/* Utility routines */
+static inline int get_baud(struct m68k_serial *ss)
+{
+        unsigned long result = 115200;
+        unsigned short int baud = uart_addr[ss->line].ubaud;
+        if (GET_FIELD(baud, UBAUD_PRESCALER) == 0x38) result = 38400;
+        result >>= GET_FIELD(baud, UBAUD_DIVIDE);
+
+        return result;
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_stop() and rs_start()
+ *
+ * This routines are called before setting or resetting tty->stopped.
+ * They enable or disable transmitter interrupts, as necessary.
+ * ------------------------------------------------------------
+ */
+static void rs_stop(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+
+        if (serial_paranoia_check(info, tty->name, "rs_stop"))
+                return;
+        
+        save_flags(flags); cli();
+        uart->ustcnt &= ~USTCNT_TXEN;
+        restore_flags(flags);
+}
+
+static void rs_put_char(char ch)
+{
+        int flags, loops = 0;
+
+        save_flags(flags); cli();
+
+        while (!(UTX & UTX_TX_AVAIL) && (loops < 1000)) {
+                loops++;
+                udelay(5);
+        }
+
+        UTX_TXDATA = ch;
+        udelay(5);
+        restore_flags(flags);
+}
+
+static void rs_start(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+        
+        if (serial_paranoia_check(info, tty->name, "rs_start"))
+                return;
+        
+        save_flags(flags); cli();
+        if (info->xmit_cnt && info->xmit_buf && !(uart->ustcnt & USTCNT_TXEN)) {
+#ifdef USE_INTS
+                uart->ustcnt |= USTCNT_TXEN | USTCNT_TX_INTR_MASK;
+#else
+                uart->ustcnt |= USTCNT_TXEN;
+#endif
+        }
+        restore_flags(flags);
+}
+
+/* Drop into either the boot monitor or kadb upon receiving a break
+ * from keyboard/console input.
+ */
+static void batten_down_hatches(void)
+{
+        /* Drop into the debugger */
+}
+
+static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short status)
+{
+#if 0
+        if(status & DCD) {
+                if((info->tty->termios->c_cflag & CRTSCTS) &&
+                   ((info->curregs[3] & AUTO_ENAB)==0)) {
+                        info->curregs[3] |= AUTO_ENAB;
+                        info->pendregs[3] |= AUTO_ENAB;
+                        write_zsreg(info->m68k_channel, 3, info->curregs[3]);
+                }
+        } else {
+                if((info->curregs[3] & AUTO_ENAB)) {
+                        info->curregs[3] &= ~AUTO_ENAB;
+                        info->pendregs[3] &= ~AUTO_ENAB;
+                        write_zsreg(info->m68k_channel, 3, info->curregs[3]);
+                }
+        }
+#endif
+        /* If this is console input and this is a
+         * 'break asserted' status change interrupt
+         * see if we can drop into the debugger
+         */
+        if((status & URX_BREAK) && info->break_abort)
+                batten_down_hatches();
+        return;
+}
+
+static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *regs, unsigned short rx)
+{
+        struct tty_struct *tty = info->tty;
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned char ch;
+
+        /*
+         * This do { } while() loop will get ALL chars out of Rx FIFO 
+         */
+#ifndef CONFIG_XCOPILOT_BUGS
+        do {
+#endif  
+                ch = GET_FIELD(rx, URX_RXDATA);
+        
+                if(info->is_cons) {
+                        if(URX_BREAK & rx) { /* whee, break received */
+                                status_handle(info, rx);
+                                return;
+#ifdef CONFIG_MAGIC_SYSRQ
+                        } else if (ch == 0x10) { /* ^P */
+                                show_state();
+                                show_free_areas();
+                                show_buffers();
+/*                              show_net_buffers(); */
+                                return;
+                        } else if (ch == 0x12) { /* ^R */
+                                machine_restart(NULL);
+                                return;
+#endif /* CONFIG_MAGIC_SYSRQ */
+                        }
+                        /* It is a 'keyboard interrupt' ;-) */
+#ifdef CONFIG_CONSOLE
+                        wake_up(&keypress_wait);
+#endif                  
+                }
+
+                if(!tty)
+                        goto clear_and_exit;
+                
+                /*
+                 * Make sure that we do not overflow the buffer
+                 */
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        schedule_work(&tty->flip.work);
+                        return;
+                }
+
+                if(rx & URX_PARITY_ERROR) {
+                        *tty->flip.flag_buf_ptr++ = TTY_PARITY;
+                        status_handle(info, rx);
+                } else if(rx & URX_OVRUN) {
+                        *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                        status_handle(info, rx);
+                } else if(rx & URX_FRAME_ERROR) {
+                        *tty->flip.flag_buf_ptr++ = TTY_FRAME;
+                        status_handle(info, rx);
+                } else {
+                        *tty->flip.flag_buf_ptr++ = 0; /* XXX */
+                }
+                *tty->flip.char_buf_ptr++ = ch;
+                tty->flip.count++;
+
+#ifndef CONFIG_XCOPILOT_BUGS
+        } while((rx = uart->urx.w) & URX_DATA_READY);
+#endif
+
+        schedule_work(&tty->flip.work);
+
+clear_and_exit:
+        return;
+}
+
+static _INLINE_ void transmit_chars(struct m68k_serial *info)
+{
+        m68328_uart *uart = &uart_addr[info->line];
+
+        if (info->x_char) {
+                /* Send next char */
+                uart->utx.b.txdata = info->x_char;
+                info->x_char = 0;
+                goto clear_and_return;
+        }
+
+        if((info->xmit_cnt <= 0) || info->tty->stopped) {
+                /* That's peculiar... TX ints off */
+                uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
+                goto clear_and_return;
+        }
+
+        /* Send char */
+        uart->utx.b.txdata = info->xmit_buf[info->xmit_tail++];
+        info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
+        info->xmit_cnt--;
+
+        if (info->xmit_cnt < WAKEUP_CHARS)
+                schedule_work(&info->tqueue);
+
+        if(info->xmit_cnt <= 0) {
+                /* All done for now... TX ints off */
+                uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
+                goto clear_and_return;
+        }
+
+clear_and_return:
+        /* Clear interrupt (should be auto)*/
+        return;
+}
+
+/*
+ * This is the serial driver's generic interrupt routine
+ */
+irqreturn_t rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+{
+        struct m68k_serial * info;
+        m68328_uart *uart;
+        unsigned short rx;
+        unsigned short tx;
+
+        info = IRQ_ports[irq];
+        if(!info)
+            return IRQ_NONE;
+
+        uart = &uart_addr[info->line];
+        rx = uart->urx.w;
+
+#ifdef USE_INTS
+        tx = uart->utx.w;
+
+        if (rx & URX_DATA_READY) receive_chars(info, regs, rx);
+        if (tx & UTX_TX_AVAIL)   transmit_chars(info);
+#else
+        receive_chars(info, regs, rx);          
+#endif
+        return IRQ_HANDLED;
+}
+
+static void do_softint(void *private)
+{
+        struct m68k_serial      *info = (struct m68k_serial *) private;
+        struct tty_struct       *tty;
+        
+        tty = info->tty;
+        if (!tty)
+                return;
+#if 0
+        if (clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
+                tty_wakeup(tty);
+        }
+#endif   
+}
+
+/*
+ * This routine is called from the scheduler tqueue when the interrupt
+ * routine has signalled that a hangup has occurred.  The path of
+ * hangup processing is:
+ *
+ *      serial interrupt routine -> (scheduler tqueue) ->
+ *      do_serial_hangup() -> tty->hangup() -> rs_hangup()
+ * 
+ */
+static void do_serial_hangup(void *private)
+{
+        struct m68k_serial      *info = (struct m68k_serial *) private;
+        struct tty_struct       *tty;
+        
+        tty = info->tty;
+        if (!tty)
+                return;
+
+        tty_hangup(tty);
+}
+
+
+static int startup(struct m68k_serial * info)
+{
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+        
+        if (info->flags & S_INITIALIZED)
+                return 0;
+
+        if (!info->xmit_buf) {
+                info->xmit_buf = (unsigned char *) __get_free_page(GFP_KERNEL);
+                if (!info->xmit_buf)
+                        return -ENOMEM;
+        }
+
+        save_flags(flags); cli();
+
+        /*
+         * Clear the FIFO buffers and disable them
+         * (they will be reenabled in change_speed())
+         */
+
+        uart->ustcnt = USTCNT_UEN;
+        info->xmit_fifo_size = 1;
+        uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_TXEN;
+        (void)uart->urx.w;
+
+        /*
+         * Finally, enable sequencing and interrupts
+         */
+#ifdef USE_INTS
+        uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | 
+                 USTCNT_RX_INTR_MASK | USTCNT_TX_INTR_MASK;
+#else
+        uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_RX_INTR_MASK;
+#endif
+
+        if (info->tty)
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
+
+        /*
+         * and set the speed of the serial port
+         */
+
+        change_speed(info);
+
+        info->flags |= S_INITIALIZED;
+        restore_flags(flags);
+        return 0;
+}
+
+/*
+ * This routine will shutdown a serial port; interrupts are disabled, and
+ * DTR is dropped if the hangup on close termio flag is on.
+ */
+static void shutdown(struct m68k_serial * info)
+{
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long   flags;
+
+        uart->ustcnt = 0; /* All off! */
+        if (!(info->flags & S_INITIALIZED))
+                return;
+
+        save_flags(flags); cli(); /* Disable interrupts */
+        
+        if (info->xmit_buf) {
+                free_page((unsigned long) info->xmit_buf);
+                info->xmit_buf = 0;
+        }
+
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        
+        info->flags &= ~S_INITIALIZED;
+        restore_flags(flags);
+}
+
+struct {
+        int divisor, prescale;
+}
+#ifndef CONFIG_M68VZ328
+ hw_baud_table[18] = {
+        {0,0}, /* 0 */
+        {0,0}, /* 50 */
+        {0,0}, /* 75 */
+        {0,0}, /* 110 */
+        {0,0}, /* 134 */
+        {0,0}, /* 150 */
+        {0,0}, /* 200 */
+        {7,0x26}, /* 300 */
+        {6,0x26}, /* 600 */
+        {5,0x26}, /* 1200 */
+        {0,0}, /* 1800 */
+        {4,0x26}, /* 2400 */
+        {3,0x26}, /* 4800 */
+        {2,0x26}, /* 9600 */
+        {1,0x26}, /* 19200 */
+        {0,0x26}, /* 38400 */
+        {1,0x38}, /* 57600 */
+        {0,0x38}, /* 115200 */
+};
+#else
+ hw_baud_table[18] = {
+                 {0,0}, /* 0 */
+                 {0,0}, /* 50 */
+                 {0,0}, /* 75 */
+                 {0,0}, /* 110 */
+                 {0,0}, /* 134 */
+                 {0,0}, /* 150 */
+                 {0,0}, /* 200 */
+                 {0,0}, /* 300 */
+                 {7,0x26}, /* 600 */
+                 {6,0x26}, /* 1200 */
+                 {0,0}, /* 1800 */
+                 {5,0x26}, /* 2400 */
+                 {4,0x26}, /* 4800 */
+                 {3,0x26}, /* 9600 */
+                 {2,0x26}, /* 19200 */
+                 {1,0x26}, /* 38400 */
+                 {0,0x26}, /* 57600 */
+                 {1,0x38}, /* 115200 */
+}; 
+#endif
+/* rate = 1036800 / ((65 - prescale) * (1<<divider)) */
+
+/*
+ * This routine is called to set the UART divisor registers to match
+ * the specified baud rate for a serial port.
+ */
+static void change_speed(struct m68k_serial *info)
+{
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned short port;
+        unsigned short ustcnt;
+        unsigned cflag;
+        int     i;
+
+        if (!info->tty || !info->tty->termios)
+                return;
+        cflag = info->tty->termios->c_cflag;
+        if (!(port = info->port))
+                return;
+
+        ustcnt = uart->ustcnt;
+        uart->ustcnt = ustcnt & ~USTCNT_TXEN;
+
+        i = cflag & CBAUD;
+        if (i & CBAUDEX) {
+                i = (i & ~CBAUDEX) + B38400;
+        }
+
+        info->baud = baud_table[i];
+        uart->ubaud = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) | 
+                PUT_FIELD(UBAUD_PRESCALER, hw_baud_table[i].prescale);
+
+        ustcnt &= ~(USTCNT_PARITYEN | USTCNT_ODD_EVEN | USTCNT_STOP | USTCNT_8_7);
+        
+        if ((cflag & CSIZE) == CS8)
+                ustcnt |= USTCNT_8_7;
+                
+        if (cflag & CSTOPB)
+                ustcnt |= USTCNT_STOP;
+
+        if (cflag & PARENB)
+                ustcnt |= USTCNT_PARITYEN;
+        if (cflag & PARODD)
+                ustcnt |= USTCNT_ODD_EVEN;
+        
+#ifdef CONFIG_SERIAL_68328_RTS_CTS
+        if (cflag & CRTSCTS) {
+                uart->utx.w &= ~ UTX_NOCTS;
+        } else {
+                uart->utx.w |= UTX_NOCTS;
+        }
+#endif
+
+        ustcnt |= USTCNT_TXEN;
+        
+        uart->ustcnt = ustcnt;
+        return;
+}
+
+/*
+ * Fair output driver allows a process to speak.
+ */
+static void rs_fair_output(void)
+{
+        int left;               /* Output no more than that */
+        unsigned long flags;
+        struct m68k_serial *info = &m68k_soft[0];
+        char c;
+
+        if (info == 0) return;
+        if (info->xmit_buf == 0) return;
+
+        save_flags(flags);  cli();
+        left = info->xmit_cnt;
+        while (left != 0) {
+                c = info->xmit_buf[info->xmit_tail];
+                info->xmit_tail = (info->xmit_tail+1) & (SERIAL_XMIT_SIZE-1);
+                info->xmit_cnt--;
+                restore_flags(flags);
+
+                rs_put_char(c);
+
+                save_flags(flags);  cli();
+                left = min(info->xmit_cnt, left-1);
+        }
+
+        /* Last character is being transmitted now (hopefully). */
+        udelay(5);
+
+        restore_flags(flags);
+        return;
+}
+
+/*
+ * m68k_console_print is registered for printk.
+ */
+void console_print_68328(const char *p)
+{
+        char c;
+        
+        while((c=*(p++)) != 0) {
+                if(c == '\n')
+                        rs_put_char('\r');
+                rs_put_char(c);
+        }
+
+        /* Comment this if you want to have a strict interrupt-driven output */
+        rs_fair_output();
+
+        return;
+}
+
+static void rs_set_ldisc(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+
+        if (serial_paranoia_check(info, tty->name, "rs_set_ldisc"))
+                return;
+
+        info->is_cons = (tty->termios->c_line == N_TTY);
+        
+        printk("ttyS%d console mode %s\n", info->line, info->is_cons ? "on" : "off");
+}
+
+static void rs_flush_chars(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+
+        if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))
+                return;
+#ifndef USE_INTS
+        for(;;) {
+#endif
+
+        /* Enable transmitter */
+        save_flags(flags); cli();
+
+        if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
+                        !info->xmit_buf) {
+                restore_flags(flags);
+                return;
+        }
+
+#ifdef USE_INTS
+        uart->ustcnt |= USTCNT_TXEN | USTCNT_TX_INTR_MASK;
+#else
+        uart->ustcnt |= USTCNT_TXEN;
+#endif
+
+#ifdef USE_INTS
+        if (uart->utx.w & UTX_TX_AVAIL) {
+#else
+        if (1) {
+#endif
+                /* Send char */
+                uart->utx.b.txdata = info->xmit_buf[info->xmit_tail++];
+                info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
+                info->xmit_cnt--;
+        }
+
+#ifndef USE_INTS
+        while (!(uart->utx.w & UTX_TX_AVAIL)) udelay(5);
+        }
+#endif
+        restore_flags(flags);
+}
+
+extern void console_printn(const char * b, int count);
+
+static int rs_write(struct tty_struct * tty,
+                    const unsigned char *buf, int count)
+{
+        int     c, total = 0;
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+
+        if (serial_paranoia_check(info, tty->name, "rs_write"))
+                return 0;
+
+        if (!tty || !info->xmit_buf)
+                return 0;
+
+        save_flags(flags);
+        while (1) {
+                cli();          
+                c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+                                   SERIAL_XMIT_SIZE - info->xmit_head));
+                if (c <= 0)
+                        break;
+
+                memcpy(info->xmit_buf + info->xmit_head, buf, c);
+                info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
+                info->xmit_cnt += c;
+                restore_flags(flags);
+                buf += c;
+                count -= c;
+                total += c;
+        }
+
+        if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) {
+                /* Enable transmitter */
+                cli();          
+#ifndef USE_INTS
+                while(info->xmit_cnt) {
+#endif
+
+                uart->ustcnt |= USTCNT_TXEN;
+#ifdef USE_INTS
+                uart->ustcnt |= USTCNT_TX_INTR_MASK;
+#else
+                while (!(uart->utx.w & UTX_TX_AVAIL)) udelay(5);
+#endif
+                if (uart->utx.w & UTX_TX_AVAIL) {
+                        uart->utx.b.txdata = info->xmit_buf[info->xmit_tail++];
+                        info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
+                        info->xmit_cnt--;
+                }
+
+#ifndef USE_INTS
+                }
+#endif
+                restore_flags(flags);
+        }
+        restore_flags(flags);
+        return total;
+}
+
+static int rs_write_room(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+        int     ret;
+                                
+        if (serial_paranoia_check(info, tty->name, "rs_write_room"))
+                return 0;
+        ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
+        if (ret < 0)
+                ret = 0;
+        return ret;
+}
+
+static int rs_chars_in_buffer(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+                                
+        if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
+                return 0;
+        return info->xmit_cnt;
+}
+
+static void rs_flush_buffer(struct tty_struct *tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+                                
+        if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
+                return;
+        cli();
+        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
+        sti();
+        tty_wakeup(tty);
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_throttle()
+ * 
+ * This routine is called by the upper-layer tty layer to signal that
+ * incoming characters should be throttled.
+ * ------------------------------------------------------------
+ */
+static void rs_throttle(struct tty_struct * tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+
+        if (serial_paranoia_check(info, tty->name, "rs_throttle"))
+                return;
+        
+        if (I_IXOFF(tty))
+                info->x_char = STOP_CHAR(tty);
+
+        /* Turn off RTS line (do this atomic) */
+}
+
+static void rs_unthrottle(struct tty_struct * tty)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+
+        if (serial_paranoia_check(info, tty->name, "rs_unthrottle"))
+                return;
+        
+        if (I_IXOFF(tty)) {
+                if (info->x_char)
+                        info->x_char = 0;
+                else
+                        info->x_char = START_CHAR(tty);
+        }
+
+        /* Assert RTS line (do this atomic) */
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_ioctl() and friends
+ * ------------------------------------------------------------
+ */
+
+static int get_serial_info(struct m68k_serial * info,
+                           struct serial_struct * retinfo)
+{
+        struct serial_struct tmp;
+  
+        if (!retinfo)
+                return -EFAULT;
+        memset(&tmp, 0, sizeof(tmp));
+        tmp.type = info->type;
+        tmp.line = info->line;
+        tmp.port = info->port;
+        tmp.irq = info->irq;
+        tmp.flags = info->flags;
+        tmp.baud_base = info->baud_base;
+        tmp.close_delay = info->close_delay;
+        tmp.closing_wait = info->closing_wait;
+        tmp.custom_divisor = info->custom_divisor;
+        copy_to_user(retinfo,&tmp,sizeof(*retinfo));
+        return 0;
+}
+
+static int set_serial_info(struct m68k_serial * info,
+                           struct serial_struct * new_info)
+{
+        struct serial_struct new_serial;
+        struct m68k_serial old_info;
+        int                     retval = 0;
+
+        if (!new_info)
+                return -EFAULT;
+        copy_from_user(&new_serial,new_info,sizeof(new_serial));
+        old_info = *info;
+
+        if (!capable(CAP_SYS_ADMIN)) {
+                if ((new_serial.baud_base != info->baud_base) ||
+                    (new_serial.type != info->type) ||
+                    (new_serial.close_delay != info->close_delay) ||
+                    ((new_serial.flags & ~S_USR_MASK) !=
+                     (info->flags & ~S_USR_MASK)))
+                        return -EPERM;
+                info->flags = ((info->flags & ~S_USR_MASK) |
+                               (new_serial.flags & S_USR_MASK));
+                info->custom_divisor = new_serial.custom_divisor;
+                goto check_and_exit;
+        }
+
+        if (info->count > 1)
+                return -EBUSY;
+
+        /*
+         * OK, past this point, all the error checking has been done.
+         * At this point, we start making changes.....
+         */
+
+        info->baud_base = new_serial.baud_base;
+        info->flags = ((info->flags & ~S_FLAGS) |
+                        (new_serial.flags & S_FLAGS));
+        info->type = new_serial.type;
+        info->close_delay = new_serial.close_delay;
+        info->closing_wait = new_serial.closing_wait;
+
+check_and_exit:
+        retval = startup(info);
+        return retval;
+}
+
+/*
+ * get_lsr_info - get line status register info
+ *
+ * Purpose: Let user call ioctl() to get info when the UART physically
+ *          is emptied.  On bus types like RS485, the transmitter must
+ *          release the bus after transmitting. This must be done when
+ *          the transmit shift register is empty, not be done when the
+ *          transmit holding register is empty.  This functionality
+ *          allows an RS485 driver to be written in user space. 
+ */
+static int get_lsr_info(struct m68k_serial * info, unsigned int *value)
+{
+#ifdef CONFIG_SERIAL_68328_RTS_CTS
+        m68328_uart *uart = &uart_addr[info->line];
+#endif
+        unsigned char status;
+
+        cli();
+#ifdef CONFIG_SERIAL_68328_RTS_CTS
+        status = (uart->utx.w & UTX_CTS_STAT) ? 1 : 0;
+#else
+        status = 0;
+#endif
+        sti();
+        put_user(status,value);
+        return 0;
+}
+
+/*
+ * This routine sends a break character out the serial port.
+ */
+static void send_break( struct m68k_serial * info, int duration)
+{
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+        if (!info->port)
+                return;
+        set_current_state(TASK_INTERRUPTIBLE);
+        save_flags(flags);
+        cli();
+#ifdef USE_INTS 
+        uart->utx.w |= UTX_SEND_BREAK;
+        schedule_timeout(duration);
+        uart->utx.w &= ~UTX_SEND_BREAK;
+#endif          
+        restore_flags(flags);
+}
+
+static int rs_ioctl(struct tty_struct *tty, struct file * file,
+                    unsigned int cmd, unsigned long arg)
+{
+        int error;
+        struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
+        int retval;
+
+        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
+                return -ENODEV;
+
+        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
+            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD)  &&
+            (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
+                if (tty->flags & (1 << TTY_IO_ERROR))
+                    return -EIO;
+        }
+        
+        switch (cmd) {
+                case TCSBRK:    /* SVID version: non-zero arg --> no break */
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        if (!arg)
+                                send_break(info, HZ/4); /* 1/4 second */
+                        return 0;
+                case TCSBRKP:   /* support for POSIX tcsendbreak() */
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        send_break(info, arg ? arg*(HZ/10) : HZ/4);
+                        return 0;
+                case TIOCGSOFTCAR:
+                        error = put_user(C_CLOCAL(tty) ? 1 : 0,
+                                    (unsigned long *) arg);
+                        if (error)
+                                return error;
+                        return 0;
+                case TIOCSSOFTCAR:
+                        get_user(arg, (unsigned long *) arg);
+                        tty->termios->c_cflag =
+                                ((tty->termios->c_cflag & ~CLOCAL) |
+                                 (arg ? CLOCAL : 0));
+                        return 0;
+                case TIOCGSERIAL:
+                        if (access_ok(VERIFY_WRITE, (void *) arg,
+                                                sizeof(struct serial_struct)))
+                                return get_serial_info(info,
+                                               (struct serial_struct *) arg);
+                        return -EFAULT;
+                case TIOCSSERIAL:
+                        return set_serial_info(info,
+                                               (struct serial_struct *) arg);
+                case TIOCSERGETLSR: /* Get line status register */
+                        if (access_ok(VERIFY_WRITE, (void *) arg,
+                                                sizeof(unsigned int));
+                                return get_lsr_info(info, (unsigned int *) arg);
+                        return -EFAULT;
+                case TIOCSERGSTRUCT:
+                        if (!access_ok(VERIFY_WRITE, (void *) arg,
+                                                sizeof(struct m68k_serial)))
+                                return -EFAULT;
+                        copy_to_user((struct m68k_serial *) arg,
+                                    info, sizeof(struct m68k_serial));
+                        return 0;
+                        
+                default:
+                        return -ENOIOCTLCMD;
+                }
+        return 0;
+}
+
+static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+{
+        struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+
+        if (tty->termios->c_cflag == old_termios->c_cflag)
+                return;
+
+        change_speed(info);
+
+        if ((old_termios->c_cflag & CRTSCTS) &&
+            !(tty->termios->c_cflag & CRTSCTS)) {
+                tty->hw_stopped = 0;
+                rs_start(tty);
+        }
+        
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_close()
+ * 
+ * This routine is called when the serial port gets closed.  First, we
+ * wait for the last remaining data to be sent.  Then, we unlink its
+ * S structure from the interrupt chain if necessary, and we free
+ * that IRQ if nothing is left in the chain.
+ * ------------------------------------------------------------
+ */
+static void rs_close(struct tty_struct *tty, struct file * filp)
+{
+        struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
+        m68328_uart *uart = &uart_addr[info->line];
+        unsigned long flags;
+
+        if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
+                return;
+        
+        save_flags(flags); cli();
+        
+        if (tty_hung_up_p(filp)) {
+                restore_flags(flags);
+                return;
+        }
+        
+        if ((tty->count == 1) && (info->count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  Info->count should always
+                 * be one in these conditions.  If it's greater than
+                 * one, we've got real problems, since it means the
+                 * serial port won't be shutdown.
+                 */
+                printk("rs_close: bad serial port count; tty->count is 1, "
+                       "info->count is %d\n", info->count);
+                info->count = 1;
+        }
+        if (--info->count < 0) {
+                printk("rs_close: bad serial port count for ttyS%d: %d\n",
+                       info->line, info->count);
+                info->count = 0;
+        }
+        if (info->count) {
+                restore_flags(flags);
+                return;
+        }
+        info->flags |= S_CLOSING;
+        /*
+         * Now we wait for the transmit buffer to clear; and we notify 
+         * the line discipline to only process XON/XOFF characters.
+         */
+        tty->closing = 1;
+        if (info->closing_wait != S_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->closing_wait);
+        /*
+         * At this point we stop accepting input.  To do this, we
+         * disable the receive line status interrupts, and tell the
+         * interrupt driver to stop checking the data ready bit in the
+         * line status register.
+         */
+
+        uart->ustcnt &= ~USTCNT_RXEN;
+        uart->ustcnt &= ~(USTCNT_RXEN | USTCNT_RX_INTR_MASK);
+
+        shutdown(info);
+        if (tty->driver->flush_buffer)
+                tty->driver->flush_buffer(tty);
+                
+        tty_ldisc_flush(tty);
+        tty->closing = 0;
+        info->event = 0;
+        info->tty = 0;
+#warning "This is not and has never been valid so fix it"       
+#if 0
+        if (tty->ldisc.num != ldiscs[N_TTY].num) {
+                if (tty->ldisc.close)
+                        (tty->ldisc.close)(tty);
+                tty->ldisc = ldiscs[N_TTY];
+                tty->termios->c_line = N_TTY;
+                if (tty->ldisc.open)
+                        (tty->ldisc.open)(tty);
+        }
+#endif  
+        if (info->blocked_open) {
+                if (info->close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+                }
+                wake_up_interruptible(&info->open_wait);
+        }
+        info->flags &= ~(S_NORMAL_ACTIVE|S_CLOSING);
+        wake_up_interruptible(&info->close_wait);
+        restore_flags(flags);
+}
+
+/*
+ * rs_hangup() --- called by tty_hangup() when a hangup is signaled.
+ */
+void rs_hangup(struct tty_struct *tty)
+{
+        struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
+        
+        if (serial_paranoia_check(info, tty->name, "rs_hangup"))
+                return;
+        
+        rs_flush_buffer(tty);
+        shutdown(info);
+        info->event = 0;
+        info->count = 0;
+        info->flags &= ~S_NORMAL_ACTIVE;
+        info->tty = 0;
+        wake_up_interruptible(&info->open_wait);
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_open() and friends
+ * ------------------------------------------------------------
+ */
+static int block_til_ready(struct tty_struct *tty, struct file * filp,
+                           struct m68k_serial *info)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        int             retval;
+        int             do_clocal = 0;
+
+        /*
+         * If the device is in the middle of being closed, then block
+         * until it's done, and then try again.
+         */
+        if (info->flags & S_CLOSING) {
+                interruptible_sleep_on(&info->close_wait);
+#ifdef SERIAL_DO_RESTART
+                if (info->flags & S_HUP_NOTIFY)
+                        return -EAGAIN;
+                else
+                        return -ERESTARTSYS;
+#else
+                return -EAGAIN;
+#endif
+        }
+        
+        /*
+         * If non-blocking mode is set, or the port is not enabled,
+         * then make the check up front and then exit.
+         */
+        if ((filp->f_flags & O_NONBLOCK) ||
+            (tty->flags & (1 << TTY_IO_ERROR))) {
+                info->flags |= S_NORMAL_ACTIVE;
+                return 0;
+        }
+
+        if (tty->termios->c_cflag & CLOCAL)
+                do_clocal = 1;
+
+        /*
+         * Block waiting for the carrier detect and the line to become
+         * free (i.e., not in use by the callout).  While we are in
+         * this loop, info->count is dropped by one, so that
+         * rs_close() knows when to free things.  We restore it upon
+         * exit, either normal or abnormal.
+         */
+        retval = 0;
+        add_wait_queue(&info->open_wait, &wait);
+
+        info->count--;
+        info->blocked_open++;
+        while (1) {
+                cli();
+                m68k_rtsdtr(info, 1);
+                sti();
+                current->state = TASK_INTERRUPTIBLE;
+                if (tty_hung_up_p(filp) ||
+                    !(info->flags & S_INITIALIZED)) {
+#ifdef SERIAL_DO_RESTART
+                        if (info->flags & S_HUP_NOTIFY)
+                                retval = -EAGAIN;
+                        else
+                                retval = -ERESTARTSYS;  
+#else
+                        retval = -EAGAIN;
+#endif
+                        break;
+                }
+                if (!(info->flags & S_CLOSING) && do_clocal)
+                        break;
+                if (signal_pending(current)) {
+                        retval = -ERESTARTSYS;
+                        break;
+                }
+                schedule();
+        }
+        current->state = TASK_RUNNING;
+        remove_wait_queue(&info->open_wait, &wait);
+        if (!tty_hung_up_p(filp))
+                info->count++;
+        info->blocked_open--;
+
+        if (retval)
+                return retval;
+        info->flags |= S_NORMAL_ACTIVE;
+        return 0;
+}       
+
+/*
+ * This routine is called whenever a serial port is opened.  It
+ * enables interrupts for a serial port, linking in its S structure into
+ * the IRQ chain.   It also performs the serial-specific
+ * initialization for the tty structure.
+ */
+int rs_open(struct tty_struct *tty, struct file * filp)
+{
+        struct m68k_serial      *info;
+        int                     retval, line;
+
+        line = tty->index;
+        
+        if (line >= NR_PORTS || line < 0) /* we have exactly one */
+                return -ENODEV;
+
+        info = &m68k_soft[line];
+
+        if (serial_paranoia_check(info, tty->name, "rs_open"))
+                return -ENODEV;
+
+        info->count++;
+        tty->driver_data = info;
+        info->tty = tty;
+
+        /*
+         * Start up serial port
+         */
+        retval = startup(info);
+        if (retval)
+                return retval;
+
+        return block_til_ready(tty, filp, info);
+}
+
+/* Finally, routines used to initialize the serial driver. */
+
+static void show_serial_version(void)
+{
+        printk("MC68328 serial driver version 1.00\n");
+}
+
+#ifdef CONFIG_PM
+/* Serial Power management
+ *  The console (currently fixed at line 0) is a special case for power
+ *  management because the kernel is so chatty. The console will be 
+ *  explicitly disabled my our power manager as the last minute, so we won't
+ *  mess with it here.
+ */
+static struct pm_dev *serial_pm[NR_PORTS];
+
+static int serial_pm_callback(struct pm_dev *dev, pm_request_t request, void *data)
+{
+        struct m68k_serial *info = (struct m68k_serial *)dev->data;
+
+        if(info == NULL)
+                return -1;
+
+        /* special case for line 0 - pm restores it */
+        if(info->line == 0)
+                return 0; 
+
+        switch (request) {
+        case PM_SUSPEND:
+                shutdown(info);
+                break;
+
+        case PM_RESUME:
+                startup(info);
+                break;
+        }
+        return 0;
+}
+
+void shutdown_console(void)
+{
+        struct m68k_serial *info = &m68k_soft[0];
+
+        /* HACK: wait a bit for any pending printk's to be dumped */
+        {
+                int i = 10000;
+                while(i--);
+        }
+
+        shutdown(info);
+}
+
+void startup_console(void)
+{
+        struct m68k_serial *info = &m68k_soft[0];
+        startup(info);
+}
+#endif
+
+
+static struct tty_operations rs_ops = {
+        .open = rs_open,
+        .close = rs_close,
+        .write = rs_write,
+        .flush_chars = rs_flush_chars,
+        .write_room = rs_write_room,
+        .chars_in_buffer = rs_chars_in_buffer,
+        .flush_buffer = rs_flush_buffer,
+        .ioctl = rs_ioctl,
+        .throttle = rs_throttle,
+        .unthrottle = rs_unthrottle,
+        .set_termios = rs_set_termios,
+        .stop = rs_stop,
+        .start = rs_start,
+        .hangup = rs_hangup,
+        .set_ldisc = rs_set_ldisc,
+};
+
+/* rs_init inits the driver */
+static int __init
+rs68328_init(void)
+{
+        int flags, i;
+        struct m68k_serial *info;
+
+        serial_driver = alloc_tty_driver(NR_PORTS);
+        if (!serial_driver)
+                return -ENOMEM;
+
+        show_serial_version();
+
+        /* Initialize the tty_driver structure */
+        /* SPARC: Not all of this is exactly right for us. */
+        
+        serial_driver->name = "ttyS";
+        serial_driver->major = TTY_MAJOR;
+        serial_driver->minor_start = 64;
+        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        serial_driver->subtype = SERIAL_TYPE_NORMAL;
+        serial_driver->init_termios = tty_std_termios;
+        serial_driver->init_termios.c_cflag = 
+                        m68328_console_cbaud | CS8 | CREAD | HUPCL | CLOCAL;
+        serial_driver->flags = TTY_DRIVER_REAL_RAW;
+        tty_set_operations(serial_driver, &rs_ops);
+
+        if (tty_register_driver(serial_driver)) {
+                put_tty_driver(serial_driver);
+                printk(KERN_ERR "Couldn't register serial driver\n");
+                return -ENOMEM;
+        }
+
+        save_flags(flags); cli();
+
+        for(i=0;i<NR_PORTS;i++) {
+
+            info = &m68k_soft[i];
+            info->magic = SERIAL_MAGIC;
+            info->port = (int) &uart_addr[i];
+            info->tty = 0;
+            info->irq = uart_irqs[i];
+            info->custom_divisor = 16;
+            info->close_delay = 50;
+            info->closing_wait = 3000;
+            info->x_char = 0;
+            info->event = 0;
+            info->count = 0;
+            info->blocked_open = 0;
+            INIT_WORK(&info->tqueue, do_softint, info);
+            INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);
+            init_waitqueue_head(&info->open_wait);
+            init_waitqueue_head(&info->close_wait);
+            info->line = i;
+            info->is_cons = 1; /* Means shortcuts work */
+            
+            printk("%s%d at 0x%08x (irq = %d)", serial_driver->name, info->line, 
+                   info->port, info->irq);
+            printk(" is a builtin MC68328 UART\n");
+            
+            IRQ_ports[info->irq] = info;        /* waste of space */
+
+#ifdef CONFIG_M68VZ328
+                if (i > 0 )
+                        PJSEL &= 0xCF;  /* PSW enable second port output */
+#endif
+
+            if (request_irq(uart_irqs[i],
+                            rs_interrupt,
+                            IRQ_FLG_STD,
+                            "M68328_UART", NULL))
+                panic("Unable to attach 68328 serial interrupt\n");
+#ifdef CONFIG_PM
+            serial_pm[i] = pm_register(PM_SYS_DEV, PM_SYS_COM, serial_pm_callback);
+            if (serial_pm[i])
+                    serial_pm[i]->data = info;
+#endif
+        }
+        restore_flags(flags);
+        return 0;
+}
+
+
+
+/*
+ * register_serial and unregister_serial allows for serial ports to be
+ * configured at run-time, to support PCMCIA modems.
+ */
+/* SPARC: Unused at this time, just here to make things link. */
+int register_serial(struct serial_struct *req)
+{
+        return -1;
+}
+
+void unregister_serial(int line)
+{
+        return;
+}
+        
+module_init(rs68328_init);
+
+
+
+static void m68328_set_baud(void)
+{
+        unsigned short ustcnt;
+        int     i;
+
+        ustcnt = USTCNT;
+        USTCNT = ustcnt & ~USTCNT_TXEN;
+
+again:
+        for (i = 0; i < sizeof(baud_table) / sizeof(baud_table[0]); i++)
+                if (baud_table[i] == m68328_console_baud)
+                        break;
+        if (i >= sizeof(baud_table) / sizeof(baud_table[0])) {
+                m68328_console_baud = 9600;
+                goto again;
+        }
+
+        UBAUD = PUT_FIELD(UBAUD_DIVIDE,    hw_baud_table[i].divisor) | 
+                PUT_FIELD(UBAUD_PRESCALER, hw_baud_table[i].prescale);
+        ustcnt &= ~(USTCNT_PARITYEN | USTCNT_ODD_EVEN | USTCNT_STOP | USTCNT_8_7);
+        ustcnt |= USTCNT_8_7;
+        ustcnt |= USTCNT_TXEN;
+        USTCNT = ustcnt;
+        m68328_console_initted = 1;
+        return;
+}
+
+
+int m68328_console_setup(struct console *cp, char *arg)
+{
+        int             i, n = CONSOLE_BAUD_RATE;
+
+        if (!cp)
+                return(-1);
+
+        if (arg)
+                n = simple_strtoul(arg,NULL,0);
+
+        for (i = 0; i < BAUD_TABLE_SIZE; i++)
+                if (baud_table[i] == n)
+                        break;
+        if (i < BAUD_TABLE_SIZE) {
+                m68328_console_baud = n;
+                m68328_console_cbaud = 0;
+                if (i > 15) {
+                        m68328_console_cbaud |= CBAUDEX;
+                        i -= 15;
+                }
+                m68328_console_cbaud |= i;
+        }
+
+        m68328_set_baud(); /* make sure baud rate changes */
+        return(0);
+}
+
+
+static struct tty_driver *m68328_console_device(struct console *c, int *index)
+{
+        *index = c->index;
+        return serial_driver;
+}
+
+
+void m68328_console_write (struct console *co, const char *str,
+                           unsigned int count)
+{
+        if (!m68328_console_initted)
+                m68328_set_baud();
+    while (count--) {
+        if (*str == '\n')
+           rs_put_char('\r');
+        rs_put_char( *str++ );
+    }
+}
+
+
+static struct console m68328_driver = {
+        .name           = "ttyS",
+        .write          = m68328_console_write,
+        .device         = m68328_console_device,
+        .setup          = m68328_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+};
+
+
+static int __init m68328_console_init(void)
+{
+        register_console(&m68328_driver);
+        return 0;
+}
+
+console_initcall(m68328_console_init);
diff --git a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h
new file mode 100644
index 000000000000..978f8a609f3d
--- /dev/null
+++ b/drivers/serial/68328serial.h
@@ -0,0 +1,194 @@
+/* 68328serial.h: Definitions for the mc68328 serial driver.
+ *
+ * Copyright (C) 1995       David S. Miller    <davem@caip.rutgers.edu>
+ * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
+ * Copyright (C) 1998, 1999 D. Jeff Dionne     <jeff@uclinux.org>
+ * Copyright (C) 1999       Vladimir Gurevich  <vgurevic@cisco.com>
+ *
+ * VZ Support/Fixes             Evan Stawnyczy <e@lineo.ca>
+ */
+
+#ifndef _MC683XX_SERIAL_H
+#define _MC683XX_SERIAL_H
+
+#include <linux/config.h>
+
+struct serial_struct {
+        int     type;
+        int     line;
+        int     port;
+        int     irq;
+        int     flags;
+        int     xmit_fifo_size;
+        int     custom_divisor;
+        int     baud_base;
+        unsigned short  close_delay;
+        char    reserved_char[2];
+        int     hub6;  /* FIXME: We don't have AT&T Hub6 boards! */
+        unsigned short  closing_wait; /* time to wait before closing */
+        unsigned short  closing_wait2; /* no longer used... */
+        int     reserved[4];
+};
+
+/*
+ * For the close wait times, 0 means wait forever for serial port to
+ * flush its output.  65535 means don't wait at all.
+ */
+#define S_CLOSING_WAIT_INF      0
+#define S_CLOSING_WAIT_NONE     65535
+
+/*
+ * Definitions for S_struct (and serial_struct) flags field
+ */
+#define S_HUP_NOTIFY 0x0001 /* Notify getty on hangups and closes 
+                                   on the callout port */
+#define S_FOURPORT  0x0002      /* Set OU1, OUT2 per AST Fourport settings */
+#define S_SAK   0x0004  /* Secure Attention Key (Orange book) */
+#define S_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */
+
+#define S_SPD_MASK      0x0030
+#define S_SPD_HI        0x0010  /* Use 56000 instead of 38400 bps */
+
+#define S_SPD_VHI       0x0020  /* Use 115200 instead of 38400 bps */
+#define S_SPD_CUST      0x0030  /* Use user-specified divisor */
+
+#define S_SKIP_TEST     0x0040 /* Skip UART test during autoconfiguration */
+#define S_AUTO_IRQ  0x0080 /* Do automatic IRQ during autoconfiguration */
+#define S_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */
+#define S_PGRP_LOCKOUT    0x0200 /* Lock out cua opens based on pgrp */
+#define S_CALLOUT_NOHUP   0x0400 /* Don't do hangups for cua device */
+
+#define S_FLAGS 0x0FFF  /* Possible legal S flags */
+#define S_USR_MASK 0x0430       /* Legal flags that non-privileged
+                                 * users can set or reset */
+
+/* Internal flags used only by kernel/chr_drv/serial.c */
+#define S_INITIALIZED   0x80000000 /* Serial port was initialized */
+#define S_CALLOUT_ACTIVE        0x40000000 /* Call out device is active */
+#define S_NORMAL_ACTIVE 0x20000000 /* Normal device is active */
+#define S_BOOT_AUTOCONF 0x10000000 /* Autoconfigure port on bootup */
+#define S_CLOSING               0x08000000 /* Serial port is closing */
+#define S_CTS_FLOW              0x04000000 /* Do CTS flow control */
+#define S_CHECK_CD              0x02000000 /* i.e., CLOCAL */
+
+/* Software state per channel */
+
+#ifdef __KERNEL__
+
+/*
+ * I believe this is the optimal setting that reduces the number of interrupts.
+ * At high speeds the output might become a little "bursted" (use USTCNT_TXHE
+ * if that bothers you), but in most cases it will not, since we try to 
+ * transmit characters every time rs_interrupt is called. Thus, quite often
+ * you'll see that a receive interrupt occures before the transmit one.
+ *                                  -- Vladimir Gurevich
+ */
+#define USTCNT_TX_INTR_MASK (USTCNT_TXEE)
+
+/*
+ * 68328 and 68EZ328 UARTS are a little bit different. EZ328 has special
+ * "Old data interrupt" which occures whenever the data stay in the FIFO
+ * longer than 30 bits time. This allows us to use FIFO without compromising
+ * latency. '328 does not have this feature and without the real  328-based
+ * board I would assume that RXRE is the safest setting.
+ *
+ * For EZ328 I use RXHE (Half empty) interrupt to reduce the number of
+ * interrupts. RXFE (receive queue full) causes the system to lose data
+ * at least at 115200 baud
+ *
+ * If your board is busy doing other stuff, you might consider to use
+ * RXRE (data ready intrrupt) instead.
+ *
+ * The other option is to make these INTR masks run-time configurable, so
+ * that people can dynamically adapt them according to the current usage.
+ *                                  -- Vladimir Gurevich
+ */
+
+/* (es) */
+#if defined(CONFIG_M68EZ328) || defined(CONFIG_M68VZ328)
+#define USTCNT_RX_INTR_MASK (USTCNT_RXHE | USTCNT_ODEN)
+#elif defined(CONFIG_M68328)
+#define USTCNT_RX_INTR_MASK (USTCNT_RXRE)
+#else
+#error Please, define the Rx interrupt events for your CPU
+#endif
+/* (/es) */
+
+/*
+ * This is our internal structure for each serial port's state.
+ * 
+ * Many fields are paralleled by the structure used by the serial_struct
+ * structure.
+ *
+ * For definitions of the flags field, see tty.h
+ */
+
+struct m68k_serial {
+        char soft_carrier;  /* Use soft carrier on this channel */
+        char break_abort;   /* Is serial console in, so process brk/abrt */
+        char is_cons;       /* Is this our console. */
+
+        /* We need to know the current clock divisor
+         * to read the bps rate the chip has currently
+         * loaded.
+         */
+        unsigned char clk_divisor;  /* May be 1, 16, 32, or 64 */
+        int baud;
+        int                     magic;
+        int                     baud_base;
+        int                     port;
+        int                     irq;
+        int                     flags;          /* defined in tty.h */
+        int                     type;           /* UART type */
+        struct tty_struct       *tty;
+        int                     read_status_mask;
+        int                     ignore_status_mask;
+        int                     timeout;
+        int                     xmit_fifo_size;
+        int                     custom_divisor;
+        int                     x_char; /* xon/xoff character */
+        int                     close_delay;
+        unsigned short          closing_wait;
+        unsigned short          closing_wait2;
+        unsigned long           event;
+        unsigned long           last_active;
+        int                     line;
+        int                     count;      /* # of fd on device */
+        int                     blocked_open; /* # of blocked opens */
+        unsigned char           *xmit_buf;
+        int                     xmit_head;
+        int                     xmit_tail;
+        int                     xmit_cnt;
+        struct work_struct      tqueue;
+        struct work_struct      tqueue_hangup;
+        wait_queue_head_t       open_wait;
+        wait_queue_head_t       close_wait;
+};
+
+
+#define SERIAL_MAGIC 0x5301
+
+/*
+ * The size of the serial xmit buffer is 1 page, or 4096 bytes
+ */
+#define SERIAL_XMIT_SIZE 4096
+
+/*
+ * Events are used to schedule things to happen at timer-interrupt
+ * time, instead of at rs interrupt time.
+ */
+#define RS_EVENT_WRITE_WAKEUP   0
+
+/* 
+ * Define the number of ports supported and their irqs.
+ */
+#ifndef CONFIG_68328_SERIAL_UART2
+#define NR_PORTS 1
+#define UART_IRQ_DEFNS {UART_IRQ_NUM}
+#else
+#define NR_PORTS 2
+#define UART_IRQ_DEFNS {UART1_IRQ_NUM, UART2_IRQ_NUM}
+#endif
+
+#endif /* __KERNEL__ */
+#endif /* !(_MC683XX_SERIAL_H) */
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
new file mode 100644
index 000000000000..f148022b6b4e
--- /dev/null
+++ b/drivers/serial/68360serial.c
@@ -0,0 +1,3027 @@
+/*
+ *  UART driver for 68360 CPM SCC or SMC
+ *  Copyright (c) 2000 D. Jeff Dionne <jeff@uclinux.org>,
+ *  Copyright (c) 2000 Michael Leslie <mleslie@lineo.ca>
+ *  Copyright (c) 1997 Dan Malek <dmalek@jlc.net>
+ *
+ * I used the serial.c driver as the framework for this driver.
+ * Give credit to those guys.
+ * The original code was written for the MBX860 board.  I tried to make
+ * it generic, but there may be some assumptions in the structures that
+ * have to be fixed later.
+ * To save porting time, I did not bother to change any object names
+ * that are not accessed outside of this file.
+ * It still needs lots of work........When it was easy, I included code
+ * to support the SCCs, but this has never been tested, nor is it complete.
+ * Only the SCCs support modem control, so that is not complete either.
+ *
+ * This module exports the following rs232 io functions:
+ *
+ *      int rs_360_init(void);
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial.h>
+#include <linux/serialP.h> 
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/fcntl.h>
+#include <linux/ptrace.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <asm/irq.h>
+#include <asm/m68360.h>
+#include <asm/commproc.h>
+
+ 
+#ifdef CONFIG_KGDB
+extern void breakpoint(void);
+extern void set_debug_traps(void);
+extern int  kgdb_output_string (const char* s, unsigned int count);
+#endif
+
+
+/* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */
+#include <linux/console.h>
+
+/* this defines the index into rs_table for the port to use
+ */
+#ifndef CONFIG_SERIAL_CONSOLE_PORT
+#define CONFIG_SERIAL_CONSOLE_PORT      1 /* ie SMC2 - note USE_SMC2 must be defined */
+#endif
+/* #endif */
+
+#if 0
+/* SCC2 for console
+ */
+#undef CONFIG_SERIAL_CONSOLE_PORT
+#define CONFIG_SERIAL_CONSOLE_PORT      2
+#endif
+
+
+#define TX_WAKEUP       ASYNC_SHARE_IRQ
+
+static char *serial_name = "CPM UART driver";
+static char *serial_version = "0.03";
+
+static struct tty_driver *serial_driver;
+int serial_console_setup(struct console *co, char *options);
+
+/*
+ * Serial driver configuration section.  Here are the various options:
+ */
+#define SERIAL_PARANOIA_CHECK
+#define CONFIG_SERIAL_NOPAUSE_IO
+#define SERIAL_DO_RESTART
+
+/* Set of debugging defines */
+
+#undef SERIAL_DEBUG_INTR
+#undef SERIAL_DEBUG_OPEN
+#undef SERIAL_DEBUG_FLOW
+#undef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+
+#define _INLINE_ inline
+  
+#define DBG_CNT(s)
+
+/* We overload some of the items in the data structure to meet our
+ * needs.  For example, the port address is the CPM parameter ram
+ * offset for the SCC or SMC.  The maximum number of ports is 4 SCCs and
+ * 2 SMCs.  The "hub6" field is used to indicate the channel number, with
+ * a flag indicating SCC or SMC, and the number is used as an index into
+ * the CPM parameter area for this device.
+ * The "type" field is currently set to 0, for PORT_UNKNOWN.  It is
+ * not currently used.  I should probably use it to indicate the port
+ * type of SMC or SCC.
+ * The SMCs do not support any modem control signals.
+ */
+#define smc_scc_num     hub6
+#define NUM_IS_SCC      ((int)0x00010000)
+#define PORT_NUM(P)     ((P) & 0x0000ffff)
+
+
+#if defined (CONFIG_UCQUICC)
+
+volatile extern void *_periph_base;
+/* sipex transceiver
+ *   mode bits for       are on pins
+ *
+ *    SCC2                d16..19
+ *    SCC3                d20..23
+ *    SCC4                d24..27
+ */
+#define SIPEX_MODE(n,m) ((m & 0x0f)<<(16+4*(n-1)))
+
+static uint sipex_mode_bits = 0x00000000;
+
+#endif
+
+/* There is no `serial_state' defined back here in 2.0.
+ * Try to get by with serial_struct
+ */
+/* #define serial_state serial_struct */
+
+/* 2.4 -> 2.0 portability problem: async_icount in 2.4 has a few
+ * extras: */
+
+#if 0
+struct async_icount_24 {
+        __u32   cts, dsr, rng, dcd, tx, rx;
+        __u32   frame, parity, overrun, brk;
+        __u32   buf_overrun;
+} icount;
+#endif
+
+#if 0
+
+struct serial_state {
+        int     magic;
+        int     baud_base;
+        unsigned long   port;
+        int     irq;
+        int     flags;
+        int     hub6;
+        int     type;
+        int     line;
+        int     revision;       /* Chip revision (950) */
+        int     xmit_fifo_size;
+        int     custom_divisor;
+        int     count;
+        u8      *iomem_base;
+        u16     iomem_reg_shift;
+        unsigned short  close_delay;
+        unsigned short  closing_wait; /* time to wait before closing */
+        struct async_icount_24     icount; 
+        int     io_type;
+        struct async_struct *info;
+};
+#endif
+
+#define SSTATE_MAGIC 0x5302
+
+
+
+/* SMC2 is sometimes used for low performance TDM interfaces.  Define
+ * this as 1 if you want SMC2 as a serial port UART managed by this driver.
+ * Define this as 0 if you wish to use SMC2 for something else.
+ */
+#define USE_SMC2 1
+
+#if 0
+/* Define SCC to ttySx mapping. */
+#define SCC_NUM_BASE    (USE_SMC2 + 1)  /* SCC base tty "number" */
+
+/* Define which SCC is the first one to use for a serial port.  These
+ * are 0-based numbers, i.e. this assumes the first SCC (SCC1) is used
+ * for Ethernet, and the first available SCC for serial UART is SCC2.
+ * NOTE:  IF YOU CHANGE THIS, you have to change the PROFF_xxx and
+ * interrupt vectors in the table below to match.
+ */
+#define SCC_IDX_BASE    1       /* table index */
+#endif
+
+
+/* Processors other than the 860 only get SMCs configured by default.
+ * Either they don't have SCCs or they are allocated somewhere else.
+ * Of course, there are now 860s without some SCCs, so we will need to
+ * address that someday.
+ * The Embedded Planet Multimedia I/O cards use TDM interfaces to the
+ * stereo codec parts, and we use SMC2 to help support that.
+ */
+static struct serial_state rs_table[] = {
+/*  type   line   PORT           IRQ       FLAGS  smc_scc_num (F.K.A. hub6) */
+        {  0,     0, PRSLOT_SMC1, CPMVEC_SMC1,   0,    0 }    /* SMC1 ttyS0 */
+#if USE_SMC2
+        ,{ 0,     0, PRSLOT_SMC2, CPMVEC_SMC2,   0,    1 }     /* SMC2 ttyS1 */
+#endif
+
+#if defined(CONFIG_SERIAL_68360_SCC)
+        ,{ 0,     0, PRSLOT_SCC2, CPMVEC_SCC2,   0, (NUM_IS_SCC | 1) }    /* SCC2 ttyS2 */
+        ,{ 0,     0, PRSLOT_SCC3, CPMVEC_SCC3,   0, (NUM_IS_SCC | 2) }    /* SCC3 ttyS3 */
+        ,{ 0,     0, PRSLOT_SCC4, CPMVEC_SCC4,   0, (NUM_IS_SCC | 3) }    /* SCC4 ttyS4 */
+#endif
+};
+
+#define NR_PORTS        (sizeof(rs_table)/sizeof(struct serial_state))
+
+/* The number of buffer descriptors and their sizes.
+ */
+#define RX_NUM_FIFO     4
+#define RX_BUF_SIZE     32
+#define TX_NUM_FIFO     4
+#define TX_BUF_SIZE     32
+
+#define CONSOLE_NUM_FIFO 2
+#define CONSOLE_BUF_SIZE 4
+
+char *console_fifos[CONSOLE_NUM_FIFO * CONSOLE_BUF_SIZE];
+
+/* The async_struct in serial.h does not really give us what we
+ * need, so define our own here.
+ */
+typedef struct serial_info {
+        int                     magic;
+        int                     flags;
+
+        struct serial_state     *state;
+        /* struct serial_struct *state; */
+        /* struct async_struct  *state; */
+        
+        struct tty_struct       *tty;
+        int                     read_status_mask;
+        int                     ignore_status_mask;
+        int                     timeout;
+        int                     line;
+        int                     x_char; /* xon/xoff character */
+        int                     close_delay;
+        unsigned short          closing_wait;
+        unsigned short          closing_wait2;
+        unsigned long           event;
+        unsigned long           last_active;
+        int                     blocked_open; /* # of blocked opens */
+        struct work_struct      tqueue;
+        struct work_struct      tqueue_hangup;
+        wait_queue_head_t       open_wait; 
+        wait_queue_head_t       close_wait; 
+
+        
+/* CPM Buffer Descriptor pointers.
+        */
+        QUICC_BD                        *rx_bd_base;
+        QUICC_BD                        *rx_cur;
+        QUICC_BD                        *tx_bd_base;
+        QUICC_BD                        *tx_cur;
+} ser_info_t;
+
+
+/* since kmalloc_init() does not get called until much after this initialization: */
+static ser_info_t  quicc_ser_info[NR_PORTS];
+static char rx_buf_pool[NR_PORTS * RX_NUM_FIFO * RX_BUF_SIZE];
+static char tx_buf_pool[NR_PORTS * TX_NUM_FIFO * TX_BUF_SIZE];
+
+static void change_speed(ser_info_t *info);
+static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout);
+
+static inline int serial_paranoia_check(ser_info_t *info,
+                                        char *name, const char *routine)
+{
+#ifdef SERIAL_PARANOIA_CHECK
+        static const char *badmagic =
+                "Warning: bad magic number for serial struct (%s) in %s\n";
+        static const char *badinfo =
+                "Warning: null async_struct for (%s) in %s\n";
+
+        if (!info) {
+                printk(badinfo, name, routine);
+                return 1;
+        }
+        if (info->magic != SERIAL_MAGIC) {
+                printk(badmagic, name, routine);
+                return 1;
+        }
+#endif
+        return 0;
+}
+
+/*
+ * This is used to figure out the divisor speeds and the timeouts,
+ * indexed by the termio value.  The generic CPM functions are responsible
+ * for setting and assigning baud rate generators for us.
+ */
+static int baud_table[] = {
+        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
+        9600, 19200, 38400, 57600, 115200, 230400, 460800, 0 };
+
+/* This sucks. There is a better way: */
+#if defined(CONFIG_CONSOLE_9600)
+  #define CONSOLE_BAUDRATE 9600
+#elif defined(CONFIG_CONSOLE_19200)
+  #define CONSOLE_BAUDRATE 19200
+#elif defined(CONFIG_CONSOLE_115200)
+  #define CONSOLE_BAUDRATE 115200
+#else
+  #warning "console baud rate undefined"
+  #define CONSOLE_BAUDRATE 9600
+#endif
+
+/*
+ * ------------------------------------------------------------
+ * rs_stop() and rs_start()
+ *
+ * This routines are called before setting or resetting tty->stopped.
+ * They enable or disable transmitter interrupts, as necessary.
+ * ------------------------------------------------------------
+ */
+static void rs_360_stop(struct tty_struct *tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        int     idx;
+        unsigned long flags;
+        volatile struct scc_regs *sccp;
+        volatile struct smc_regs *smcp;
+
+        if (serial_paranoia_check(info, tty->name, "rs_stop"))
+                return;
+        
+        local_irq_save(flags);
+        idx = PORT_NUM(info->state->smc_scc_num);
+        if (info->state->smc_scc_num & NUM_IS_SCC) {
+                sccp = &pquicc->scc_regs[idx];
+                sccp->scc_sccm &= ~UART_SCCM_TX;
+        } else {
+                /* smcp = &cpmp->cp_smc[idx]; */
+                smcp = &pquicc->smc_regs[idx];
+                smcp->smc_smcm &= ~SMCM_TX;
+        }
+        local_irq_restore(flags);
+}
+
+
+static void rs_360_start(struct tty_struct *tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        int     idx;
+        unsigned long flags;
+        volatile struct scc_regs *sccp;
+        volatile struct smc_regs *smcp;
+
+        if (serial_paranoia_check(info, tty->name, "rs_stop"))
+                return;
+        
+        local_irq_save(flags);
+        idx = PORT_NUM(info->state->smc_scc_num);
+        if (info->state->smc_scc_num & NUM_IS_SCC) {
+                sccp = &pquicc->scc_regs[idx];
+                sccp->scc_sccm |= UART_SCCM_TX;
+        } else {
+                smcp = &pquicc->smc_regs[idx];
+                smcp->smc_smcm |= SMCM_TX;
+        }
+        local_irq_restore(flags);
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * Here starts the interrupt handling routines.  All of the following
+ * subroutines are declared as inline and are folded into
+ * rs_interrupt().  They were separated out for readability's sake.
+ *
+ * Note: rs_interrupt() is a "fast" interrupt, which means that it
+ * runs with interrupts turned off.  People who may want to modify
+ * rs_interrupt() should try to keep the interrupt handler as fast as
+ * possible.  After you are done making modifications, it is not a bad
+ * idea to do:
+ * 
+ * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
+ *
+ * and look at the resulting assemble code in serial.s.
+ *
+ *                              - Ted Ts'o (tytso@mit.edu), 7-Mar-93
+ * -----------------------------------------------------------------------
+ */
+
+static _INLINE_ void receive_chars(ser_info_t *info)
+{
+        struct tty_struct *tty = info->tty;
+        unsigned char ch, *cp;
+        /*int   ignored = 0;*/
+        int     i;
+        ushort  status;
+         struct async_icount *icount; 
+        /* struct       async_icount_24 *icount; */
+        volatile QUICC_BD       *bdp;
+
+        icount = &info->state->icount;
+
+        /* Just loop through the closed BDs and copy the characters into
+         * the buffer.
+         */
+        bdp = info->rx_cur;
+        for (;;) {
+                if (bdp->status & BD_SC_EMPTY)  /* If this one is empty */
+                        break;                  /*   we are all done */
+
+                /* The read status mask tell us what we should do with
+                 * incoming characters, especially if errors occur.
+                 * One special case is the use of BD_SC_EMPTY.  If
+                 * this is not set, we are supposed to be ignoring
+                 * inputs.  In this case, just mark the buffer empty and
+                 * continue.
+                 */
+                if (!(info->read_status_mask & BD_SC_EMPTY)) {
+                        bdp->status |= BD_SC_EMPTY;
+                        bdp->status &=
+                                ~(BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV);
+
+                        if (bdp->status & BD_SC_WRAP)
+                                bdp = info->rx_bd_base;
+                        else
+                                bdp++;
+                        continue;
+                }
+
+                /* Get the number of characters and the buffer pointer.
+                */
+                i = bdp->length;
+                /* cp = (unsigned char *)__va(bdp->buf); */
+                cp = (char *)bdp->buf;
+                status = bdp->status;
+
+                /* Check to see if there is room in the tty buffer for
+                 * the characters in our BD buffer.  If not, we exit
+                 * now, leaving the BD with the characters.  We'll pick
+                 * them up again on the next receive interrupt (which could
+                 * be a timeout).
+                 */
+                if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE)
+                        break;
+
+                while (i-- > 0) {
+                        ch = *cp++;
+                        *tty->flip.char_buf_ptr = ch;
+                        icount->rx++;
+
+#ifdef SERIAL_DEBUG_INTR
+                        printk("DR%02x:%02x...", ch, status);
+#endif
+                        *tty->flip.flag_buf_ptr = 0;
+                        if (status & (BD_SC_BR | BD_SC_FR |
+                                       BD_SC_PR | BD_SC_OV)) {
+                                /*
+                                 * For statistics only
+                                 */
+                                if (status & BD_SC_BR)
+                                        icount->brk++;
+                                else if (status & BD_SC_PR)
+                                        icount->parity++;
+                                else if (status & BD_SC_FR)
+                                        icount->frame++;
+                                if (status & BD_SC_OV)
+                                        icount->overrun++;
+
+                                /*
+                                 * Now check to see if character should be
+                                 * ignored, and mask off conditions which
+                                 * should be ignored.
+                                if (status & info->ignore_status_mask) {
+                                        if (++ignored > 100)
+                                                break;
+                                        continue;
+                                }
+                                 */
+                                status &= info->read_status_mask;
+                
+                                if (status & (BD_SC_BR)) {
+#ifdef SERIAL_DEBUG_INTR
+                                        printk("handling break....");
+#endif
+                                        *tty->flip.flag_buf_ptr = TTY_BREAK;
+                                        if (info->flags & ASYNC_SAK)
+                                                do_SAK(tty);
+                                } else if (status & BD_SC_PR)
+                                        *tty->flip.flag_buf_ptr = TTY_PARITY;
+                                else if (status & BD_SC_FR)
+                                        *tty->flip.flag_buf_ptr = TTY_FRAME;
+                                if (status & BD_SC_OV) {
+                                        /*
+                                         * Overrun is special, since it's
+                                         * reported immediately, and doesn't
+                                         * affect the current character
+                                         */
+                                        if (tty->flip.count < TTY_FLIPBUF_SIZE) {
+                                                tty->flip.count++;
+                                                tty->flip.flag_buf_ptr++;
+                                                tty->flip.char_buf_ptr++;
+                                                *tty->flip.flag_buf_ptr =
+                                                                TTY_OVERRUN;
+                                        }
+                                }
+                        }
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                break;
+
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+
+                /* This BD is ready to be used again.  Clear status.
+                 * Get next BD.
+                 */
+                bdp->status |= BD_SC_EMPTY;
+                bdp->status &= ~(BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV);
+
+                if (bdp->status & BD_SC_WRAP)
+                        bdp = info->rx_bd_base;
+                else
+                        bdp++;
+        }
+
+        info->rx_cur = (QUICC_BD *)bdp;
+
+        schedule_work(&tty->flip.work);
+}
+
+static _INLINE_ void receive_break(ser_info_t *info)
+{
+        struct tty_struct *tty = info->tty;
+
+        info->state->icount.brk++;
+        /* Check to see if there is room in the tty buffer for
+         * the break.  If not, we exit now, losing the break.  FIXME
+         */
+        if ((tty->flip.count + 1) >= TTY_FLIPBUF_SIZE)
+                return;
+        *(tty->flip.flag_buf_ptr++) = TTY_BREAK;
+        *(tty->flip.char_buf_ptr++) = 0;
+        tty->flip.count++;
+
+        schedule_work(&tty->flip.work);
+}
+
+static _INLINE_ void transmit_chars(ser_info_t *info)
+{
+
+        if ((info->flags & TX_WAKEUP) ||
+            (info->tty->flags & (1 << TTY_DO_WRITE_WAKEUP))) {
+                schedule_work(&info->tqueue);
+        }
+
+#ifdef SERIAL_DEBUG_INTR
+        printk("THRE...");
+#endif
+}
+
+#ifdef notdef
+        /* I need to do this for the SCCs, so it is left as a reminder.
+        */
+static _INLINE_ void check_modem_status(struct async_struct *info)
+{
+        int     status;
+        /* struct       async_icount *icount; */
+        struct  async_icount_24 *icount;
+        
+        status = serial_in(info, UART_MSR);
+
+        if (status & UART_MSR_ANY_DELTA) {
+                icount = &info->state->icount;
+                /* update input line counters */
+                if (status & UART_MSR_TERI)
+                        icount->rng++;
+                if (status & UART_MSR_DDSR)
+                        icount->dsr++;
+                if (status & UART_MSR_DDCD) {
+                        icount->dcd++;
+#ifdef CONFIG_HARD_PPS
+                        if ((info->flags & ASYNC_HARDPPS_CD) &&
+                            (status & UART_MSR_DCD))
+                                hardpps();
+#endif
+                }
+                if (status & UART_MSR_DCTS)
+                        icount->cts++;
+                wake_up_interruptible(&info->delta_msr_wait);
+        }
+
+        if ((info->flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
+#if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
+                printk("ttys%d CD now %s...", info->line,
+                       (status & UART_MSR_DCD) ? "on" : "off");
+#endif          
+                if (status & UART_MSR_DCD)
+                        wake_up_interruptible(&info->open_wait);
+                else {
+#ifdef SERIAL_DEBUG_OPEN
+                        printk("scheduling hangup...");
+#endif
+                        queue_task(&info->tqueue_hangup,
+                                           &tq_scheduler);
+                }
+        }
+        if (info->flags & ASYNC_CTS_FLOW) {
+                if (info->tty->hw_stopped) {
+                        if (status & UART_MSR_CTS) {
+#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
+                                printk("CTS tx start...");
+#endif
+                                info->tty->hw_stopped = 0;
+                                info->IER |= UART_IER_THRI;
+                                serial_out(info, UART_IER, info->IER);
+                                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
+                                return;
+                        }
+                } else {
+                        if (!(status & UART_MSR_CTS)) {
+#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
+                                printk("CTS tx stop...");
+#endif
+                                info->tty->hw_stopped = 1;
+                                info->IER &= ~UART_IER_THRI;
+                                serial_out(info, UART_IER, info->IER);
+                        }
+                }
+        }
+}
+#endif
+
+/*
+ * This is the serial driver's interrupt routine for a single port
+ */
+/* static void rs_360_interrupt(void *dev_id) */ /* until and if we start servicing irqs here */
+static void rs_360_interrupt(int vec, void *dev_id, struct pt_regs *fp)
+{
+        u_char  events;
+        int     idx;
+        ser_info_t *info;
+        volatile struct smc_regs *smcp;
+        volatile struct scc_regs *sccp;
+        
+        info = (ser_info_t *)dev_id;
+
+        idx = PORT_NUM(info->state->smc_scc_num);
+        if (info->state->smc_scc_num & NUM_IS_SCC) {
+                sccp = &pquicc->scc_regs[idx];
+                events = sccp->scc_scce;
+                if (events & SCCM_RX)
+                        receive_chars(info);
+                if (events & SCCM_TX)
+                        transmit_chars(info);
+                sccp->scc_scce = events;
+        } else {
+                smcp = &pquicc->smc_regs[idx];
+                events = smcp->smc_smce;
+                if (events & SMCM_BRKE)
+                        receive_break(info);
+                if (events & SMCM_RX)
+                        receive_chars(info);
+                if (events & SMCM_TX)
+                        transmit_chars(info);
+                smcp->smc_smce = events;
+        }
+        
+#ifdef SERIAL_DEBUG_INTR
+        printk("rs_interrupt_single(%d, %x)...",
+                                        info->state->smc_scc_num, events);
+#endif
+#ifdef modem_control
+        check_modem_status(info);
+#endif
+        info->last_active = jiffies;
+#ifdef SERIAL_DEBUG_INTR
+        printk("end.\n");
+#endif
+}
+
+
+/*
+ * -------------------------------------------------------------------
+ * Here ends the serial interrupt routines.
+ * -------------------------------------------------------------------
+ */
+
+
+static void do_softint(void *private_)
+{
+        ser_info_t      *info = (ser_info_t *) private_;
+        struct tty_struct       *tty;
+        
+        tty = info->tty;
+        if (!tty)
+                return;
+
+        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
+                tty_wakeup(tty);
+}
+
+
+/*
+ * This routine is called from the scheduler tqueue when the interrupt
+ * routine has signalled that a hangup has occurred.  The path of
+ * hangup processing is:
+ *
+ *      serial interrupt routine -> (scheduler tqueue) ->
+ *      do_serial_hangup() -> tty->hangup() -> rs_hangup()
+ * 
+ */
+static void do_serial_hangup(void *private_)
+{
+        struct async_struct     *info = (struct async_struct *) private_;
+        struct tty_struct       *tty;
+        
+        tty = info->tty;
+        if (!tty)
+                return;
+
+        tty_hangup(tty);
+}
+
+
+static int startup(ser_info_t *info)
+{
+        unsigned long flags;
+        int     retval=0;
+        int     idx;
+        /*struct serial_state *state = info->state;*/
+        volatile struct smc_regs *smcp;
+        volatile struct scc_regs *sccp;
+        volatile struct smc_uart_pram   *up;
+        volatile struct uart_pram           *scup;
+
+
+        local_irq_save(flags);
+
+        if (info->flags & ASYNC_INITIALIZED) {
+                goto errout;
+        }
+
+#ifdef maybe
+        if (!state->port || !state->type) {
+                if (info->tty)
+                        set_bit(TTY_IO_ERROR, &info->tty->flags);
+                goto errout;
+        }
+#endif
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("starting up ttys%d (irq %d)...", info->line, state->irq);
+#endif
+
+
+#ifdef modem_control
+        info->MCR = 0;
+        if (info->tty->termios->c_cflag & CBAUD)
+                info->MCR = UART_MCR_DTR | UART_MCR_RTS;
+#endif
+        
+        if (info->tty)
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        /*
+         * and set the speed of the serial port
+         */
+        change_speed(info);
+
+        idx = PORT_NUM(info->state->smc_scc_num);
+        if (info->state->smc_scc_num & NUM_IS_SCC) {
+                sccp = &pquicc->scc_regs[idx];
+                scup = &pquicc->pram[info->state->port].scc.pscc.u;
+
+                scup->mrblr = RX_BUF_SIZE;
+                scup->max_idl = RX_BUF_SIZE;
+
+                sccp->scc_sccm |= (UART_SCCM_TX | UART_SCCM_RX);
+                sccp->scc_gsmr.w.low |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+
+        } else {
+                smcp = &pquicc->smc_regs[idx];
+
+                /* Enable interrupts and I/O.
+                */
+                smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
+                smcp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
+
+                /* We can tune the buffer length and idle characters
+                 * to take advantage of the entire incoming buffer size.
+                 * If mrblr is something other than 1, maxidl has to be
+                 * non-zero or we never get an interrupt.  The maxidl
+                 * is the number of character times we wait after reception
+                 * of the last character before we decide no more characters
+                 * are coming.
+                 */
+                /* up = (smc_uart_t *)&pquicc->cp_dparam[state->port]; */
+                /* holy unionized structures, Batman: */
+                up = &pquicc->pram[info->state->port].scc.pothers.idma_smc.psmc.u;
+
+                up->mrblr = RX_BUF_SIZE;
+                up->max_idl = RX_BUF_SIZE;
+
+                up->brkcr = 1;  /* number of break chars */
+        }
+
+        info->flags |= ASYNC_INITIALIZED;
+        local_irq_restore(flags);
+        return 0;
+        
+errout:
+        local_irq_restore(flags);
+        return retval;
+}
+
+/*
+ * This routine will shutdown a serial port; interrupts are disabled, and
+ * DTR is dropped if the hangup on close termio flag is on.
+ */
+static void shutdown(ser_info_t *info)
+{
+        unsigned long   flags;
+        struct serial_state *state;
+        int             idx;
+        volatile struct smc_regs        *smcp;
+        volatile struct scc_regs        *sccp;
+
+        if (!(info->flags & ASYNC_INITIALIZED))
+                return;
+
+        state = info->state;
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("Shutting down serial port %d (irq %d)....", info->line,
+               state->irq);
+#endif
+        
+        local_irq_save(flags);
+
+        idx = PORT_NUM(state->smc_scc_num);
+        if (state->smc_scc_num & NUM_IS_SCC) {
+                sccp = &pquicc->scc_regs[idx];
+                sccp->scc_gsmr.w.low &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+#ifdef CONFIG_SERIAL_CONSOLE
+                /* We can't disable the transmitter if this is the
+                 * system console.
+                 */
+                if ((state - rs_table) != CONFIG_SERIAL_CONSOLE_PORT)
+#endif
+                sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
+        } else {
+                smcp = &pquicc->smc_regs[idx];
+
+                /* Disable interrupts and I/O.
+                 */
+                smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
+#ifdef CONFIG_SERIAL_CONSOLE
+                /* We can't disable the transmitter if this is the
+                 * system console.
+                 */
+                if ((state - rs_table) != CONFIG_SERIAL_CONSOLE_PORT)
+#endif
+                        smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        }
+        
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        info->flags &= ~ASYNC_INITIALIZED;
+        local_irq_restore(flags);
+}
+
+/*
+ * This routine is called to set the UART divisor registers to match
+ * the specified baud rate for a serial port.
+ */
+static void change_speed(ser_info_t *info)
+{
+        int     baud_rate;
+        unsigned cflag, cval, scval, prev_mode;
+        int     i, bits, sbits, idx;
+        unsigned long   flags;
+        struct serial_state *state;
+        volatile struct smc_regs        *smcp;
+        volatile struct scc_regs        *sccp;
+
+        if (!info->tty || !info->tty->termios)
+                return;
+        cflag = info->tty->termios->c_cflag;
+
+        state = info->state;
+
+        /* Character length programmed into the mode register is the
+         * sum of: 1 start bit, number of data bits, 0 or 1 parity bit,
+         * 1 or 2 stop bits, minus 1.
+         * The value 'bits' counts this for us.
+         */
+        cval = 0;
+        scval = 0;
+
+        /* byte size and parity */
+        switch (cflag & CSIZE) {
+              case CS5: bits = 5; break;
+              case CS6: bits = 6; break;
+              case CS7: bits = 7; break;
+              case CS8: bits = 8; break;
+              /* Never happens, but GCC is too dumb to figure it out */
+              default:  bits = 8; break;
+        }
+        sbits = bits - 5;
+
+        if (cflag & CSTOPB) {
+                cval |= SMCMR_SL;       /* Two stops */
+                scval |= SCU_PMSR_SL;
+                bits++;
+        }
+        if (cflag & PARENB) {
+                cval |= SMCMR_PEN;
+                scval |= SCU_PMSR_PEN;
+                bits++;
+        }
+        if (!(cflag & PARODD)) {
+                cval |= SMCMR_PM_EVEN;
+                scval |= (SCU_PMSR_REVP | SCU_PMSR_TEVP);
+        }
+
+        /* Determine divisor based on baud rate */
+        i = cflag & CBAUD;
+        if (i >= (sizeof(baud_table)/sizeof(int)))
+                baud_rate = 9600;
+        else
+                baud_rate = baud_table[i];
+
+        info->timeout = (TX_BUF_SIZE*HZ*bits);
+        info->timeout += HZ/50;         /* Add .02 seconds of slop */
+
+#ifdef modem_control
+        /* CTS flow control flag and modem status interrupts */
+        info->IER &= ~UART_IER_MSI;
+        if (info->flags & ASYNC_HARDPPS_CD)
+                info->IER |= UART_IER_MSI;
+        if (cflag & CRTSCTS) {
+                info->flags |= ASYNC_CTS_FLOW;
+                info->IER |= UART_IER_MSI;
+        } else
+                info->flags &= ~ASYNC_CTS_FLOW;
+        if (cflag & CLOCAL)
+                info->flags &= ~ASYNC_CHECK_CD;
+        else {
+                info->flags |= ASYNC_CHECK_CD;
+                info->IER |= UART_IER_MSI;
+        }
+        serial_out(info, UART_IER, info->IER);
+#endif
+
+        /*
+         * Set up parity check flag
+         */
+#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
+
+        info->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
+        if (I_INPCK(info->tty))
+                info->read_status_mask |= BD_SC_FR | BD_SC_PR;
+        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+                info->read_status_mask |= BD_SC_BR;
+        
+        /*
+         * Characters to ignore
+         */
+        info->ignore_status_mask = 0;
+        if (I_IGNPAR(info->tty))
+                info->ignore_status_mask |= BD_SC_PR | BD_SC_FR;
+        if (I_IGNBRK(info->tty)) {
+                info->ignore_status_mask |= BD_SC_BR;
+                /*
+                 * If we're ignore parity and break indicators, ignore 
+                 * overruns too.  (For real raw support).
+                 */
+                if (I_IGNPAR(info->tty))
+                        info->ignore_status_mask |= BD_SC_OV;
+        }
+        /*
+         * !!! ignore all characters if CREAD is not set
+         */
+        if ((cflag & CREAD) == 0)
+         info->read_status_mask &= ~BD_SC_EMPTY;
+         local_irq_save(flags);
+
+         /* Start bit has not been added (so don't, because we would just
+          * subtract it later), and we need to add one for the number of
+          * stops bits (there is always at least one).
+          */
+         bits++;
+         idx = PORT_NUM(state->smc_scc_num);
+         if (state->smc_scc_num & NUM_IS_SCC) {
+         sccp = &pquicc->scc_regs[idx];
+         sccp->scc_psmr = (sbits << 12) | scval;
+     } else {
+         smcp = &pquicc->smc_regs[idx];
+
+                /* Set the mode register.  We want to keep a copy of the
+                 * enables, because we want to put them back if they were
+                 * present.
+                 */
+                prev_mode = smcp->smc_smcmr;
+                smcp->smc_smcmr = smcr_mk_clen(bits) | cval |  SMCMR_SM_UART;
+                smcp->smc_smcmr |= (prev_mode & (SMCMR_REN | SMCMR_TEN));
+        }
+
+        m360_cpm_setbrg((state - rs_table), baud_rate);
+
+        local_irq_restore(flags);
+}
+
+static void rs_360_put_char(struct tty_struct *tty, unsigned char ch)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        volatile QUICC_BD       *bdp;
+
+        if (serial_paranoia_check(info, tty->name, "rs_put_char"))
+                return;
+
+        if (!tty)
+                return;
+
+        bdp = info->tx_cur;
+        while (bdp->status & BD_SC_READY);
+
+        /* *((char *)__va(bdp->buf)) = ch; */
+        *((char *)bdp->buf) = ch;
+        bdp->length = 1;
+        bdp->status |= BD_SC_READY;
+
+        /* Get next BD.
+        */
+        if (bdp->status & BD_SC_WRAP)
+                bdp = info->tx_bd_base;
+        else
+                bdp++;
+
+        info->tx_cur = (QUICC_BD *)bdp;
+
+}
+
+static int rs_360_write(struct tty_struct * tty,
+                    const unsigned char *buf, int count)
+{
+        int     c, ret = 0;
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        volatile QUICC_BD *bdp;
+
+#ifdef CONFIG_KGDB
+        /* Try to let stub handle output. Returns true if it did. */ 
+        if (kgdb_output_string(buf, count))
+                return ret;
+#endif
+
+        if (serial_paranoia_check(info, tty->name, "rs_write"))
+                return 0;
+
+        if (!tty) 
+                return 0;
+
+        bdp = info->tx_cur;
+
+        while (1) {
+                c = min(count, TX_BUF_SIZE);
+
+                if (c <= 0)
+                        break;
+
+                if (bdp->status & BD_SC_READY) {
+                        info->flags |= TX_WAKEUP;
+                        break;
+                }
+
+                /* memcpy(__va(bdp->buf), buf, c); */
+                memcpy((void *)bdp->buf, buf, c);
+
+                bdp->length = c;
+                bdp->status |= BD_SC_READY;
+
+                buf += c;
+                count -= c;
+                ret += c;
+
+                /* Get next BD.
+                */
+                if (bdp->status & BD_SC_WRAP)
+                        bdp = info->tx_bd_base;
+                else
+                        bdp++;
+                info->tx_cur = (QUICC_BD *)bdp;
+        }
+        return ret;
+}
+
+static int rs_360_write_room(struct tty_struct *tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        int     ret;
+
+        if (serial_paranoia_check(info, tty->name, "rs_write_room"))
+                return 0;
+
+        if ((info->tx_cur->status & BD_SC_READY) == 0) {
+                info->flags &= ~TX_WAKEUP;
+                ret = TX_BUF_SIZE;
+        }
+        else {
+                info->flags |= TX_WAKEUP;
+                ret = 0;
+        }
+        return ret;
+}
+
+/* I could track this with transmit counters....maybe later.
+*/
+static int rs_360_chars_in_buffer(struct tty_struct *tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+                                
+        if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
+                return 0;
+        return 0;
+}
+
+static void rs_360_flush_buffer(struct tty_struct *tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+                                
+        if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
+                return;
+
+        /* There is nothing to "flush", whatever we gave the CPM
+         * is on its way out.
+         */
+        tty_wakeup(tty);
+        info->flags &= ~TX_WAKEUP;
+}
+
+/*
+ * This function is used to send a high-priority XON/XOFF character to
+ * the device
+ */
+static void rs_360_send_xchar(struct tty_struct *tty, char ch)
+{
+        volatile QUICC_BD       *bdp;
+
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+
+        if (serial_paranoia_check(info, tty->name, "rs_send_char"))
+                return;
+
+        bdp = info->tx_cur;
+        while (bdp->status & BD_SC_READY);
+
+        /* *((char *)__va(bdp->buf)) = ch; */
+        *((char *)bdp->buf) = ch;
+        bdp->length = 1;
+        bdp->status |= BD_SC_READY;
+
+        /* Get next BD.
+        */
+        if (bdp->status & BD_SC_WRAP)
+                bdp = info->tx_bd_base;
+        else
+                bdp++;
+
+        info->tx_cur = (QUICC_BD *)bdp;
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_throttle()
+ * 
+ * This routine is called by the upper-layer tty layer to signal that
+ * incoming characters should be throttled.
+ * ------------------------------------------------------------
+ */
+static void rs_360_throttle(struct tty_struct * tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+#ifdef SERIAL_DEBUG_THROTTLE
+        char    buf[64];
+        
+        printk("throttle %s: %d....\n", _tty_name(tty, buf),
+               tty->ldisc.chars_in_buffer(tty));
+#endif
+
+        if (serial_paranoia_check(info, tty->name, "rs_throttle"))
+                return;
+        
+        if (I_IXOFF(tty))
+                rs_360_send_xchar(tty, STOP_CHAR(tty));
+
+#ifdef modem_control
+        if (tty->termios->c_cflag & CRTSCTS)
+                info->MCR &= ~UART_MCR_RTS;
+
+        local_irq_disable();
+        serial_out(info, UART_MCR, info->MCR);
+        local_irq_enable();
+#endif
+}
+
+static void rs_360_unthrottle(struct tty_struct * tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+#ifdef SERIAL_DEBUG_THROTTLE
+        char    buf[64];
+        
+        printk("unthrottle %s: %d....\n", _tty_name(tty, buf),
+               tty->ldisc.chars_in_buffer(tty));
+#endif
+
+        if (serial_paranoia_check(info, tty->name, "rs_unthrottle"))
+                return;
+        
+        if (I_IXOFF(tty)) {
+                if (info->x_char)
+                        info->x_char = 0;
+                else
+                        rs_360_send_xchar(tty, START_CHAR(tty));
+        }
+#ifdef modem_control
+        if (tty->termios->c_cflag & CRTSCTS)
+                info->MCR |= UART_MCR_RTS;
+        local_irq_disable();
+        serial_out(info, UART_MCR, info->MCR);
+        local_irq_enable();
+#endif
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_ioctl() and friends
+ * ------------------------------------------------------------
+ */
+
+#ifdef maybe
+/*
+ * get_lsr_info - get line status register info
+ *
+ * Purpose: Let user call ioctl() to get info when the UART physically
+ *          is emptied.  On bus types like RS485, the transmitter must
+ *          release the bus after transmitting. This must be done when
+ *          the transmit shift register is empty, not be done when the
+ *          transmit holding register is empty.  This functionality
+ *          allows an RS485 driver to be written in user space. 
+ */
+static int get_lsr_info(struct async_struct * info, unsigned int *value)
+{
+        unsigned char status;
+        unsigned int result;
+
+        local_irq_disable();
+        status = serial_in(info, UART_LSR);
+        local_irq_enable();
+        result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0);
+        return put_user(result,value);
+}
+#endif
+
+static int rs_360_tiocmget(struct tty_struct *tty, struct file *file)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        unsigned int result = 0;
+#ifdef modem_control
+        unsigned char control, status;
+
+        if (serial_paranoia_check(info, tty->name, __FUNCTION__))
+                return -ENODEV;
+
+        if (tty->flags & (1 << TTY_IO_ERROR))
+                return -EIO;
+
+        control = info->MCR;
+        local_irq_disable();
+        status = serial_in(info, UART_MSR);
+        local_irq_enable();
+        result =  ((control & UART_MCR_RTS) ? TIOCM_RTS : 0)
+                | ((control & UART_MCR_DTR) ? TIOCM_DTR : 0)
+#ifdef TIOCM_OUT1
+                | ((control & UART_MCR_OUT1) ? TIOCM_OUT1 : 0)
+                | ((control & UART_MCR_OUT2) ? TIOCM_OUT2 : 0)
+#endif
+                | ((status  & UART_MSR_DCD) ? TIOCM_CAR : 0)
+                | ((status  & UART_MSR_RI) ? TIOCM_RNG : 0)
+                | ((status  & UART_MSR_DSR) ? TIOCM_DSR : 0)
+                | ((status  & UART_MSR_CTS) ? TIOCM_CTS : 0);
+#endif
+        return result;
+}
+
+static int rs_360_tiocmset(struct tty_struct *tty, struct file *file,
+                           unsigned int set, unsigned int clear)
+{
+#ifdef modem_control
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        unsigned int arg;
+
+        if (serial_paranoia_check(info, tty->name, __FUNCTION__))
+                return -ENODEV;
+
+        if (tty->flags & (1 << TTY_IO_ERROR))
+                return -EIO;
+
+        if (set & TIOCM_RTS)
+                info->mcr |= UART_MCR_RTS;
+        if (set & TIOCM_DTR)
+                info->mcr |= UART_MCR_DTR;
+        if (clear & TIOCM_RTS)
+                info->MCR &= ~UART_MCR_RTS;
+        if (clear & TIOCM_DTR)
+                info->MCR &= ~UART_MCR_DTR;
+
+#ifdef TIOCM_OUT1
+        if (set & TIOCM_OUT1)
+                info->MCR |= UART_MCR_OUT1;
+        if (set & TIOCM_OUT2)
+                info->MCR |= UART_MCR_OUT2;
+        if (clear & TIOCM_OUT1)
+                info->MCR &= ~UART_MCR_OUT1;
+        if (clear & TIOCM_OUT2)
+                info->MCR &= ~UART_MCR_OUT2;
+#endif
+
+        local_irq_disable();
+        serial_out(info, UART_MCR, info->MCR);
+        local_irq_enable();
+#endif
+        return 0;
+}
+
+/* Sending a break is a two step process on the SMC/SCC.  It is accomplished
+ * by sending a STOP TRANSMIT command followed by a RESTART TRANSMIT
+ * command.  We take advantage of the begin/end functions to make this
+ * happen.
+ */
+static ushort   smc_chan_map[] = {
+        CPM_CR_CH_SMC1,
+        CPM_CR_CH_SMC2
+};
+
+static ushort   scc_chan_map[] = {
+        CPM_CR_CH_SCC1,
+        CPM_CR_CH_SCC2,
+        CPM_CR_CH_SCC3,
+        CPM_CR_CH_SCC4
+};
+
+static void begin_break(ser_info_t *info)
+{
+        volatile QUICC *cp;
+        ushort  chan;
+        int     idx;
+
+        cp = pquicc;
+
+        idx = PORT_NUM(info->state->smc_scc_num);
+        if (info->state->smc_scc_num & NUM_IS_SCC)
+                chan = scc_chan_map[idx];
+        else
+                chan = smc_chan_map[idx];
+
+        cp->cp_cr = mk_cr_cmd(chan, CPM_CR_STOP_TX) | CPM_CR_FLG;
+        while (cp->cp_cr & CPM_CR_FLG);
+}
+
+static void end_break(ser_info_t *info)
+{
+        volatile QUICC *cp;
+        ushort  chan;
+        int idx;
+
+        cp = pquicc;
+
+        idx = PORT_NUM(info->state->smc_scc_num);
+        if (info->state->smc_scc_num & NUM_IS_SCC)
+                chan = scc_chan_map[idx];
+        else
+                chan = smc_chan_map[idx];
+
+        cp->cp_cr = mk_cr_cmd(chan, CPM_CR_RESTART_TX) | CPM_CR_FLG;
+        while (cp->cp_cr & CPM_CR_FLG);
+}
+
+/*
+ * This routine sends a break character out the serial port.
+ */
+static void send_break(ser_info_t *info, int duration)
+{
+        set_current_state(TASK_INTERRUPTIBLE);
+#ifdef SERIAL_DEBUG_SEND_BREAK
+        printk("rs_send_break(%d) jiff=%lu...", duration, jiffies);
+#endif
+        begin_break(info);
+        schedule_timeout(duration);
+        end_break(info);
+#ifdef SERIAL_DEBUG_SEND_BREAK
+        printk("done jiffies=%lu\n", jiffies);
+#endif
+}
+
+
+static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
+                    unsigned int cmd, unsigned long arg)
+{
+        int error;
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        int retval;
+        struct async_icount cnow; 
+        /* struct async_icount_24 cnow;*/       /* kernel counter temps */
+        struct serial_icounter_struct *p_cuser; /* user space */
+
+        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
+                return -ENODEV;
+
+        if ((cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
+                if (tty->flags & (1 << TTY_IO_ERROR))
+                    return -EIO;
+        }
+        
+        switch (cmd) {
+                case TCSBRK:    /* SVID version: non-zero arg --> no break */
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        if (signal_pending(current))
+                                return -EINTR;
+                        if (!arg) {
+                                send_break(info, HZ/4); /* 1/4 second */
+                                if (signal_pending(current))
+                                        return -EINTR;
+                        }
+                        return 0;
+                case TCSBRKP:   /* support for POSIX tcsendbreak() */
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        if (signal_pending(current))
+                                return -EINTR;
+                        send_break(info, arg ? arg*(HZ/10) : HZ/4);
+                        if (signal_pending(current))
+                                return -EINTR;
+                        return 0;
+                case TIOCSBRK:
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        begin_break(info);
+                        return 0;
+                case TIOCCBRK:
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        end_break(info);
+                        return 0;
+                case TIOCGSOFTCAR:
+                        /* return put_user(C_CLOCAL(tty) ? 1 : 0, (int *) arg); */
+                        put_user(C_CLOCAL(tty) ? 1 : 0, (int *) arg);
+                        return 0;
+                case TIOCSSOFTCAR:
+                        error = get_user(arg, (unsigned int *) arg); 
+                        if (error)
+                                return error;
+                        tty->termios->c_cflag =
+                                ((tty->termios->c_cflag & ~CLOCAL) |
+                                 (arg ? CLOCAL : 0));
+                        return 0;
+#ifdef maybe
+                case TIOCSERGETLSR: /* Get line status register */
+                        return get_lsr_info(info, (unsigned int *) arg);
+#endif
+                /*
+                 * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
+                 * - mask passed in arg for lines of interest
+                 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
+                 * Caller should use TIOCGICOUNT to see which one it was
+                 */
+                 case TIOCMIWAIT:
+#ifdef modem_control
+                        local_irq_disable();
+                        /* note the counters on entry */
+                        cprev = info->state->icount;
+                        local_irq_enable();
+                        while (1) {
+                                interruptible_sleep_on(&info->delta_msr_wait);
+                                /* see if a signal did it */
+                                if (signal_pending(current))
+                                        return -ERESTARTSYS;
+                                local_irq_disable();
+                                cnow = info->state->icount; /* atomic copy */
+                                local_irq_enable();
+                                if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && 
+                                    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
+                                        return -EIO; /* no change => error */
+                                if ( ((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
+                                     ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
+                                     ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
+                                     ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts)) ) {
+                                        return 0;
+                                }
+                                cprev = cnow;
+                        }
+                        /* NOTREACHED */
+#else
+                        return 0;
+#endif
+
+                /* 
+                 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
+                 * Return: write counters to the user passed counter struct
+                 * NB: both 1->0 and 0->1 transitions are counted except for
+                 *     RI where only 0->1 is counted.
+                 */
+                case TIOCGICOUNT:
+                        local_irq_disable();
+                        cnow = info->state->icount;
+                        local_irq_enable();
+                        p_cuser = (struct serial_icounter_struct *) arg;
+/*                      error = put_user(cnow.cts, &p_cuser->cts); */
+/*                      if (error) return error; */
+/*                      error = put_user(cnow.dsr, &p_cuser->dsr); */
+/*                      if (error) return error; */
+/*                      error = put_user(cnow.rng, &p_cuser->rng); */
+/*                      if (error) return error; */
+/*                      error = put_user(cnow.dcd, &p_cuser->dcd); */
+/*                      if (error) return error; */
+
+                        put_user(cnow.cts, &p_cuser->cts);
+                        put_user(cnow.dsr, &p_cuser->dsr);
+                        put_user(cnow.rng, &p_cuser->rng);
+                        put_user(cnow.dcd, &p_cuser->dcd);
+                        return 0;
+
+                default:
+                        return -ENOIOCTLCMD;
+                }
+        return 0;
+}
+
+/* FIX UP modem control here someday......
+*/
+static void rs_360_set_termios(struct tty_struct *tty, struct termios *old_termios)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+
+        if (   (tty->termios->c_cflag == old_termios->c_cflag)
+            && (   RELEVANT_IFLAG(tty->termios->c_iflag) 
+                == RELEVANT_IFLAG(old_termios->c_iflag)))
+          return;
+
+        change_speed(info);
+
+#ifdef modem_control
+        /* Handle transition to B0 status */
+        if ((old_termios->c_cflag & CBAUD) &&
+            !(tty->termios->c_cflag & CBAUD)) {
+                info->MCR &= ~(UART_MCR_DTR|UART_MCR_RTS);
+                local_irq_disable();
+                serial_out(info, UART_MCR, info->MCR);
+                local_irq_enable();
+        }
+        
+        /* Handle transition away from B0 status */
+        if (!(old_termios->c_cflag & CBAUD) &&
+            (tty->termios->c_cflag & CBAUD)) {
+                info->MCR |= UART_MCR_DTR;
+                if (!tty->hw_stopped ||
+                    !(tty->termios->c_cflag & CRTSCTS)) {
+                        info->MCR |= UART_MCR_RTS;
+                }
+                local_irq_disable();
+                serial_out(info, UART_MCR, info->MCR);
+                local_irq_enable();
+        }
+        
+        /* Handle turning off CRTSCTS */
+        if ((old_termios->c_cflag & CRTSCTS) &&
+            !(tty->termios->c_cflag & CRTSCTS)) {
+                tty->hw_stopped = 0;
+                rs_360_start(tty);
+        }
+#endif
+
+#if 0
+        /*
+         * No need to wake up processes in open wait, since they
+         * sample the CLOCAL flag once, and don't recheck it.
+         * XXX  It's not clear whether the current behavior is correct
+         * or not.  Hence, this may change.....
+         */
+        if (!(old_termios->c_cflag & CLOCAL) &&
+            (tty->termios->c_cflag & CLOCAL))
+                wake_up_interruptible(&info->open_wait);
+#endif
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_close()
+ * 
+ * This routine is called when the serial port gets closed.  First, we
+ * wait for the last remaining data to be sent.  Then, we unlink its
+ * async structure from the interrupt chain if necessary, and we free
+ * that IRQ if nothing is left in the chain.
+ * ------------------------------------------------------------
+ */
+static void rs_360_close(struct tty_struct *tty, struct file * filp)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        /* struct async_state *state; */
+        struct serial_state *state;
+        unsigned long   flags;
+        int             idx;
+        volatile struct smc_regs        *smcp;
+        volatile struct scc_regs        *sccp;
+
+        if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
+                return;
+
+        state = info->state;
+        
+        local_irq_save(flags);
+        
+        if (tty_hung_up_p(filp)) {
+                DBG_CNT("before DEC-hung");
+                local_irq_restore(flags);
+                return;
+        }
+        
+#ifdef SERIAL_DEBUG_OPEN
+        printk("rs_close ttys%d, count = %d\n", info->line, state->count);
+#endif
+        if ((tty->count == 1) && (state->count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  state->count should always
+                 * be one in these conditions.  If it's greater than
+                 * one, we've got real problems, since it means the
+                 * serial port won't be shutdown.
+                 */
+                printk("rs_close: bad serial port count; tty->count is 1, "
+                       "state->count is %d\n", state->count);
+                state->count = 1;
+        }
+        if (--state->count < 0) {
+                printk("rs_close: bad serial port count for ttys%d: %d\n",
+                       info->line, state->count);
+                state->count = 0;
+        }
+        if (state->count) {
+                DBG_CNT("before DEC-2");
+                local_irq_restore(flags);
+                return;
+        }
+        info->flags |= ASYNC_CLOSING;
+        /*
+         * Now we wait for the transmit buffer to clear; and we notify 
+         * the line discipline to only process XON/XOFF characters.
+         */
+        tty->closing = 1;
+        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->closing_wait);
+        /*
+         * At this point we stop accepting input.  To do this, we
+         * disable the receive line status interrupts, and tell the
+         * interrupt driver to stop checking the data ready bit in the
+         * line status register.
+         */
+        info->read_status_mask &= ~BD_SC_EMPTY;
+        if (info->flags & ASYNC_INITIALIZED) {
+
+                idx = PORT_NUM(info->state->smc_scc_num);
+                if (info->state->smc_scc_num & NUM_IS_SCC) {
+                        sccp = &pquicc->scc_regs[idx];
+                        sccp->scc_sccm &= ~UART_SCCM_RX;
+                        sccp->scc_gsmr.w.low &= ~SCC_GSMRL_ENR;
+                } else {
+                        smcp = &pquicc->smc_regs[idx];
+                        smcp->smc_smcm &= ~SMCM_RX;
+                        smcp->smc_smcmr &= ~SMCMR_REN;
+                }
+                /*
+                 * Before we drop DTR, make sure the UART transmitter
+                 * has completely drained; this is especially
+                 * important if there is a transmit FIFO!
+                 */
+                rs_360_wait_until_sent(tty, info->timeout);
+        }
+        shutdown(info);
+        if (tty->driver->flush_buffer)
+                tty->driver->flush_buffer(tty);
+        tty_ldisc_flush(tty);           
+        tty->closing = 0;
+        info->event = 0;
+        info->tty = 0;
+        if (info->blocked_open) {
+                if (info->close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+                }
+                wake_up_interruptible(&info->open_wait);
+        }
+        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&info->close_wait);
+        local_irq_restore(flags);
+}
+
+/*
+ * rs_wait_until_sent() --- wait until the transmitter is empty
+ */
+static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        unsigned long orig_jiffies, char_time;
+        /*int lsr;*/
+        volatile QUICC_BD *bdp;
+        
+        if (serial_paranoia_check(info, tty->name, "rs_wait_until_sent"))
+                return;
+
+#ifdef maybe
+        if (info->state->type == PORT_UNKNOWN)
+                return;
+#endif
+
+        orig_jiffies = jiffies;
+        /*
+         * Set the check interval to be 1/5 of the estimated time to
+         * send a single character, and make it at least 1.  The check
+         * interval should also be less than the timeout.
+         * 
+         * Note: we have to use pretty tight timings here to satisfy
+         * the NIST-PCTS.
+         */
+        char_time = 1;
+        if (timeout)
+                char_time = min(char_time, (unsigned long)timeout);
+#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+        printk("In rs_wait_until_sent(%d) check=%lu...", timeout, char_time);
+        printk("jiff=%lu...", jiffies);
+#endif
+
+        /* We go through the loop at least once because we can't tell
+         * exactly when the last character exits the shifter.  There can
+         * be at least two characters waiting to be sent after the buffers
+         * are empty.
+         */
+        do {
+#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+                printk("lsr = %d (jiff=%lu)...", lsr, jiffies);
+#endif
+/*              current->counter = 0;    make us low-priority */
+                msleep_interruptible(jiffies_to_msecs(char_time));
+                if (signal_pending(current))
+                        break;
+                if (timeout && ((orig_jiffies + timeout) < jiffies))
+                        break;
+                /* The 'tx_cur' is really the next buffer to send.  We
+                 * have to back up to the previous BD and wait for it
+                 * to go.  This isn't perfect, because all this indicates
+                 * is the buffer is available.  There are still characters
+                 * in the CPM FIFO.
+                 */
+                bdp = info->tx_cur;
+                if (bdp == info->tx_bd_base)
+                        bdp += (TX_NUM_FIFO-1);
+                else
+                        bdp--;
+        } while (bdp->status & BD_SC_READY);
+        current->state = TASK_RUNNING;
+#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+        printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
+#endif
+}
+
+/*
+ * rs_hangup() --- called by tty_hangup() when a hangup is signaled.
+ */
+static void rs_360_hangup(struct tty_struct *tty)
+{
+        ser_info_t *info = (ser_info_t *)tty->driver_data;
+        struct serial_state *state = info->state;
+        
+        if (serial_paranoia_check(info, tty->name, "rs_hangup"))
+                return;
+
+        state = info->state;
+        
+        rs_360_flush_buffer(tty);
+        shutdown(info);
+        info->event = 0;
+        state->count = 0;
+        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->tty = 0;
+        wake_up_interruptible(&info->open_wait);
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_open() and friends
+ * ------------------------------------------------------------
+ */
+static int block_til_ready(struct tty_struct *tty, struct file * filp,
+                           ser_info_t *info)
+{
+#ifdef DO_THIS_LATER
+        DECLARE_WAITQUEUE(wait, current);
+#endif
+        struct serial_state *state = info->state;
+        int             retval;
+        int             do_clocal = 0;
+
+        /*
+         * If the device is in the middle of being closed, then block
+         * until it's done, and then try again.
+         */
+        if (tty_hung_up_p(filp) ||
+            (info->flags & ASYNC_CLOSING)) {
+                if (info->flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->close_wait);
+#ifdef SERIAL_DO_RESTART
+                if (info->flags & ASYNC_HUP_NOTIFY)
+                        return -EAGAIN;
+                else
+                        return -ERESTARTSYS;
+#else
+                return -EAGAIN;
+#endif
+        }
+
+        /*
+         * If non-blocking mode is set, or the port is not enabled,
+         * then make the check up front and then exit.
+         * If this is an SMC port, we don't have modem control to wait
+         * for, so just get out here.
+         */
+        if ((filp->f_flags & O_NONBLOCK) ||
+            (tty->flags & (1 << TTY_IO_ERROR)) ||
+            !(info->state->smc_scc_num & NUM_IS_SCC)) {
+                info->flags |= ASYNC_NORMAL_ACTIVE;
+                return 0;
+        }
+
+        if (tty->termios->c_cflag & CLOCAL)
+                do_clocal = 1;
+        
+        /*
+         * Block waiting for the carrier detect and the line to become
+         * free (i.e., not in use by the callout).  While we are in
+         * this loop, state->count is dropped by one, so that
+         * rs_close() knows when to free things.  We restore it upon
+         * exit, either normal or abnormal.
+         */
+        retval = 0;
+#ifdef DO_THIS_LATER
+        add_wait_queue(&info->open_wait, &wait);
+#ifdef SERIAL_DEBUG_OPEN
+        printk("block_til_ready before block: ttys%d, count = %d\n",
+               state->line, state->count);
+#endif
+        local_irq_disable();
+        if (!tty_hung_up_p(filp)) 
+                state->count--;
+        local_irq_enable();
+        info->blocked_open++;
+        while (1) {
+                local_irq_disable();
+                if (tty->termios->c_cflag & CBAUD)
+                        serial_out(info, UART_MCR,
+                                   serial_inp(info, UART_MCR) |
+                                   (UART_MCR_DTR | UART_MCR_RTS));
+                local_irq_enable();
+                set_current_state(TASK_INTERRUPTIBLE);
+                if (tty_hung_up_p(filp) ||
+                    !(info->flags & ASYNC_INITIALIZED)) {
+#ifdef SERIAL_DO_RESTART
+                        if (info->flags & ASYNC_HUP_NOTIFY)
+                                retval = -EAGAIN;
+                        else
+                                retval = -ERESTARTSYS;  
+#else
+                        retval = -EAGAIN;
+#endif
+                        break;
+                }
+                if (!(info->flags & ASYNC_CLOSING) &&
+                    (do_clocal || (serial_in(info, UART_MSR) &
+                                   UART_MSR_DCD)))
+                        break;
+                if (signal_pending(current)) {
+                        retval = -ERESTARTSYS;
+                        break;
+                }
+#ifdef SERIAL_DEBUG_OPEN
+                printk("block_til_ready blocking: ttys%d, count = %d\n",
+                       info->line, state->count);
+#endif
+                schedule();
+        }
+        current->state = TASK_RUNNING;
+        remove_wait_queue(&info->open_wait, &wait);
+        if (!tty_hung_up_p(filp))
+                state->count++;
+        info->blocked_open--;
+#ifdef SERIAL_DEBUG_OPEN
+        printk("block_til_ready after blocking: ttys%d, count = %d\n",
+               info->line, state->count);
+#endif
+#endif /* DO_THIS_LATER */
+        if (retval)
+                return retval;
+        info->flags |= ASYNC_NORMAL_ACTIVE;
+        return 0;
+}
+
+static int get_async_struct(int line, ser_info_t **ret_info)
+{
+        struct serial_state *sstate;
+
+        sstate = rs_table + line;
+        if (sstate->info) {
+                sstate->count++;
+                *ret_info = (ser_info_t *)sstate->info;
+                return 0;
+        }
+        else {
+                return -ENOMEM;
+        }
+}
+
+/*
+ * This routine is called whenever a serial port is opened.  It
+ * enables interrupts for a serial port, linking in its async structure into
+ * the IRQ chain.   It also performs the serial-specific
+ * initialization for the tty structure.
+ */
+static int rs_360_open(struct tty_struct *tty, struct file * filp)
+{
+        ser_info_t      *info;
+        int             retval, line;
+
+        line = tty->index;
+        if ((line < 0) || (line >= NR_PORTS))
+                return -ENODEV;
+        retval = get_async_struct(line, &info);
+        if (retval)
+                return retval;
+        if (serial_paranoia_check(info, tty->name, "rs_open"))
+                return -ENODEV;
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("rs_open %s, count = %d\n", tty->name, info->state->count);
+#endif
+        tty->driver_data = info;
+        info->tty = tty;
+
+        /*
+         * Start up serial port
+         */
+        retval = startup(info);
+        if (retval)
+                return retval;
+
+        retval = block_til_ready(tty, filp, info);
+        if (retval) {
+#ifdef SERIAL_DEBUG_OPEN
+                printk("rs_open returning after block_til_ready with %d\n",
+                       retval);
+#endif
+                return retval;
+        }
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("rs_open %s successful...", tty->name);
+#endif
+        return 0;
+}
+
+/*
+ * /proc fs routines....
+ */
+
+static inline int line_info(char *buf, struct serial_state *state)
+{
+#ifdef notdef
+        struct async_struct *info = state->info, scr_info;
+        char    stat_buf[30], control, status;
+#endif
+        int     ret;
+
+        ret = sprintf(buf, "%d: uart:%s port:%X irq:%d",
+                      state->line,
+                      (state->smc_scc_num & NUM_IS_SCC) ? "SCC" : "SMC",
+                      (unsigned int)(state->port), state->irq);
+
+        if (!state->port || (state->type == PORT_UNKNOWN)) {
+                ret += sprintf(buf+ret, "\n");
+                return ret;
+        }
+
+#ifdef notdef
+        /*
+         * Figure out the current RS-232 lines
+         */
+        if (!info) {
+                info = &scr_info;       /* This is just for serial_{in,out} */
+
+                info->magic = SERIAL_MAGIC;
+                info->port = state->port;
+                info->flags = state->flags;
+                info->quot = 0;
+                info->tty = 0;
+        }
+        local_irq_disable();
+        status = serial_in(info, UART_MSR);
+        control = info ? info->MCR : serial_in(info, UART_MCR);
+        local_irq_enable();
+        
+        stat_buf[0] = 0;
+        stat_buf[1] = 0;
+        if (control & UART_MCR_RTS)
+                strcat(stat_buf, "|RTS");
+        if (status & UART_MSR_CTS)
+                strcat(stat_buf, "|CTS");
+        if (control & UART_MCR_DTR)
+                strcat(stat_buf, "|DTR");
+        if (status & UART_MSR_DSR)
+                strcat(stat_buf, "|DSR");
+        if (status & UART_MSR_DCD)
+                strcat(stat_buf, "|CD");
+        if (status & UART_MSR_RI)
+                strcat(stat_buf, "|RI");
+
+        if (info->quot) {
+                ret += sprintf(buf+ret, " baud:%d",
+                               state->baud_base / info->quot);
+        }
+
+        ret += sprintf(buf+ret, " tx:%d rx:%d",
+                      state->icount.tx, state->icount.rx);
+
+        if (state->icount.frame)
+                ret += sprintf(buf+ret, " fe:%d", state->icount.frame);
+        
+        if (state->icount.parity)
+                ret += sprintf(buf+ret, " pe:%d", state->icount.parity);
+        
+        if (state->icount.brk)
+                ret += sprintf(buf+ret, " brk:%d", state->icount.brk);  
+
+        if (state->icount.overrun)
+                ret += sprintf(buf+ret, " oe:%d", state->icount.overrun);
+
+        /*
+         * Last thing is the RS-232 status lines
+         */
+        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
+#endif
+        return ret;
+}
+
+int rs_360_read_proc(char *page, char **start, off_t off, int count,
+                 int *eof, void *data)
+{
+        int i, len = 0;
+        off_t   begin = 0;
+
+        len += sprintf(page, "serinfo:1.0 driver:%s\n", serial_version);
+        for (i = 0; i < NR_PORTS && len < 4000; i++) {
+                len += line_info(page + len, &rs_table[i]);
+                if (len+begin > off+count)
+                        goto done;
+                if (len+begin < off) {
+                        begin += len;
+                        len = 0;
+                }
+        }
+        *eof = 1;
+done:
+        if (off >= len+begin)
+                return 0;
+        *start = page + (begin-off);
+        return ((count < begin+len-off) ? count : begin+len-off);
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * rs_init() and friends
+ *
+ * rs_init() is called at boot-time to initialize the serial driver.
+ * ---------------------------------------------------------------------
+ */
+
+/*
+ * This routine prints out the appropriate serial driver version
+ * number, and identifies which options were configured into this
+ * driver.
+ */
+static _INLINE_ void show_serial_version(void)
+{
+        printk(KERN_INFO "%s version %s\n", serial_name, serial_version);
+}
+
+
+/*
+ * The serial console driver used during boot.  Note that these names
+ * clash with those found in "serial.c", so we currently can't support
+ * the 16xxx uarts and these at the same time.  I will fix this to become
+ * an indirect function call from tty_io.c (or something).
+ */
+
+#ifdef CONFIG_SERIAL_CONSOLE
+
+/*
+ * Print a string to the serial port trying not to disturb any possible
+ * real use of the port...
+ */
+static void my_console_write(int idx, const char *s,
+                                unsigned count)
+{
+        struct          serial_state    *ser;
+        ser_info_t              *info;
+        unsigned                i;
+        QUICC_BD                *bdp, *bdbase;
+        volatile struct smc_uart_pram   *up;
+        volatile        u_char          *cp;
+
+        ser = rs_table + idx;
+
+
+        /* If the port has been initialized for general use, we have
+         * to use the buffer descriptors allocated there.  Otherwise,
+         * we simply use the single buffer allocated.
+         */
+        if ((info = (ser_info_t *)ser->info) != NULL) {
+                bdp = info->tx_cur;
+                bdbase = info->tx_bd_base;
+        }
+        else {
+                /* Pointer to UART in parameter ram.
+                */
+                /* up = (smc_uart_t *)&cpmp->cp_dparam[ser->port]; */
+                up = &pquicc->pram[ser->port].scc.pothers.idma_smc.psmc.u;
+
+                /* Get the address of the host memory buffer.
+                 */
+                bdp = bdbase = (QUICC_BD *)((uint)pquicc + (uint)up->tbase);
+        }
+
+        /*
+         * We need to gracefully shut down the transmitter, disable
+         * interrupts, then send our bytes out.
+         */
+
+        /*
+         * Now, do each character.  This is not as bad as it looks
+         * since this is a holding FIFO and not a transmitting FIFO.
+         * We could add the complexity of filling the entire transmit
+         * buffer, but we would just wait longer between accesses......
+         */
+        for (i = 0; i < count; i++, s++) {
+                /* Wait for transmitter fifo to empty.
+                 * Ready indicates output is ready, and xmt is doing
+                 * that, not that it is ready for us to send.
+                 */
+                while (bdp->status & BD_SC_READY);
+
+                /* Send the character out.
+                 */
+                cp = bdp->buf;
+                *cp = *s;
+                
+                bdp->length = 1;
+                bdp->status |= BD_SC_READY;
+
+                if (bdp->status & BD_SC_WRAP)
+                        bdp = bdbase;
+                else
+                        bdp++;
+
+                /* if a LF, also do CR... */
+                if (*s == 10) {
+                        while (bdp->status & BD_SC_READY);
+                        /* cp = __va(bdp->buf); */
+                        cp = bdp->buf;
+                        *cp = 13;
+                        bdp->length = 1;
+                        bdp->status |= BD_SC_READY;
+
+                        if (bdp->status & BD_SC_WRAP) {
+                                bdp = bdbase;
+                        }
+                        else {
+                                bdp++;
+                        }
+                }
+        }
+
+        /*
+         * Finally, Wait for transmitter & holding register to empty
+         *  and restore the IER
+         */
+        while (bdp->status & BD_SC_READY);
+
+        if (info)
+                info->tx_cur = (QUICC_BD *)bdp;
+}
+
+static void serial_console_write(struct console *c, const char *s,
+                                unsigned count)
+{
+#ifdef CONFIG_KGDB
+        /* Try to let stub handle output. Returns true if it did. */ 
+        if (kgdb_output_string(s, count))
+                return;
+#endif
+        my_console_write(c->index, s, count);
+}
+
+
+
+/*void console_print_68360(const char *p)
+{
+        const char *cp = p;
+        int i;
+
+        for (i=0;cp[i]!=0;i++);
+
+        serial_console_write (p, i);
+
+        //Comment this if you want to have a strict interrupt-driven output
+        //rs_fair_output();
+
+        return;
+}*/
+
+
+
+
+
+
+#ifdef CONFIG_XMON
+int
+xmon_360_write(const char *s, unsigned count)
+{
+        my_console_write(0, s, count);
+        return(count);
+}
+#endif
+
+#ifdef CONFIG_KGDB
+void
+putDebugChar(char ch)
+{
+        my_console_write(0, &ch, 1);
+}
+#endif
+
+/*
+ * Receive character from the serial port.  This only works well
+ * before the port is initialized for real use.
+ */
+static int my_console_wait_key(int idx, int xmon, char *obuf)
+{
+        struct serial_state             *ser;
+        u_char                  c, *cp;
+        ser_info_t              *info;
+        QUICC_BD                *bdp;
+        volatile struct smc_uart_pram   *up;
+        int                             i;
+
+        ser = rs_table + idx;
+
+        /* Get the address of the host memory buffer.
+         * If the port has been initialized for general use, we must
+         * use information from the port structure.
+         */
+        if ((info = (ser_info_t *)ser->info))
+                bdp = info->rx_cur;
+        else
+                /* bdp = (QUICC_BD *)&cpmp->cp_dpmem[up->smc_rbase]; */
+                bdp = (QUICC_BD *)((uint)pquicc + (uint)up->tbase);
+
+        /* Pointer to UART in parameter ram.
+         */
+        /* up = (smc_uart_t *)&cpmp->cp_dparam[ser->port]; */
+        up = &pquicc->pram[info->state->port].scc.pothers.idma_smc.psmc.u;
+
+        /*
+         * We need to gracefully shut down the receiver, disable
+         * interrupts, then read the input.
+         * XMON just wants a poll.  If no character, return -1, else
+         * return the character.
+         */
+        if (!xmon) {
+                while (bdp->status & BD_SC_EMPTY);
+        }
+        else {
+                if (bdp->status & BD_SC_EMPTY)
+                        return -1;
+        }
+
+        cp = (char *)bdp->buf;
+
+        if (obuf) {
+                i = c = bdp->length;
+                while (i-- > 0)
+                        *obuf++ = *cp++;
+        }
+        else {
+                c = *cp;
+        }
+        bdp->status |= BD_SC_EMPTY;
+
+        if (info) {
+                if (bdp->status & BD_SC_WRAP) {
+                        bdp = info->rx_bd_base;
+                }
+                else {
+                        bdp++;
+                }
+                info->rx_cur = (QUICC_BD *)bdp;
+        }
+
+        return((int)c);
+}
+
+static int serial_console_wait_key(struct console *co)
+{
+        return(my_console_wait_key(co->index, 0, NULL));
+}
+
+#ifdef CONFIG_XMON
+int
+xmon_360_read_poll(void)
+{
+        return(my_console_wait_key(0, 1, NULL));
+}
+
+int
+xmon_360_read_char(void)
+{
+        return(my_console_wait_key(0, 0, NULL));
+}
+#endif
+
+#ifdef CONFIG_KGDB
+static char kgdb_buf[RX_BUF_SIZE], *kgdp;
+static int kgdb_chars;
+
+unsigned char
+getDebugChar(void)
+{
+        if (kgdb_chars <= 0) {
+                kgdb_chars = my_console_wait_key(0, 0, kgdb_buf);
+                kgdp = kgdb_buf;
+        }
+        kgdb_chars--;
+
+        return(*kgdp++);
+}
+
+void kgdb_interruptible(int state)
+{
+}
+void kgdb_map_scc(void)
+{
+        struct          serial_state *ser;
+        uint            mem_addr;
+        volatile        QUICC_BD                *bdp;
+        volatile        smc_uart_t      *up;
+
+        cpmp = (cpm360_t *)&(((immap_t *)IMAP_ADDR)->im_cpm);
+
+        /* To avoid data cache CPM DMA coherency problems, allocate a
+         * buffer in the CPM DPRAM.  This will work until the CPM and
+         * serial ports are initialized.  At that time a memory buffer
+         * will be allocated.
+         * The port is already initialized from the boot procedure, all
+         * we do here is give it a different buffer and make it a FIFO.
+         */
+
+        ser = rs_table;
+
+        /* Right now, assume we are using SMCs.
+        */
+        up = (smc_uart_t *)&cpmp->cp_dparam[ser->port];
+
+        /* Allocate space for an input FIFO, plus a few bytes for output.
+         * Allocate bytes to maintain word alignment.
+         */
+        mem_addr = (uint)(&cpmp->cp_dpmem[0x1000]);
+
+        /* Set the physical address of the host memory buffers in
+         * the buffer descriptors.
+         */
+        bdp = (QUICC_BD *)&cpmp->cp_dpmem[up->smc_rbase];
+        bdp->buf = mem_addr;
+
+        bdp = (QUICC_BD *)&cpmp->cp_dpmem[up->smc_tbase];
+        bdp->buf = mem_addr+RX_BUF_SIZE;
+
+        up->smc_mrblr = RX_BUF_SIZE;            /* receive buffer length */
+        up->smc_maxidl = RX_BUF_SIZE;
+}
+#endif
+
+static struct tty_struct *serial_console_device(struct console *c, int *index)
+{
+        *index = c->index;
+        return serial_driver;
+}
+
+
+struct console sercons = {
+        .name           = "ttyS",
+        .write          = serial_console_write,
+        .device         = serial_console_device,
+        .wait_key       = serial_console_wait_key,
+        .setup          = serial_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = CONFIG_SERIAL_CONSOLE_PORT, 
+};
+
+
+
+/*
+ *      Register console.
+ */
+long console_360_init(long kmem_start, long kmem_end)
+{
+        register_console(&sercons);
+        /*register_console (console_print_68360); - 2.0.38 only required a write
+      function pointer. */
+        return kmem_start;
+}
+
+#endif
+
+/* Index in baud rate table of the default console baud rate.
+*/
+static  int     baud_idx;
+
+static struct tty_operations rs_360_ops = {
+        .owner = THIS_MODULE,
+        .open = rs_360_open,
+        .close = rs_360_close,
+        .write = rs_360_write,
+        .put_char = rs_360_put_char,
+        .write_room = rs_360_write_room,
+        .chars_in_buffer = rs_360_chars_in_buffer,
+        .flush_buffer = rs_360_flush_buffer,
+        .ioctl = rs_360_ioctl,
+        .throttle = rs_360_throttle,
+        .unthrottle = rs_360_unthrottle,
+        /* .send_xchar = rs_360_send_xchar, */
+        .set_termios = rs_360_set_termios,
+        .stop = rs_360_stop,
+        .start = rs_360_start,
+        .hangup = rs_360_hangup,
+        /* .wait_until_sent = rs_360_wait_until_sent, */
+        /* .read_proc = rs_360_read_proc, */
+        .tiocmget = rs_360_tiocmget,
+        .tiocmset = rs_360_tiocmset,
+};
+
+/* int __init rs_360_init(void) */
+int rs_360_init(void)
+{
+        struct serial_state * state;
+        ser_info_t      *info;
+        void       *mem_addr;
+        uint            dp_addr, iobits;
+        int                 i, j, idx;
+        ushort          chan;
+        QUICC_BD        *bdp;
+        volatile        QUICC           *cp;
+        volatile        struct smc_regs *sp;
+        volatile        struct smc_uart_pram    *up;
+        volatile        struct scc_regs *scp;
+        volatile        struct uart_pram        *sup;
+        /* volatile     immap_t         *immap; */
+        
+        serial_driver = alloc_tty_driver(NR_PORTS);
+        if (!serial_driver)
+                return -1;
+
+        show_serial_version();
+
+        serial_driver->name = "ttyS";
+        serial_driver->major = TTY_MAJOR;
+        serial_driver->minor_start = 64;
+        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        serial_driver->subtype = SERIAL_TYPE_NORMAL;
+        serial_driver->init_termios = tty_std_termios;
+        serial_driver->init_termios.c_cflag =
+                baud_idx | CS8 | CREAD | HUPCL | CLOCAL;
+        serial_driver->flags = TTY_DRIVER_REAL_RAW;
+        tty_set_operations(serial_driver, &rs_360_ops);
+        
+        if (tty_register_driver(serial_driver))
+                panic("Couldn't register serial driver\n");
+
+        cp = pquicc;    /* Get pointer to Communication Processor */
+        /* immap = (immap_t *)IMAP_ADDR; */     /* and to internal registers */
+
+
+        /* Configure SCC2, SCC3, and SCC4 instead of port A parallel I/O.
+         */
+        /* The "standard" configuration through the 860.
+        */
+/*      immap->im_ioport.iop_papar |= 0x00fc; */
+/*      immap->im_ioport.iop_padir &= ~0x00fc; */
+/*      immap->im_ioport.iop_paodr &= ~0x00fc; */
+        cp->pio_papar |= 0x00fc;
+        cp->pio_padir &= ~0x00fc;
+        /* cp->pio_paodr &= ~0x00fc; */
+
+
+        /* Since we don't yet do modem control, connect the port C pins
+         * as general purpose I/O.  This will assert CTS and CD for the
+         * SCC ports.
+         */
+        /* FIXME: see 360um p.7-365 and 860um p.34-12 
+         * I can't make sense of these bits - mleslie*/
+/*      immap->im_ioport.iop_pcdir |= 0x03c6; */
+/*      immap->im_ioport.iop_pcpar &= ~0x03c6; */
+
+/*      cp->pio_pcdir |= 0x03c6; */
+/*      cp->pio_pcpar &= ~0x03c6; */
+
+
+
+        /* Connect SCC2 and SCC3 to NMSI.  Connect BRG3 to SCC2 and
+         * BRG4 to SCC3.
+         */
+        cp->si_sicr &= ~0x00ffff00;
+        cp->si_sicr |=  0x001b1200;
+
+#ifdef CONFIG_PP04
+        /* Frequentis PP04 forced to RS-232 until we know better.
+         * Port C 12 and 13 low enables RS-232 on SCC3 and SCC4.
+         */
+        immap->im_ioport.iop_pcdir |= 0x000c;
+        immap->im_ioport.iop_pcpar &= ~0x000c;
+        immap->im_ioport.iop_pcdat &= ~0x000c;
+
+        /* This enables the TX driver.
+        */
+        cp->cp_pbpar &= ~0x6000;
+        cp->cp_pbdat &= ~0x6000;
+#endif
+
+        for (i = 0, state = rs_table; i < NR_PORTS; i++,state++) {
+                state->magic = SSTATE_MAGIC;
+                state->line = i;
+                state->type = PORT_UNKNOWN;
+                state->custom_divisor = 0;
+                state->close_delay = 5*HZ/10;
+                state->closing_wait = 30*HZ;
+                state->icount.cts = state->icount.dsr = 
+                        state->icount.rng = state->icount.dcd = 0;
+                state->icount.rx = state->icount.tx = 0;
+                state->icount.frame = state->icount.parity = 0;
+                state->icount.overrun = state->icount.brk = 0;
+                printk(KERN_INFO "ttyS%d at irq 0x%02x is an %s\n",
+                       i, (unsigned int)(state->irq),
+                       (state->smc_scc_num & NUM_IS_SCC) ? "SCC" : "SMC");
+
+#ifdef CONFIG_SERIAL_CONSOLE
+                /* If we just printed the message on the console port, and
+                 * we are about to initialize it for general use, we have
+                 * to wait a couple of character times for the CR/NL to
+                 * make it out of the transmit buffer.
+                 */
+                if (i == CONFIG_SERIAL_CONSOLE_PORT)
+                        mdelay(8);
+
+
+/*              idx = PORT_NUM(info->state->smc_scc_num); */
+/*              if (info->state->smc_scc_num & NUM_IS_SCC) */
+/*                      chan = scc_chan_map[idx]; */
+/*              else */
+/*                      chan = smc_chan_map[idx]; */
+
+/*              cp->cp_cr = mk_cr_cmd(chan, CPM_CR_STOP_TX) | CPM_CR_FLG; */
+/*              while (cp->cp_cr & CPM_CR_FLG); */
+
+#endif
+                /* info = kmalloc(sizeof(ser_info_t), GFP_KERNEL); */
+                info = &quicc_ser_info[i];
+                if (info) {
+                        memset (info, 0, sizeof(ser_info_t));
+                        info->magic = SERIAL_MAGIC;
+                        info->line = i;
+                        info->flags = state->flags;
+                        INIT_WORK(&info->tqueue, do_softint, info);
+                        INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);
+                        init_waitqueue_head(&info->open_wait);
+                        init_waitqueue_head(&info->close_wait);
+                        info->state = state;
+                        state->info = (struct async_struct *)info;
+
+                        /* We need to allocate a transmit and receive buffer
+                         * descriptors from dual port ram, and a character
+                         * buffer area from host mem.
+                         */
+                        dp_addr = m360_cpm_dpalloc(sizeof(QUICC_BD) * RX_NUM_FIFO);
+
+                        /* Allocate space for FIFOs in the host memory.
+                         *  (for now this is from a static array of buffers :(
+                         */
+                        /* mem_addr = m360_cpm_hostalloc(RX_NUM_FIFO * RX_BUF_SIZE); */
+                        /* mem_addr = kmalloc (RX_NUM_FIFO * RX_BUF_SIZE, GFP_BUFFER); */
+                        mem_addr = &rx_buf_pool[i * RX_NUM_FIFO * RX_BUF_SIZE];
+
+                        /* Set the physical address of the host memory
+                         * buffers in the buffer descriptors, and the
+                         * virtual address for us to work with.
+                         */
+                        bdp = (QUICC_BD *)((uint)pquicc + dp_addr);
+                        info->rx_cur = info->rx_bd_base = bdp;
+
+                        /* initialize rx buffer descriptors */
+                        for (j=0; j<(RX_NUM_FIFO-1); j++) {
+                                bdp->buf = &rx_buf_pool[(i * RX_NUM_FIFO + j ) * RX_BUF_SIZE];
+                                bdp->status = BD_SC_EMPTY | BD_SC_INTRPT;
+                                mem_addr += RX_BUF_SIZE;
+                                bdp++;
+                        }
+                        bdp->buf = &rx_buf_pool[(i * RX_NUM_FIFO + j ) * RX_BUF_SIZE];
+                        bdp->status = BD_SC_WRAP | BD_SC_EMPTY | BD_SC_INTRPT;
+
+
+                        idx = PORT_NUM(info->state->smc_scc_num);
+                        if (info->state->smc_scc_num & NUM_IS_SCC) {
+
+#if defined (CONFIG_UCQUICC) && 1
+                                /* set the transceiver mode to RS232 */
+                                sipex_mode_bits &= ~(uint)SIPEX_MODE(idx,0x0f); /* clear current mode */
+                                sipex_mode_bits |= (uint)SIPEX_MODE(idx,0x02);
+                                *(uint *)_periph_base = sipex_mode_bits;
+                                /* printk ("sipex bits = 0x%08x\n", sipex_mode_bits); */
+#endif
+                        }
+
+                        dp_addr = m360_cpm_dpalloc(sizeof(QUICC_BD) * TX_NUM_FIFO);
+
+                        /* Allocate space for FIFOs in the host memory.
+                        */
+                        /* mem_addr = m360_cpm_hostalloc(TX_NUM_FIFO * TX_BUF_SIZE); */
+                        /* mem_addr = kmalloc (TX_NUM_FIFO * TX_BUF_SIZE, GFP_BUFFER); */
+                        mem_addr = &tx_buf_pool[i * TX_NUM_FIFO * TX_BUF_SIZE];
+
+                        /* Set the physical address of the host memory
+                         * buffers in the buffer descriptors, and the
+                         * virtual address for us to work with.
+                         */
+                        /* bdp = (QUICC_BD *)&cp->cp_dpmem[dp_addr]; */
+                        bdp = (QUICC_BD *)((uint)pquicc + dp_addr);
+                        info->tx_cur = info->tx_bd_base = (QUICC_BD *)bdp;
+
+                        /* initialize tx buffer descriptors */
+                        for (j=0; j<(TX_NUM_FIFO-1); j++) {
+                                bdp->buf = &tx_buf_pool[(i * TX_NUM_FIFO + j ) * TX_BUF_SIZE];
+                                bdp->status = BD_SC_INTRPT;
+                                mem_addr += TX_BUF_SIZE;
+                                bdp++;
+                        }
+                        bdp->buf = &tx_buf_pool[(i * TX_NUM_FIFO + j ) * TX_BUF_SIZE];
+                        bdp->status = (BD_SC_WRAP | BD_SC_INTRPT);
+
+                        if (info->state->smc_scc_num & NUM_IS_SCC) {
+                                scp = &pquicc->scc_regs[idx];
+                                sup = &pquicc->pram[info->state->port].scc.pscc.u;
+                                sup->rbase = dp_addr;
+                                sup->tbase = dp_addr;
+
+                                /* Set up the uart parameters in the
+                                 * parameter ram.
+                                 */
+                                sup->rfcr = SMC_EB;
+                                sup->tfcr = SMC_EB;
+
+                                /* Set this to 1 for now, so we get single
+                                 * character interrupts.  Using idle charater
+                                 * time requires some additional tuning.
+                                 */
+                                sup->mrblr = 1;
+                                sup->max_idl = 0;
+                                sup->brkcr = 1;
+                                sup->parec = 0;
+                                sup->frmer = 0;
+                                sup->nosec = 0;
+                                sup->brkec = 0;
+                                sup->uaddr1 = 0;
+                                sup->uaddr2 = 0;
+                                sup->toseq = 0;
+                                {
+                                        int i;
+                                        for (i=0;i<8;i++)
+                                                sup->cc[i] = 0x8000;
+                                }
+                                sup->rccm = 0xc0ff;
+
+                                /* Send the CPM an initialize command.
+                                */
+                                chan = scc_chan_map[idx];
+
+                                /* execute the INIT RX & TX PARAMS command for this channel. */
+                                cp->cp_cr = mk_cr_cmd(chan, CPM_CR_INIT_TRX) | CPM_CR_FLG;
+                                while (cp->cp_cr & CPM_CR_FLG);
+
+                                /* Set UART mode, 8 bit, no parity, one stop.
+                                 * Enable receive and transmit.
+                                 */
+                                scp->scc_gsmr.w.high = 0;
+                                scp->scc_gsmr.w.low = 
+                                        (SCC_GSMRL_MODE_UART | SCC_GSMRL_TDCR_16 | SCC_GSMRL_RDCR_16);
+
+                                /* Disable all interrupts and clear all pending
+                                 * events.
+                                 */
+                                scp->scc_sccm = 0;
+                                scp->scc_scce = 0xffff;
+                                scp->scc_dsr = 0x7e7e;
+                                scp->scc_psmr = 0x3000;
+
+                                /* If the port is the console, enable Rx and Tx.
+                                */
+#ifdef CONFIG_SERIAL_CONSOLE
+                                if (i == CONFIG_SERIAL_CONSOLE_PORT)
+                                        scp->scc_gsmr.w.low |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+#endif
+                        }
+                        else {
+                                /* Configure SMCs Tx/Rx instead of port B
+                                 * parallel I/O.
+                                 */
+                                up = &pquicc->pram[info->state->port].scc.pothers.idma_smc.psmc.u;
+                                up->rbase = dp_addr;
+
+                                iobits = 0xc0 << (idx * 4);
+                                cp->pip_pbpar |= iobits;
+                                cp->pip_pbdir &= ~iobits;
+                                cp->pip_pbodr &= ~iobits;
+
+
+                                /* Connect the baud rate generator to the
+                                 * SMC based upon index in rs_table.  Also
+                                 * make sure it is connected to NMSI.
+                                 */
+                                cp->si_simode &= ~(0xffff << (idx * 16));
+                                cp->si_simode |= (i << ((idx * 16) + 12));
+
+                                up->tbase = dp_addr;
+
+                                /* Set up the uart parameters in the
+                                 * parameter ram.
+                                 */
+                                up->rfcr = SMC_EB;
+                                up->tfcr = SMC_EB;
+
+                                /* Set this to 1 for now, so we get single
+                                 * character interrupts.  Using idle charater
+                                 * time requires some additional tuning.
+                                 */
+                                up->mrblr = 1;
+                                up->max_idl = 0;
+                                up->brkcr = 1;
+
+                                /* Send the CPM an initialize command.
+                                */
+                                chan = smc_chan_map[idx];
+
+                                cp->cp_cr = mk_cr_cmd(chan,
+                                                                          CPM_CR_INIT_TRX) | CPM_CR_FLG;
+#ifdef CONFIG_SERIAL_CONSOLE
+                                if (i == CONFIG_SERIAL_CONSOLE_PORT)
+                                        printk("");
+#endif
+                                while (cp->cp_cr & CPM_CR_FLG);
+
+                                /* Set UART mode, 8 bit, no parity, one stop.
+                                 * Enable receive and transmit.
+                                 */
+                                sp = &cp->smc_regs[idx];
+                                sp->smc_smcmr = smcr_mk_clen(9) | SMCMR_SM_UART;
+
+                                /* Disable all interrupts and clear all pending
+                                 * events.
+                                 */
+                                sp->smc_smcm = 0;
+                                sp->smc_smce = 0xff;
+
+                                /* If the port is the console, enable Rx and Tx.
+                                */
+#ifdef CONFIG_SERIAL_CONSOLE
+                                if (i == CONFIG_SERIAL_CONSOLE_PORT)
+                                        sp->smc_smcmr |= SMCMR_REN | SMCMR_TEN;
+#endif
+                        }
+
+                        /* Install interrupt handler.
+                        */
+                        /* cpm_install_handler(IRQ_MACHSPEC | state->irq, rs_360_interrupt, info);  */
+                        /*request_irq(IRQ_MACHSPEC | state->irq, rs_360_interrupt, */
+                        request_irq(state->irq, rs_360_interrupt,
+                                                IRQ_FLG_LOCK, "ttyS", (void *)info);
+
+                        /* Set up the baud rate generator.
+                        */
+                        m360_cpm_setbrg(i, baud_table[baud_idx]);
+
+                }
+        }
+
+        return 0;
+}
+
+
+
+
+
+/* This must always be called before the rs_360_init() function, otherwise
+ * it blows away the port control information.
+ */
+//static int __init serial_console_setup( struct console *co, char *options)
+int serial_console_setup( struct console *co, char *options)
+{
+        struct          serial_state    *ser;
+        uint            mem_addr, dp_addr, bidx, idx, iobits;
+        ushort          chan;
+        QUICC_BD        *bdp;
+        volatile        QUICC                   *cp;
+        volatile        struct smc_regs *sp;
+        volatile        struct scc_regs *scp;
+        volatile        struct smc_uart_pram    *up;
+        volatile        struct uart_pram                *sup;
+
+/* mleslie TODO:
+ * add something to the 68k bootloader to store a desired initial console baud rate */
+
+/*      bd_t                                            *bd; */ /* a board info struct used by EPPC-bug */
+/*      bd = (bd_t *)__res; */
+
+        for (bidx = 0; bidx < (sizeof(baud_table) / sizeof(int)); bidx++)
+         /* if (bd->bi_baudrate == baud_table[bidx]) */
+                if (CONSOLE_BAUDRATE == baud_table[bidx])
+                        break;
+
+        /* co->cflag = CREAD|CLOCAL|bidx|CS8; */
+        baud_idx = bidx;
+
+        ser = rs_table + CONFIG_SERIAL_CONSOLE_PORT;
+
+        cp = pquicc;    /* Get pointer to Communication Processor */
+
+        idx = PORT_NUM(ser->smc_scc_num);
+        if (ser->smc_scc_num & NUM_IS_SCC) {
+
+                /* TODO: need to set up SCC pin assignment etc. here */
+                
+        }
+        else {
+                iobits = 0xc0 << (idx * 4);
+                cp->pip_pbpar |= iobits;
+                cp->pip_pbdir &= ~iobits;
+                cp->pip_pbodr &= ~iobits;
+
+                /* Connect the baud rate generator to the
+                 * SMC based upon index in rs_table.  Also
+                 * make sure it is connected to NMSI.
+                 */
+                cp->si_simode &= ~(0xffff << (idx * 16));
+                cp->si_simode |= (idx << ((idx * 16) + 12));
+        }
+
+        /* When we get here, the CPM has been reset, so we need
+         * to configure the port.
+         * We need to allocate a transmit and receive buffer descriptor
+         * from dual port ram, and a character buffer area from host mem.
+         */
+
+        /* Allocate space for two buffer descriptors in the DP ram.
+        */
+        dp_addr = m360_cpm_dpalloc(sizeof(QUICC_BD) * CONSOLE_NUM_FIFO);
+
+        /* Allocate space for two 2 byte FIFOs in the host memory.
+         */
+        /* mem_addr = m360_cpm_hostalloc(8); */
+        mem_addr = (uint)console_fifos;
+
+
+        /* Set the physical address of the host memory buffers in
+         * the buffer descriptors.
+         */
+        /* bdp = (QUICC_BD *)&cp->cp_dpmem[dp_addr]; */
+        bdp = (QUICC_BD *)((uint)pquicc + dp_addr);
+        bdp->buf = (char *)mem_addr;
+        (bdp+1)->buf = (char *)(mem_addr+4);
+
+        /* For the receive, set empty and wrap.
+         * For transmit, set wrap.
+         */
+        bdp->status = BD_SC_EMPTY | BD_SC_WRAP;
+        (bdp+1)->status = BD_SC_WRAP;
+
+        /* Set up the uart parameters in the parameter ram.
+         */
+        if (ser->smc_scc_num & NUM_IS_SCC) {
+                scp = &cp->scc_regs[idx];
+                /* sup = (scc_uart_t *)&cp->cp_dparam[ser->port]; */
+                sup = &pquicc->pram[ser->port].scc.pscc.u;
+
+                sup->rbase = dp_addr;
+                sup->tbase = dp_addr + sizeof(QUICC_BD);
+
+                /* Set up the uart parameters in the
+                 * parameter ram.
+                 */
+                sup->rfcr = SMC_EB;
+                sup->tfcr = SMC_EB;
+
+                /* Set this to 1 for now, so we get single
+                 * character interrupts.  Using idle charater
+                 * time requires some additional tuning.
+                 */
+                sup->mrblr = 1;
+                sup->max_idl = 0;
+                sup->brkcr = 1;
+                sup->parec = 0;
+                sup->frmer = 0;
+                sup->nosec = 0;
+                sup->brkec = 0;
+                sup->uaddr1 = 0;
+                sup->uaddr2 = 0;
+                sup->toseq = 0;
+                {
+                        int i;
+                        for (i=0;i<8;i++)
+                                sup->cc[i] = 0x8000;
+                }
+                sup->rccm = 0xc0ff;
+
+                /* Send the CPM an initialize command.
+                */
+                chan = scc_chan_map[idx];
+
+                cp->cp_cr = mk_cr_cmd(chan, CPM_CR_INIT_TRX) | CPM_CR_FLG;
+                while (cp->cp_cr & CPM_CR_FLG);
+
+                /* Set UART mode, 8 bit, no parity, one stop.
+                 * Enable receive and transmit.
+                 */
+                scp->scc_gsmr.w.high = 0;
+                scp->scc_gsmr.w.low = 
+                        (SCC_GSMRL_MODE_UART | SCC_GSMRL_TDCR_16 | SCC_GSMRL_RDCR_16);
+
+                /* Disable all interrupts and clear all pending
+                 * events.
+                 */
+                scp->scc_sccm = 0;
+                scp->scc_scce = 0xffff;
+                scp->scc_dsr = 0x7e7e;
+                scp->scc_psmr = 0x3000;
+
+                scp->scc_gsmr.w.low |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+
+        }
+        else {
+                /* up = (smc_uart_t *)&cp->cp_dparam[ser->port]; */
+                up = &pquicc->pram[ser->port].scc.pothers.idma_smc.psmc.u;
+
+                up->rbase = dp_addr;    /* Base of receive buffer desc. */
+                up->tbase = dp_addr+sizeof(QUICC_BD);   /* Base of xmt buffer desc. */
+                up->rfcr = SMC_EB;
+                up->tfcr = SMC_EB;
+
+                /* Set this to 1 for now, so we get single character interrupts.
+                */
+                up->mrblr = 1;          /* receive buffer length */
+                up->max_idl = 0;                /* wait forever for next char */
+
+                /* Send the CPM an initialize command.
+                */
+                chan = smc_chan_map[idx];
+                cp->cp_cr = mk_cr_cmd(chan, CPM_CR_INIT_TRX) | CPM_CR_FLG;
+                while (cp->cp_cr & CPM_CR_FLG);
+
+                /* Set UART mode, 8 bit, no parity, one stop.
+                 * Enable receive and transmit.
+                 */
+                sp = &cp->smc_regs[idx];
+                sp->smc_smcmr = smcr_mk_clen(9) |  SMCMR_SM_UART;
+
+                /* And finally, enable Rx and Tx.
+                */
+                sp->smc_smcmr |= SMCMR_REN | SMCMR_TEN;
+        }
+
+        /* Set up the baud rate generator.
+        */
+        /* m360_cpm_setbrg((ser - rs_table), bd->bi_baudrate); */
+        m360_cpm_setbrg((ser - rs_table), CONSOLE_BAUDRATE);
+
+        return 0;
+}
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ * End:
+ */
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
new file mode 100644
index 000000000000..201c3b9924f4
--- /dev/null
+++ b/drivers/serial/8250.c
@@ -0,0 +1,2632 @@
+/*
+ *  linux/drivers/char/8250.c
+ *
+ *  Driver for 8250/16550-type serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright (C) 2001 Russell King.
+ *
+ * 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.
+ *
+ *  $Id: 8250.c,v 1.90 2002/07/28 10:03:27 rmk Exp $
+ *
+ * A note about mapbase / membase
+ *
+ *  mapbase is the physical address of the IO port.
+ *  membase is an 'ioremapped' cookie.
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/mca.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_reg.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include "8250.h"
+
+/*
+ * Configuration:
+ *   share_irqs - whether we pass SA_SHIRQ to request_irq().  This option
+ *                is unsafe when used on edge-triggered interrupts.
+ */
+unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
+
+/*
+ * Debugging.
+ */
+#if 0
+#define DEBUG_AUTOCONF(fmt...)  printk(fmt)
+#else
+#define DEBUG_AUTOCONF(fmt...)  do { } while (0)
+#endif
+
+#if 0
+#define DEBUG_INTR(fmt...)      printk(fmt)
+#else
+#define DEBUG_INTR(fmt...)      do { } while (0)
+#endif
+
+#define PASS_LIMIT      256
+
+/*
+ * We default to IRQ0 for the "no irq" hack.   Some
+ * machine types want others as well - they're free
+ * to redefine this in their header file.
+ */
+#define is_real_interrupt(irq)  ((irq) != 0)
+
+/*
+ * This converts from our new CONFIG_ symbols to the symbols
+ * that asm/serial.h expects.  You _NEED_ to comment out the
+ * linux/config.h include contained inside asm/serial.h for
+ * this to work.
+ */
+#undef CONFIG_SERIAL_MANY_PORTS
+#undef CONFIG_SERIAL_DETECT_IRQ
+#undef CONFIG_SERIAL_MULTIPORT
+#undef CONFIG_HUB6
+
+#ifdef CONFIG_SERIAL_8250_DETECT_IRQ
+#define CONFIG_SERIAL_DETECT_IRQ 1
+#endif
+#ifdef CONFIG_SERIAL_8250_MULTIPORT
+#define CONFIG_SERIAL_MULTIPORT 1
+#endif
+#ifdef CONFIG_SERIAL_8250_MANY_PORTS
+#define CONFIG_SERIAL_MANY_PORTS 1
+#endif
+
+/*
+ * HUB6 is always on.  This will be removed once the header
+ * files have been cleaned.
+ */
+#define CONFIG_HUB6 1
+
+#include <asm/serial.h>
+
+/*
+ * SERIAL_PORT_DFNS tells us about built-in ports that have no
+ * standard enumeration mechanism.   Platforms that can find all
+ * serial ports via mechanisms like ACPI or PCI need not supply it.
+ */
+#ifndef SERIAL_PORT_DFNS
+#define SERIAL_PORT_DFNS
+#endif
+
+static struct old_serial_port old_serial_port[] = {
+        SERIAL_PORT_DFNS /* defined in asm/serial.h */
+};
+
+#define UART_NR (ARRAY_SIZE(old_serial_port) + CONFIG_SERIAL_8250_NR_UARTS)
+
+#ifdef CONFIG_SERIAL_8250_RSA
+
+#define PORT_RSA_MAX 4
+static unsigned long probe_rsa[PORT_RSA_MAX];
+static unsigned int probe_rsa_count;
+#endif /* CONFIG_SERIAL_8250_RSA  */
+
+struct uart_8250_port {
+        struct uart_port        port;
+        struct timer_list       timer;          /* "no irq" timer */
+        struct list_head        list;           /* ports on this IRQ */
+        unsigned int            capabilities;   /* port capabilities */
+        unsigned int            tx_loadsz;      /* transmit fifo load size */
+        unsigned short          rev;
+        unsigned char           acr;
+        unsigned char           ier;
+        unsigned char           lcr;
+        unsigned char           mcr;
+        unsigned char           mcr_mask;       /* mask of user bits */
+        unsigned char           mcr_force;      /* mask of forced bits */
+        unsigned char           lsr_break_flag;
+
+        /*
+         * We provide a per-port pm hook.
+         */
+        void                    (*pm)(struct uart_port *port,
+                                      unsigned int state, unsigned int old);
+};
+
+struct irq_info {
+        spinlock_t              lock;
+        struct list_head        *head;
+};
+
+static struct irq_info irq_lists[NR_IRQS];
+
+/*
+ * Here we define the default xmit fifo size used for each type of UART.
+ */
+static const struct serial8250_config uart_config[] = {
+        [PORT_UNKNOWN] = {
+                .name           = "unknown",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+        },
+        [PORT_8250] = {
+                .name           = "8250",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+        },
+        [PORT_16450] = {
+                .name           = "16450",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+        },
+        [PORT_16550] = {
+                .name           = "16550",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+        },
+        [PORT_16550A] = {
+                .name           = "16550A",
+                .fifo_size      = 16,
+                .tx_loadsz      = 16,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO,
+        },
+        [PORT_CIRRUS] = {
+                .name           = "Cirrus",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+        },
+        [PORT_16650] = {
+                .name           = "ST16650",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+                .flags          = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP,
+        },
+        [PORT_16650V2] = {
+                .name           = "ST16650V2",
+                .fifo_size      = 32,
+                .tx_loadsz      = 16,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 |
+                                  UART_FCR_T_TRIG_00,
+                .flags          = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP,
+        },
+        [PORT_16750] = {
+                .name           = "TI16750",
+                .fifo_size      = 64,
+                .tx_loadsz      = 64,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 |
+                                  UART_FCR7_64BYTE,
+                .flags          = UART_CAP_FIFO | UART_CAP_SLEEP | UART_CAP_AFE,
+        },
+        [PORT_STARTECH] = {
+                .name           = "Startech",
+                .fifo_size      = 1,
+                .tx_loadsz      = 1,
+        },
+        [PORT_16C950] = {
+                .name           = "16C950/954",
+                .fifo_size      = 128,
+                .tx_loadsz      = 128,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO,
+        },
+        [PORT_16654] = {
+                .name           = "ST16654",
+                .fifo_size      = 64,
+                .tx_loadsz      = 32,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 |
+                                  UART_FCR_T_TRIG_10,
+                .flags          = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP,
+        },
+        [PORT_16850] = {
+                .name           = "XR16850",
+                .fifo_size      = 128,
+                .tx_loadsz      = 128,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP,
+        },
+        [PORT_RSA] = {
+                .name           = "RSA",
+                .fifo_size      = 2048,
+                .tx_loadsz      = 2048,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_11,
+                .flags          = UART_CAP_FIFO,
+        },
+        [PORT_NS16550A] = {
+                .name           = "NS16550A",
+                .fifo_size      = 16,
+                .tx_loadsz      = 16,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO | UART_NATSEMI,
+        },
+        [PORT_XSCALE] = {
+                .name           = "XScale",
+                .fifo_size      = 32,
+                .tx_loadsz      = 32,
+                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+                .flags          = UART_CAP_FIFO | UART_CAP_UUE,
+        },
+};
+
+static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
+{
+        offset <<= up->port.regshift;
+
+        switch (up->port.iotype) {
+        case UPIO_HUB6:
+                outb(up->port.hub6 - 1 + offset, up->port.iobase);
+                return inb(up->port.iobase + 1);
+
+        case UPIO_MEM:
+                return readb(up->port.membase + offset);
+
+        case UPIO_MEM32:
+                return readl(up->port.membase + offset);
+
+        default:
+                return inb(up->port.iobase + offset);
+        }
+}
+
+static _INLINE_ void
+serial_out(struct uart_8250_port *up, int offset, int value)
+{
+        offset <<= up->port.regshift;
+
+        switch (up->port.iotype) {
+        case UPIO_HUB6:
+                outb(up->port.hub6 - 1 + offset, up->port.iobase);
+                outb(value, up->port.iobase + 1);
+                break;
+
+        case UPIO_MEM:
+                writeb(value, up->port.membase + offset);
+                break;
+
+        case UPIO_MEM32:
+                writel(value, up->port.membase + offset);
+                break;
+
+        default:
+                outb(value, up->port.iobase + offset);
+        }
+}
+
+/*
+ * We used to support using pause I/O for certain machines.  We
+ * haven't supported this for a while, but just in case it's badly
+ * needed for certain old 386 machines, I've left these #define's
+ * in....
+ */
+#define serial_inp(up, offset)          serial_in(up, offset)
+#define serial_outp(up, offset, value)  serial_out(up, offset, value)
+
+
+/*
+ * For the 16C950
+ */
+static void serial_icr_write(struct uart_8250_port *up, int offset, int value)
+{
+        serial_out(up, UART_SCR, offset);
+        serial_out(up, UART_ICR, value);
+}
+
+static unsigned int serial_icr_read(struct uart_8250_port *up, int offset)
+{
+        unsigned int value;
+
+        serial_icr_write(up, UART_ACR, up->acr | UART_ACR_ICRRD);
+        serial_out(up, UART_SCR, offset);
+        value = serial_in(up, UART_ICR);
+        serial_icr_write(up, UART_ACR, up->acr);
+
+        return value;
+}
+
+/*
+ * FIFO support.
+ */
+static inline void serial8250_clear_fifos(struct uart_8250_port *p)
+{
+        if (p->capabilities & UART_CAP_FIFO) {
+                serial_outp(p, UART_FCR, UART_FCR_ENABLE_FIFO);
+                serial_outp(p, UART_FCR, UART_FCR_ENABLE_FIFO |
+                               UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+                serial_outp(p, UART_FCR, 0);
+        }
+}
+
+/*
+ * IER sleep support.  UARTs which have EFRs need the "extended
+ * capability" bit enabled.  Note that on XR16C850s, we need to
+ * reset LCR to write to IER.
+ */
+static inline void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
+{
+        if (p->capabilities & UART_CAP_SLEEP) {
+                if (p->capabilities & UART_CAP_EFR) {
+                        serial_outp(p, UART_LCR, 0xBF);
+                        serial_outp(p, UART_EFR, UART_EFR_ECB);
+                        serial_outp(p, UART_LCR, 0);
+                }
+                serial_outp(p, UART_IER, sleep ? UART_IERX_SLEEP : 0);
+                if (p->capabilities & UART_CAP_EFR) {
+                        serial_outp(p, UART_LCR, 0xBF);
+                        serial_outp(p, UART_EFR, 0);
+                        serial_outp(p, UART_LCR, 0);
+                }
+        }
+}
+
+#ifdef CONFIG_SERIAL_8250_RSA
+/*
+ * Attempts to turn on the RSA FIFO.  Returns zero on failure.
+ * We set the port uart clock rate if we succeed.
+ */
+static int __enable_rsa(struct uart_8250_port *up)
+{
+        unsigned char mode;
+        int result;
+
+        mode = serial_inp(up, UART_RSA_MSR);
+        result = mode & UART_RSA_MSR_FIFO;
+
+        if (!result) {
+                serial_outp(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
+                mode = serial_inp(up, UART_RSA_MSR);
+                result = mode & UART_RSA_MSR_FIFO;
+        }
+
+        if (result)
+                up->port.uartclk = SERIAL_RSA_BAUD_BASE * 16;
+
+        return result;
+}
+
+static void enable_rsa(struct uart_8250_port *up)
+{
+        if (up->port.type == PORT_RSA) {
+                if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16) {
+                        spin_lock_irq(&up->port.lock);
+                        __enable_rsa(up);
+                        spin_unlock_irq(&up->port.lock);
+                }
+                if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
+                        serial_outp(up, UART_RSA_FRR, 0);
+        }
+}
+
+/*
+ * Attempts to turn off the RSA FIFO.  Returns zero on failure.
+ * It is unknown why interrupts were disabled in here.  However,
+ * the caller is expected to preserve this behaviour by grabbing
+ * the spinlock before calling this function.
+ */
+static void disable_rsa(struct uart_8250_port *up)
+{
+        unsigned char mode;
+        int result;
+
+        if (up->port.type == PORT_RSA &&
+            up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16) {
+                spin_lock_irq(&up->port.lock);
+
+                mode = serial_inp(up, UART_RSA_MSR);
+                result = !(mode & UART_RSA_MSR_FIFO);
+
+                if (!result) {
+                        serial_outp(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
+                        mode = serial_inp(up, UART_RSA_MSR);
+                        result = !(mode & UART_RSA_MSR_FIFO);
+                }
+
+                if (result)
+                        up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
+                spin_unlock_irq(&up->port.lock);
+        }
+}
+#endif /* CONFIG_SERIAL_8250_RSA */
+
+/*
+ * This is a quickie test to see how big the FIFO is.
+ * It doesn't work at all the time, more's the pity.
+ */
+static int size_fifo(struct uart_8250_port *up)
+{
+        unsigned char old_fcr, old_mcr, old_dll, old_dlm, old_lcr;
+        int count;
+
+        old_lcr = serial_inp(up, UART_LCR);
+        serial_outp(up, UART_LCR, 0);
+        old_fcr = serial_inp(up, UART_FCR);
+        old_mcr = serial_inp(up, UART_MCR);
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                    UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+        serial_outp(up, UART_MCR, UART_MCR_LOOP);
+        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        old_dll = serial_inp(up, UART_DLL);
+        old_dlm = serial_inp(up, UART_DLM);
+        serial_outp(up, UART_DLL, 0x01);
+        serial_outp(up, UART_DLM, 0x00);
+        serial_outp(up, UART_LCR, 0x03);
+        for (count = 0; count < 256; count++)
+                serial_outp(up, UART_TX, count);
+        mdelay(20);/* FIXME - schedule_timeout */
+        for (count = 0; (serial_inp(up, UART_LSR) & UART_LSR_DR) &&
+             (count < 256); count++)
+                serial_inp(up, UART_RX);
+        serial_outp(up, UART_FCR, old_fcr);
+        serial_outp(up, UART_MCR, old_mcr);
+        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        serial_outp(up, UART_DLL, old_dll);
+        serial_outp(up, UART_DLM, old_dlm);
+        serial_outp(up, UART_LCR, old_lcr);
+
+        return count;
+}
+
+/*
+ * Read UART ID using the divisor method - set DLL and DLM to zero
+ * and the revision will be in DLL and device type in DLM.  We
+ * preserve the device state across this.
+ */
+static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
+{
+        unsigned char old_dll, old_dlm, old_lcr;
+        unsigned int id;
+
+        old_lcr = serial_inp(p, UART_LCR);
+        serial_outp(p, UART_LCR, UART_LCR_DLAB);
+
+        old_dll = serial_inp(p, UART_DLL);
+        old_dlm = serial_inp(p, UART_DLM);
+
+        serial_outp(p, UART_DLL, 0);
+        serial_outp(p, UART_DLM, 0);
+
+        id = serial_inp(p, UART_DLL) | serial_inp(p, UART_DLM) << 8;
+
+        serial_outp(p, UART_DLL, old_dll);
+        serial_outp(p, UART_DLM, old_dlm);
+        serial_outp(p, UART_LCR, old_lcr);
+
+        return id;
+}
+
+/*
+ * This is a helper routine to autodetect StarTech/Exar/Oxsemi UART's.
+ * When this function is called we know it is at least a StarTech
+ * 16650 V2, but it might be one of several StarTech UARTs, or one of
+ * its clones.  (We treat the broken original StarTech 16650 V1 as a
+ * 16550, and why not?  Startech doesn't seem to even acknowledge its
+ * existence.)
+ * 
+ * What evil have men's minds wrought...
+ */
+static void autoconfig_has_efr(struct uart_8250_port *up)
+{
+        unsigned int id1, id2, id3, rev;
+
+        /*
+         * Everything with an EFR has SLEEP
+         */
+        up->capabilities |= UART_CAP_EFR | UART_CAP_SLEEP;
+
+        /*
+         * First we check to see if it's an Oxford Semiconductor UART.
+         *
+         * If we have to do this here because some non-National
+         * Semiconductor clone chips lock up if you try writing to the
+         * LSR register (which serial_icr_read does)
+         */
+
+        /*
+         * Check for Oxford Semiconductor 16C950.
+         *
+         * EFR [4] must be set else this test fails.
+         *
+         * This shouldn't be necessary, but Mike Hudson (Exoray@isys.ca)
+         * claims that it's needed for 952 dual UART's (which are not
+         * recommended for new designs).
+         */
+        up->acr = 0;
+        serial_out(up, UART_LCR, 0xBF);
+        serial_out(up, UART_EFR, UART_EFR_ECB);
+        serial_out(up, UART_LCR, 0x00);
+        id1 = serial_icr_read(up, UART_ID1);
+        id2 = serial_icr_read(up, UART_ID2);
+        id3 = serial_icr_read(up, UART_ID3);
+        rev = serial_icr_read(up, UART_REV);
+
+        DEBUG_AUTOCONF("950id=%02x:%02x:%02x:%02x ", id1, id2, id3, rev);
+
+        if (id1 == 0x16 && id2 == 0xC9 &&
+            (id3 == 0x50 || id3 == 0x52 || id3 == 0x54)) {
+                up->port.type = PORT_16C950;
+                up->rev = rev | (id3 << 8);
+                return;
+        }
+        
+        /*
+         * We check for a XR16C850 by setting DLL and DLM to 0, and then
+         * reading back DLL and DLM.  The chip type depends on the DLM
+         * value read back:
+         *  0x10 - XR16C850 and the DLL contains the chip revision.
+         *  0x12 - XR16C2850.
+         *  0x14 - XR16C854.
+         */
+        id1 = autoconfig_read_divisor_id(up);
+        DEBUG_AUTOCONF("850id=%04x ", id1);
+
+        id2 = id1 >> 8;
+        if (id2 == 0x10 || id2 == 0x12 || id2 == 0x14) {
+                if (id2 == 0x10)
+                        up->rev = id1 & 255;
+                up->port.type = PORT_16850;
+                return;
+        }
+
+        /*
+         * It wasn't an XR16C850.
+         *
+         * We distinguish between the '654 and the '650 by counting
+         * how many bytes are in the FIFO.  I'm using this for now,
+         * since that's the technique that was sent to me in the
+         * serial driver update, but I'm not convinced this works.
+         * I've had problems doing this in the past.  -TYT
+         */
+        if (size_fifo(up) == 64)
+                up->port.type = PORT_16654;
+        else
+                up->port.type = PORT_16650V2;
+}
+
+/*
+ * We detected a chip without a FIFO.  Only two fall into
+ * this category - the original 8250 and the 16450.  The
+ * 16450 has a scratch register (accessible with LCR=0)
+ */
+static void autoconfig_8250(struct uart_8250_port *up)
+{
+        unsigned char scratch, status1, status2;
+
+        up->port.type = PORT_8250;
+
+        scratch = serial_in(up, UART_SCR);
+        serial_outp(up, UART_SCR, 0xa5);
+        status1 = serial_in(up, UART_SCR);
+        serial_outp(up, UART_SCR, 0x5a);
+        status2 = serial_in(up, UART_SCR);
+        serial_outp(up, UART_SCR, scratch);
+
+        if (status1 == 0xa5 && status2 == 0x5a)
+                up->port.type = PORT_16450;
+}
+
+static int broken_efr(struct uart_8250_port *up)
+{
+        /*
+         * Exar ST16C2550 "A2" devices incorrectly detect as
+         * having an EFR, and report an ID of 0x0201.  See
+         * http://www.exar.com/info.php?pdf=dan180_oct2004.pdf
+         */
+        if (autoconfig_read_divisor_id(up) == 0x0201 && size_fifo(up) == 16)
+                return 1;
+
+        return 0;
+}
+
+/*
+ * We know that the chip has FIFOs.  Does it have an EFR?  The
+ * EFR is located in the same register position as the IIR and
+ * we know the top two bits of the IIR are currently set.  The
+ * EFR should contain zero.  Try to read the EFR.
+ */
+static void autoconfig_16550a(struct uart_8250_port *up)
+{
+        unsigned char status1, status2;
+        unsigned int iersave;
+
+        up->port.type = PORT_16550A;
+        up->capabilities |= UART_CAP_FIFO;
+
+        /*
+         * Check for presence of the EFR when DLAB is set.
+         * Only ST16C650V1 UARTs pass this test.
+         */
+        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        if (serial_in(up, UART_EFR) == 0) {
+                serial_outp(up, UART_EFR, 0xA8);
+                if (serial_in(up, UART_EFR) != 0) {
+                        DEBUG_AUTOCONF("EFRv1 ");
+                        up->port.type = PORT_16650;
+                        up->capabilities |= UART_CAP_EFR | UART_CAP_SLEEP;
+                } else {
+                        DEBUG_AUTOCONF("Motorola 8xxx DUART ");
+                }
+                serial_outp(up, UART_EFR, 0);
+                return;
+        }
+
+        /*
+         * Maybe it requires 0xbf to be written to the LCR.
+         * (other ST16C650V2 UARTs, TI16C752A, etc)
+         */
+        serial_outp(up, UART_LCR, 0xBF);
+        if (serial_in(up, UART_EFR) == 0 && !broken_efr(up)) {
+                DEBUG_AUTOCONF("EFRv2 ");
+                autoconfig_has_efr(up);
+                return;
+        }
+
+        /*
+         * Check for a National Semiconductor SuperIO chip.
+         * Attempt to switch to bank 2, read the value of the LOOP bit
+         * from EXCR1. Switch back to bank 0, change it in MCR. Then
+         * switch back to bank 2, read it from EXCR1 again and check
+         * it's changed. If so, set baud_base in EXCR2 to 921600. -- dwmw2
+         * On PowerPC we don't want to change baud_base, as we have
+         * a number of different divisors.  -- Tom Rini
+         */
+        serial_outp(up, UART_LCR, 0);
+        status1 = serial_in(up, UART_MCR);
+        serial_outp(up, UART_LCR, 0xE0);
+        status2 = serial_in(up, 0x02); /* EXCR1 */
+
+        if (!((status2 ^ status1) & UART_MCR_LOOP)) {
+                serial_outp(up, UART_LCR, 0);
+                serial_outp(up, UART_MCR, status1 ^ UART_MCR_LOOP);
+                serial_outp(up, UART_LCR, 0xE0);
+                status2 = serial_in(up, 0x02); /* EXCR1 */
+                serial_outp(up, UART_LCR, 0);
+                serial_outp(up, UART_MCR, status1);
+
+                if ((status2 ^ status1) & UART_MCR_LOOP) {
+#ifndef CONFIG_PPC
+                        serial_outp(up, UART_LCR, 0xE0);
+                        status1 = serial_in(up, 0x04); /* EXCR1 */
+                        status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+                        status1 |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
+                        serial_outp(up, 0x04, status1);
+                        serial_outp(up, UART_LCR, 0);
+                        up->port.uartclk = 921600*16;
+#endif
+
+                        up->port.type = PORT_NS16550A;
+                        up->capabilities |= UART_NATSEMI;
+                        return;
+                }
+        }
+
+        /*
+         * No EFR.  Try to detect a TI16750, which only sets bit 5 of
+         * the IIR when 64 byte FIFO mode is enabled when DLAB is set.
+         * Try setting it with and without DLAB set.  Cheap clones
+         * set bit 5 without DLAB set.
+         */
+        serial_outp(up, UART_LCR, 0);
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
+        status1 = serial_in(up, UART_IIR) >> 5;
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
+        status2 = serial_in(up, UART_IIR) >> 5;
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        serial_outp(up, UART_LCR, 0);
+
+        DEBUG_AUTOCONF("iir1=%d iir2=%d ", status1, status2);
+
+        if (status1 == 6 && status2 == 7) {
+                up->port.type = PORT_16750;
+                up->capabilities |= UART_CAP_AFE | UART_CAP_SLEEP;
+                return;
+        }
+
+        /*
+         * Try writing and reading the UART_IER_UUE bit (b6).
+         * If it works, this is probably one of the Xscale platform's
+         * internal UARTs.
+         * We're going to explicitly set the UUE bit to 0 before
+         * trying to write and read a 1 just to make sure it's not
+         * already a 1 and maybe locked there before we even start start.
+         */
+        iersave = serial_in(up, UART_IER);
+        serial_outp(up, UART_IER, iersave & ~UART_IER_UUE);
+        if (!(serial_in(up, UART_IER) & UART_IER_UUE)) {
+                /*
+                 * OK it's in a known zero state, try writing and reading
+                 * without disturbing the current state of the other bits.
+                 */
+                serial_outp(up, UART_IER, iersave | UART_IER_UUE);
+                if (serial_in(up, UART_IER) & UART_IER_UUE) {
+                        /*
+                         * It's an Xscale.
+                         * We'll leave the UART_IER_UUE bit set to 1 (enabled).
+                         */
+                        DEBUG_AUTOCONF("Xscale ");
+                        up->port.type = PORT_XSCALE;
+                        up->capabilities |= UART_CAP_UUE;
+                        return;
+                }
+        } else {
+                /*
+                 * If we got here we couldn't force the IER_UUE bit to 0.
+                 * Log it and continue.
+                 */
+                DEBUG_AUTOCONF("Couldn't force IER_UUE to 0 ");
+        }
+        serial_outp(up, UART_IER, iersave);
+}
+
+/*
+ * This routine is called by rs_init() to initialize a specific serial
+ * port.  It determines what type of UART chip this serial port is
+ * using: 8250, 16450, 16550, 16550A.  The important question is
+ * whether or not this UART is a 16550A or not, since this will
+ * determine whether or not we can use its FIFO features or not.
+ */
+static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
+{
+        unsigned char status1, scratch, scratch2, scratch3;
+        unsigned char save_lcr, save_mcr;
+        unsigned long flags;
+
+        if (!up->port.iobase && !up->port.mapbase && !up->port.membase)
+                return;
+
+        DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%p): ",
+                        up->port.line, up->port.iobase, up->port.membase);
+
+        /*
+         * We really do need global IRQs disabled here - we're going to
+         * be frobbing the chips IRQ enable register to see if it exists.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+//      save_flags(flags); cli();
+
+        up->capabilities = 0;
+
+        if (!(up->port.flags & UPF_BUGGY_UART)) {
+                /*
+                 * Do a simple existence test first; if we fail this,
+                 * there's no point trying anything else.
+                 * 
+                 * 0x80 is used as a nonsense port to prevent against
+                 * false positives due to ISA bus float.  The
+                 * assumption is that 0x80 is a non-existent port;
+                 * which should be safe since include/asm/io.h also
+                 * makes this assumption.
+                 *
+                 * Note: this is safe as long as MCR bit 4 is clear
+                 * and the device is in "PC" mode.
+                 */
+                scratch = serial_inp(up, UART_IER);
+                serial_outp(up, UART_IER, 0);
+#ifdef __i386__
+                outb(0xff, 0x080);
+#endif
+                scratch2 = serial_inp(up, UART_IER);
+                serial_outp(up, UART_IER, 0x0F);
+#ifdef __i386__
+                outb(0, 0x080);
+#endif
+                scratch3 = serial_inp(up, UART_IER);
+                serial_outp(up, UART_IER, scratch);
+                if (scratch2 != 0 || scratch3 != 0x0F) {
+                        /*
+                         * We failed; there's nothing here
+                         */
+                        DEBUG_AUTOCONF("IER test failed (%02x, %02x) ",
+                                       scratch2, scratch3);
+                        goto out;
+                }
+        }
+
+        save_mcr = serial_in(up, UART_MCR);
+        save_lcr = serial_in(up, UART_LCR);
+
+        /* 
+         * Check to see if a UART is really there.  Certain broken
+         * internal modems based on the Rockwell chipset fail this
+         * test, because they apparently don't implement the loopback
+         * test mode.  So this test is skipped on the COM 1 through
+         * COM 4 ports.  This *should* be safe, since no board
+         * manufacturer would be stupid enough to design a board
+         * that conflicts with COM 1-4 --- we hope!
+         */
+        if (!(up->port.flags & UPF_SKIP_TEST)) {
+                serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A);
+                status1 = serial_inp(up, UART_MSR) & 0xF0;
+                serial_outp(up, UART_MCR, save_mcr);
+                if (status1 != 0x90) {
+                        DEBUG_AUTOCONF("LOOP test failed (%02x) ",
+                                       status1);
+                        goto out;
+                }
+        }
+
+        /*
+         * We're pretty sure there's a port here.  Lets find out what
+         * type of port it is.  The IIR top two bits allows us to find
+         * out if its 8250 or 16450, 16550, 16550A or later.  This
+         * determines what we test for next.
+         *
+         * We also initialise the EFR (if any) to zero for later.  The
+         * EFR occupies the same register location as the FCR and IIR.
+         */
+        serial_outp(up, UART_LCR, 0xBF);
+        serial_outp(up, UART_EFR, 0);
+        serial_outp(up, UART_LCR, 0);
+
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        scratch = serial_in(up, UART_IIR) >> 6;
+
+        DEBUG_AUTOCONF("iir=%d ", scratch);
+
+        switch (scratch) {
+        case 0:
+                autoconfig_8250(up);
+                break;
+        case 1:
+                up->port.type = PORT_UNKNOWN;
+                break;
+        case 2:
+                up->port.type = PORT_16550;
+                break;
+        case 3:
+                autoconfig_16550a(up);
+                break;
+        }
+
+#ifdef CONFIG_SERIAL_8250_RSA
+        /*
+         * Only probe for RSA ports if we got the region.
+         */
+        if (up->port.type == PORT_16550A && probeflags & PROBE_RSA) {
+                int i;
+
+                for (i = 0 ; i < probe_rsa_count; ++i) {
+                        if (probe_rsa[i] == up->port.iobase &&
+                            __enable_rsa(up)) {
+                                up->port.type = PORT_RSA;
+                                break;
+                        }
+                }
+        }
+#endif
+        serial_outp(up, UART_LCR, save_lcr);
+
+        if (up->capabilities != uart_config[up->port.type].flags) {
+                printk(KERN_WARNING
+                       "ttyS%d: detected caps %08x should be %08x\n",
+                        up->port.line, up->capabilities,
+                        uart_config[up->port.type].flags);
+        }
+
+        up->port.fifosize = uart_config[up->port.type].fifo_size;
+        up->capabilities = uart_config[up->port.type].flags;
+        up->tx_loadsz = uart_config[up->port.type].tx_loadsz;
+
+        if (up->port.type == PORT_UNKNOWN)
+                goto out;
+
+        /*
+         * Reset the UART.
+         */
+#ifdef CONFIG_SERIAL_8250_RSA
+        if (up->port.type == PORT_RSA)
+                serial_outp(up, UART_RSA_FRR, 0);
+#endif
+        serial_outp(up, UART_MCR, save_mcr);
+        serial8250_clear_fifos(up);
+        (void)serial_in(up, UART_RX);
+        serial_outp(up, UART_IER, 0);
+
+ out:   
+        spin_unlock_irqrestore(&up->port.lock, flags);
+//      restore_flags(flags);
+        DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
+}
+
+static void autoconfig_irq(struct uart_8250_port *up)
+{
+        unsigned char save_mcr, save_ier;
+        unsigned char save_ICP = 0;
+        unsigned int ICP = 0;
+        unsigned long irqs;
+        int irq;
+
+        if (up->port.flags & UPF_FOURPORT) {
+                ICP = (up->port.iobase & 0xfe0) | 0x1f;
+                save_ICP = inb_p(ICP);
+                outb_p(0x80, ICP);
+                (void) inb_p(ICP);
+        }
+
+        /* forget possible initially masked and pending IRQ */
+        probe_irq_off(probe_irq_on());
+        save_mcr = serial_inp(up, UART_MCR);
+        save_ier = serial_inp(up, UART_IER);
+        serial_outp(up, UART_MCR, UART_MCR_OUT1 | UART_MCR_OUT2);
+        
+        irqs = probe_irq_on();
+        serial_outp(up, UART_MCR, 0);
+        udelay (10);
+        if (up->port.flags & UPF_FOURPORT)  {
+                serial_outp(up, UART_MCR,
+                            UART_MCR_DTR | UART_MCR_RTS);
+        } else {
+                serial_outp(up, UART_MCR,
+                            UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2);
+        }
+        serial_outp(up, UART_IER, 0x0f);        /* enable all intrs */
+        (void)serial_inp(up, UART_LSR);
+        (void)serial_inp(up, UART_RX);
+        (void)serial_inp(up, UART_IIR);
+        (void)serial_inp(up, UART_MSR);
+        serial_outp(up, UART_TX, 0xFF);
+        udelay (20);
+        irq = probe_irq_off(irqs);
+
+        serial_outp(up, UART_MCR, save_mcr);
+        serial_outp(up, UART_IER, save_ier);
+
+        if (up->port.flags & UPF_FOURPORT)
+                outb_p(save_ICP, ICP);
+
+        up->port.irq = (irq > 0) ? irq : 0;
+}
+
+static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        if (up->ier & UART_IER_THRI) {
+                up->ier &= ~UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+
+        /*
+         * We only do this from uart_stop - if we run out of
+         * characters to send, we don't want to prevent the
+         * FIFO from emptying.
+         */
+        if (up->port.type == PORT_16C950 && tty_stop) {
+                up->acr |= UART_ACR_TXDIS;
+                serial_icr_write(up, UART_ACR, up->acr);
+        }
+}
+
+static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        if (!(up->ier & UART_IER_THRI)) {
+                up->ier |= UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+        /*
+         * We only do this from uart_start
+         */
+        if (tty_start && up->port.type == PORT_16C950) {
+                up->acr &= ~UART_ACR_TXDIS;
+                serial_icr_write(up, UART_ACR, up->acr);
+        }
+}
+
+static void serial8250_stop_rx(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        up->ier &= ~UART_IER_RLSI;
+        up->port.read_status_mask &= ~UART_LSR_DR;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static void serial8250_enable_ms(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        up->ier |= UART_IER_MSI;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static _INLINE_ void
+receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;
+        unsigned char ch, lsr = *status;
+        int max_count = 256;
+        char flag;
+
+        do {
+                /* The following is not allowed by the tty layer and
+                   unsafe. It should be fixed ASAP */
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        if (tty->low_latency) {
+                                spin_unlock(&up->port.lock);
+                                tty_flip_buffer_push(tty);
+                                spin_lock(&up->port.lock);
+                        }
+                        /* If this failed then we will throw away the
+                           bytes but must do so to clear interrupts */
+                }
+                ch = serial_inp(up, UART_RX);
+                flag = TTY_NORMAL;
+                up->port.icount.rx++;
+
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+                /*
+                 * Recover the break flag from console xmit
+                 */
+                if (up->port.line == up->port.cons->index) {
+                        lsr |= up->lsr_break_flag;
+                        up->lsr_break_flag = 0;
+                }
+#endif
+
+                if (unlikely(lsr & (UART_LSR_BI | UART_LSR_PE |
+                                    UART_LSR_FE | UART_LSR_OE))) {
+                        /*
+                         * For statistics only
+                         */
+                        if (lsr & UART_LSR_BI) {
+                                lsr &= ~(UART_LSR_FE | UART_LSR_PE);
+                                up->port.icount.brk++;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        goto ignore_char;
+                        } else if (lsr & UART_LSR_PE)
+                                up->port.icount.parity++;
+                        else if (lsr & UART_LSR_FE)
+                                up->port.icount.frame++;
+                        if (lsr & UART_LSR_OE)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ingored.
+                         */
+                        lsr &= up->port.read_status_mask;
+
+                        if (lsr & UART_LSR_BI) {
+                                DEBUG_INTR("handling break....");
+                                flag = TTY_BREAK;
+                        } else if (lsr & UART_LSR_PE)
+                                flag = TTY_PARITY;
+                        else if (lsr & UART_LSR_FE)
+                                flag = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto ignore_char;
+                if ((lsr & up->port.ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+                if ((lsr & UART_LSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+        ignore_char:
+                lsr = serial_inp(up, UART_LSR);
+        } while ((lsr & UART_LSR_DR) && (max_count-- > 0));
+        spin_unlock(&up->port.lock);
+        tty_flip_buffer_push(tty);
+        spin_lock(&up->port.lock);
+        *status = lsr;
+}
+
+static _INLINE_ void transmit_chars(struct uart_8250_port *up)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int count;
+
+        if (up->port.x_char) {
+                serial_outp(up, UART_TX, up->port.x_char);
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                serial8250_stop_tx(&up->port, 0);
+                return;
+        }
+
+        count = up->tx_loadsz;
+        do {
+                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        DEBUG_INTR("THRE...");
+
+        if (uart_circ_empty(xmit))
+                serial8250_stop_tx(&up->port, 0);
+}
+
+static _INLINE_ void check_modem_status(struct uart_8250_port *up)
+{
+        int status;
+
+        status = serial_in(up, UART_MSR);
+
+        if ((status & UART_MSR_ANY_DELTA) == 0)
+                return;
+
+        if (status & UART_MSR_TERI)
+                up->port.icount.rng++;
+        if (status & UART_MSR_DDSR)
+                up->port.icount.dsr++;
+        if (status & UART_MSR_DDCD)
+                uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
+        if (status & UART_MSR_DCTS)
+                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+
+        wake_up_interruptible(&up->port.info->delta_msr_wait);
+}
+
+/*
+ * This handles the interrupt from one port.
+ */
+static inline void
+serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
+{
+        unsigned int status = serial_inp(up, UART_LSR);
+
+        DEBUG_INTR("status = %x...", status);
+
+        if (status & UART_LSR_DR)
+                receive_chars(up, &status, regs);
+        check_modem_status(up);
+        if (status & UART_LSR_THRE)
+                transmit_chars(up);
+}
+
+/*
+ * This is the serial driver's interrupt routine.
+ *
+ * Arjan thinks the old way was overly complex, so it got simplified.
+ * Alan disagrees, saying that need the complexity to handle the weird
+ * nature of ISA shared interrupts.  (This is a special exception.)
+ *
+ * In order to handle ISA shared interrupts properly, we need to check
+ * that all ports have been serviced, and therefore the ISA interrupt
+ * line has been de-asserted.
+ *
+ * This means we need to loop through all ports. checking that they
+ * don't have an interrupt pending.
+ */
+static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct irq_info *i = dev_id;
+        struct list_head *l, *end = NULL;
+        int pass_counter = 0, handled = 0;
+
+        DEBUG_INTR("serial8250_interrupt(%d)...", irq);
+
+        spin_lock(&i->lock);
+
+        l = i->head;
+        do {
+                struct uart_8250_port *up;
+                unsigned int iir;
+
+                up = list_entry(l, struct uart_8250_port, list);
+
+                iir = serial_in(up, UART_IIR);
+                if (!(iir & UART_IIR_NO_INT)) {
+                        spin_lock(&up->port.lock);
+                        serial8250_handle_port(up, regs);
+                        spin_unlock(&up->port.lock);
+
+                        handled = 1;
+
+                        end = NULL;
+                } else if (end == NULL)
+                        end = l;
+
+                l = l->next;
+
+                if (l == i->head && pass_counter++ > PASS_LIMIT) {
+                        /* If we hit this, we're dead. */
+                        printk(KERN_ERR "serial8250: too much work for "
+                                "irq%d\n", irq);
+                        break;
+                }
+        } while (l != end);
+
+        spin_unlock(&i->lock);
+
+        DEBUG_INTR("end.\n");
+
+        return IRQ_RETVAL(handled);
+}
+
+/*
+ * To support ISA shared interrupts, we need to have one interrupt
+ * handler that ensures that the IRQ line has been deasserted
+ * before returning.  Failing to do this will result in the IRQ
+ * line being stuck active, and, since ISA irqs are edge triggered,
+ * no more IRQs will be seen.
+ */
+static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)
+{
+        spin_lock_irq(&i->lock);
+
+        if (!list_empty(i->head)) {
+                if (i->head == &up->list)
+                        i->head = i->head->next;
+                list_del(&up->list);
+        } else {
+                BUG_ON(i->head != &up->list);
+                i->head = NULL;
+        }
+
+        spin_unlock_irq(&i->lock);
+}
+
+static int serial_link_irq_chain(struct uart_8250_port *up)
+{
+        struct irq_info *i = irq_lists + up->port.irq;
+        int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0;
+
+        spin_lock_irq(&i->lock);
+
+        if (i->head) {
+                list_add(&up->list, i->head);
+                spin_unlock_irq(&i->lock);
+
+                ret = 0;
+        } else {
+                INIT_LIST_HEAD(&up->list);
+                i->head = &up->list;
+                spin_unlock_irq(&i->lock);
+
+                ret = request_irq(up->port.irq, serial8250_interrupt,
+                                  irq_flags, "serial", i);
+                if (ret < 0)
+                        serial_do_unlink(i, up);
+        }
+
+        return ret;
+}
+
+static void serial_unlink_irq_chain(struct uart_8250_port *up)
+{
+        struct irq_info *i = irq_lists + up->port.irq;
+
+        BUG_ON(i->head == NULL);
+
+        if (list_empty(i->head))
+                free_irq(up->port.irq, i);
+
+        serial_do_unlink(i, up);
+}
+
+/*
+ * This function is used to handle ports that do not have an
+ * interrupt.  This doesn't work very well for 16450's, but gives
+ * barely passable results for a 16550A.  (Although at the expense
+ * of much CPU overhead).
+ */
+static void serial8250_timeout(unsigned long data)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)data;
+        unsigned int timeout;
+        unsigned int iir;
+
+        iir = serial_in(up, UART_IIR);
+        if (!(iir & UART_IIR_NO_INT)) {
+                spin_lock(&up->port.lock);
+                serial8250_handle_port(up, NULL);
+                spin_unlock(&up->port.lock);
+        }
+
+        timeout = up->port.timeout;
+        timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
+        mod_timer(&up->timer, jiffies + timeout);
+}
+
+static unsigned int serial8250_tx_empty(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static unsigned int serial8250_get_mctrl(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+        unsigned char status;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        status = serial_in(up, UART_MSR);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        ret = 0;
+        if (status & UART_MSR_DCD)
+                ret |= TIOCM_CAR;
+        if (status & UART_MSR_RI)
+                ret |= TIOCM_RNG;
+        if (status & UART_MSR_DSR)
+                ret |= TIOCM_DSR;
+        if (status & UART_MSR_CTS)
+                ret |= TIOCM_CTS;
+        return ret;
+}
+
+static void serial8250_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned char mcr = 0;
+
+        if (mctrl & TIOCM_RTS)
+                mcr |= UART_MCR_RTS;
+        if (mctrl & TIOCM_DTR)
+                mcr |= UART_MCR_DTR;
+        if (mctrl & TIOCM_OUT1)
+                mcr |= UART_MCR_OUT1;
+        if (mctrl & TIOCM_OUT2)
+                mcr |= UART_MCR_OUT2;
+        if (mctrl & TIOCM_LOOP)
+                mcr |= UART_MCR_LOOP;
+
+        mcr = (mcr & up->mcr_mask) | up->mcr_force | up->mcr;
+
+        serial_out(up, UART_MCR, mcr);
+}
+
+static void serial8250_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (break_state == -1)
+                up->lcr |= UART_LCR_SBC;
+        else
+                up->lcr &= ~UART_LCR_SBC;
+        serial_out(up, UART_LCR, up->lcr);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int serial8250_startup(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+        int retval;
+
+        up->capabilities = uart_config[up->port.type].flags;
+        up->mcr = 0;
+
+        if (up->port.type == PORT_16C950) {
+                /* Wake up and initialize UART */
+                up->acr = 0;
+                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_EFR, UART_EFR_ECB);
+                serial_outp(up, UART_IER, 0);
+                serial_outp(up, UART_LCR, 0);
+                serial_icr_write(up, UART_CSR, 0); /* Reset the UART */
+                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_EFR, UART_EFR_ECB);
+                serial_outp(up, UART_LCR, 0);
+        }
+
+#ifdef CONFIG_SERIAL_8250_RSA
+        /*
+         * If this is an RSA port, see if we can kick it up to the
+         * higher speed clock.
+         */
+        enable_rsa(up);
+#endif
+
+        /*
+         * Clear the FIFO buffers and disable them.
+         * (they will be reeanbled in set_termios())
+         */
+        serial8250_clear_fifos(up);
+
+        /*
+         * Clear the interrupt registers.
+         */
+        (void) serial_inp(up, UART_LSR);
+        (void) serial_inp(up, UART_RX);
+        (void) serial_inp(up, UART_IIR);
+        (void) serial_inp(up, UART_MSR);
+
+        /*
+         * At this point, there's no way the LSR could still be 0xff;
+         * if it is, then bail out, because there's likely no UART
+         * here.
+         */
+        if (!(up->port.flags & UPF_BUGGY_UART) &&
+            (serial_inp(up, UART_LSR) == 0xff)) {
+                printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
+                return -ENODEV;
+        }
+
+        /*
+         * For a XR16C850, we need to set the trigger levels
+         */
+        if (up->port.type == PORT_16850) {
+                unsigned char fctr;
+
+                serial_outp(up, UART_LCR, 0xbf);
+
+                fctr = serial_inp(up, UART_FCTR) & ~(UART_FCTR_RX|UART_FCTR_TX);
+                serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD | UART_FCTR_RX);
+                serial_outp(up, UART_TRG, UART_TRG_96);
+                serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD | UART_FCTR_TX);
+                serial_outp(up, UART_TRG, UART_TRG_96);
+
+                serial_outp(up, UART_LCR, 0);
+        }
+
+        /*
+         * If the "interrupt" for this port doesn't correspond with any
+         * hardware interrupt, we use a timer-based system.  The original
+         * driver used to do this with IRQ0.
+         */
+        if (!is_real_interrupt(up->port.irq)) {
+                unsigned int timeout = up->port.timeout;
+
+                timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
+
+                up->timer.data = (unsigned long)up;
+                mod_timer(&up->timer, jiffies + timeout);
+        } else {
+                retval = serial_link_irq_chain(up);
+                if (retval)
+                        return retval;
+        }
+
+        /*
+         * Now, initialize the UART
+         */
+        serial_outp(up, UART_LCR, UART_LCR_WLEN8);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (up->port.flags & UPF_FOURPORT) {
+                if (!is_real_interrupt(up->port.irq))
+                        up->port.mctrl |= TIOCM_OUT1;
+        } else
+                /*
+                 * Most PC uarts need OUT2 raised to enable interrupts.
+                 */
+                if (is_real_interrupt(up->port.irq))
+                        up->port.mctrl |= TIOCM_OUT2;
+
+        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Finally, enable interrupts.  Note: Modem status interrupts
+         * are set via set_termios(), which will be occurring imminently
+         * anyway, so we don't enable them here.
+         */
+        up->ier = UART_IER_RLSI | UART_IER_RDI;
+        serial_outp(up, UART_IER, up->ier);
+
+        if (up->port.flags & UPF_FOURPORT) {
+                unsigned int icp;
+                /*
+                 * Enable interrupts on the AST Fourport board
+                 */
+                icp = (up->port.iobase & 0xfe0) | 0x01f;
+                outb_p(0x80, icp);
+                (void) inb_p(icp);
+        }
+
+        /*
+         * And clear the interrupt registers again for luck.
+         */
+        (void) serial_inp(up, UART_LSR);
+        (void) serial_inp(up, UART_RX);
+        (void) serial_inp(up, UART_IIR);
+        (void) serial_inp(up, UART_MSR);
+
+        return 0;
+}
+
+static void serial8250_shutdown(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+
+        /*
+         * Disable interrupts from this port
+         */
+        up->ier = 0;
+        serial_outp(up, UART_IER, 0);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (up->port.flags & UPF_FOURPORT) {
+                /* reset interrupts on the AST Fourport board */
+                inb((up->port.iobase & 0xfe0) | 0x1f);
+                up->port.mctrl |= TIOCM_OUT1;
+        } else
+                up->port.mctrl &= ~TIOCM_OUT2;
+
+        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Disable break condition and FIFOs
+         */
+        serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC);
+        serial8250_clear_fifos(up);
+
+#ifdef CONFIG_SERIAL_8250_RSA
+        /*
+         * Reset the RSA board back to 115kbps compat mode.
+         */
+        disable_rsa(up);
+#endif
+
+        /*
+         * Read data port to reset things, and then unlink from
+         * the IRQ chain.
+         */
+        (void) serial_in(up, UART_RX);
+
+        if (!is_real_interrupt(up->port.irq))
+                del_timer_sync(&up->timer);
+        else
+                serial_unlink_irq_chain(up);
+}
+
+static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud)
+{
+        unsigned int quot;
+
+        /*
+         * Handle magic divisors for baud rates above baud_base on
+         * SMSC SuperIO chips.
+         */
+        if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
+            baud == (port->uartclk/4))
+                quot = 0x8001;
+        else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
+                 baud == (port->uartclk/8))
+                quot = 0x8002;
+        else
+                quot = uart_get_divisor(port, baud);
+
+        return quot;
+}
+
+static void
+serial8250_set_termios(struct uart_port *port, struct termios *termios,
+                       struct termios *old)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned char cval, fcr = 0;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                cval = 0x00;
+                break;
+        case CS6:
+                cval = 0x01;
+                break;
+        case CS7:
+                cval = 0x02;
+                break;
+        default:
+        case CS8:
+                cval = 0x03;
+                break;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                cval |= 0x04;
+        if (termios->c_cflag & PARENB)
+                cval |= UART_LCR_PARITY;
+        if (!(termios->c_cflag & PARODD))
+                cval |= UART_LCR_EPAR;
+#ifdef CMSPAR
+        if (termios->c_cflag & CMSPAR)
+                cval |= UART_LCR_SPAR;
+#endif
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = serial8250_get_divisor(port, baud);
+
+        /*
+         * Work around a bug in the Oxford Semiconductor 952 rev B
+         * chip which causes it to seriously miscalculate baud rates
+         * when DLL is 0.
+         */
+        if ((quot & 0xff) == 0 && up->port.type == PORT_16C950 &&
+            up->rev == 0x5201)
+                quot ++;
+
+        if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
+                if (baud < 2400)
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
+                else
+                        fcr = uart_config[up->port.type].fcr;
+        }
+
+        /*
+         * MCR-based auto flow control.  When AFE is enabled, RTS will be
+         * deasserted when the receive FIFO contains more characters than
+         * the trigger, or the MCR RTS bit is cleared.  In the case where
+         * the remote UART is not using CTS auto flow control, we must
+         * have sufficient FIFO entries for the latency of the remote
+         * UART to respond.  IOW, at least 32 bytes of FIFO.
+         */
+        if (up->capabilities & UART_CAP_AFE && up->port.fifosize >= 32) {
+                up->mcr &= ~UART_MCR_AFE;
+                if (termios->c_cflag & CRTSCTS)
+                        up->mcr |= UART_MCR_AFE;
+        }
+
+        /*
+         * Ok, we're now changing the port state.  Do it with
+         * interrupts disabled.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
+        if (termios->c_iflag & INPCK)
+                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= UART_LSR_BI;
+
+        /*
+         * Characteres to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
+        if (termios->c_iflag & IGNBRK) {
+                up->port.ignore_status_mask |= UART_LSR_BI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        up->port.ignore_status_mask |= UART_LSR_OE;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= UART_LSR_DR;
+
+        /*
+         * CTS flow control flag and modem status interrupts
+         */
+        up->ier &= ~UART_IER_MSI;
+        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+                up->ier |= UART_IER_MSI;
+        if (up->capabilities & UART_CAP_UUE)
+                up->ier |= UART_IER_UUE | UART_IER_RTOIE;
+
+        serial_out(up, UART_IER, up->ier);
+
+        if (up->capabilities & UART_CAP_EFR) {
+                unsigned char efr = 0;
+                /*
+                 * TI16C752/Startech hardware flow control.  FIXME:
+                 * - TI16C752 requires control thresholds to be set.
+                 * - UART_MCR_RTS is ineffective if auto-RTS mode is enabled.
+                 */
+                if (termios->c_cflag & CRTSCTS)
+                        efr |= UART_EFR_CTS;
+
+                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_EFR, efr);
+        }
+
+        if (up->capabilities & UART_NATSEMI) {
+                /* Switch to bank 2 not bank 1, to avoid resetting EXCR2 */
+                serial_outp(up, UART_LCR, 0xe0);
+        } else {
+                serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
+        }
+
+        serial_outp(up, UART_DLL, quot & 0xff);         /* LS of divisor */
+        serial_outp(up, UART_DLM, quot >> 8);           /* MS of divisor */
+
+        /*
+         * LCR DLAB must be set to enable 64-byte FIFO mode. If the FCR
+         * is written without DLAB set, this mode will be disabled.
+         */
+        if (up->port.type == PORT_16750)
+                serial_outp(up, UART_FCR, fcr);
+
+        serial_outp(up, UART_LCR, cval);                /* reset DLAB */
+        up->lcr = cval;                                 /* Save LCR */
+        if (up->port.type != PORT_16750) {
+                if (fcr & UART_FCR_ENABLE_FIFO) {
+                        /* emulated UARTs (Lucent Venus 167x) need two steps */
+                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                }
+                serial_outp(up, UART_FCR, fcr);         /* set fcr */
+        }
+        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void
+serial8250_pm(struct uart_port *port, unsigned int state,
+              unsigned int oldstate)
+{
+        struct uart_8250_port *p = (struct uart_8250_port *)port;
+
+        serial8250_set_sleep(p, state != 0);
+
+        if (p->pm)
+                p->pm(port, state, oldstate);
+}
+
+/*
+ * Resource handling.
+ */
+static int serial8250_request_std_resource(struct uart_8250_port *up)
+{
+        unsigned int size = 8 << up->port.regshift;
+        int ret = 0;
+
+        switch (up->port.iotype) {
+        case UPIO_MEM:
+                if (!up->port.mapbase)
+                        break;
+
+                if (!request_mem_region(up->port.mapbase, size, "serial")) {
+                        ret = -EBUSY;
+                        break;
+                }
+
+                if (up->port.flags & UPF_IOREMAP) {
+                        up->port.membase = ioremap(up->port.mapbase, size);
+                        if (!up->port.membase) {
+                                release_mem_region(up->port.mapbase, size);
+                                ret = -ENOMEM;
+                        }
+                }
+                break;
+
+        case UPIO_HUB6:
+        case UPIO_PORT:
+                if (!request_region(up->port.iobase, size, "serial"))
+                        ret = -EBUSY;
+                break;
+        }
+        return ret;
+}
+
+static void serial8250_release_std_resource(struct uart_8250_port *up)
+{
+        unsigned int size = 8 << up->port.regshift;
+
+        switch (up->port.iotype) {
+        case UPIO_MEM:
+                if (!up->port.mapbase)
+                        break;
+
+                if (up->port.flags & UPF_IOREMAP) {
+                        iounmap(up->port.membase);
+                        up->port.membase = NULL;
+                }
+
+                release_mem_region(up->port.mapbase, size);
+                break;
+
+        case UPIO_HUB6:
+        case UPIO_PORT:
+                release_region(up->port.iobase, size);
+                break;
+        }
+}
+
+static int serial8250_request_rsa_resource(struct uart_8250_port *up)
+{
+        unsigned long start = UART_RSA_BASE << up->port.regshift;
+        unsigned int size = 8 << up->port.regshift;
+        int ret = 0;
+
+        switch (up->port.iotype) {
+        case UPIO_MEM:
+                ret = -EINVAL;
+                break;
+
+        case UPIO_HUB6:
+        case UPIO_PORT:
+                start += up->port.iobase;
+                if (!request_region(start, size, "serial-rsa"))
+                        ret = -EBUSY;
+                break;
+        }
+
+        return ret;
+}
+
+static void serial8250_release_rsa_resource(struct uart_8250_port *up)
+{
+        unsigned long offset = UART_RSA_BASE << up->port.regshift;
+        unsigned int size = 8 << up->port.regshift;
+
+        switch (up->port.iotype) {
+        case UPIO_MEM:
+                break;
+
+        case UPIO_HUB6:
+        case UPIO_PORT:
+                release_region(up->port.iobase + offset, size);
+                break;
+        }
+}
+
+static void serial8250_release_port(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        serial8250_release_std_resource(up);
+        if (up->port.type == PORT_RSA)
+                serial8250_release_rsa_resource(up);
+}
+
+static int serial8250_request_port(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        int ret = 0;
+
+        ret = serial8250_request_std_resource(up);
+        if (ret == 0 && up->port.type == PORT_RSA) {
+                ret = serial8250_request_rsa_resource(up);
+                if (ret < 0)
+                        serial8250_release_std_resource(up);
+        }
+
+        return ret;
+}
+
+static void serial8250_config_port(struct uart_port *port, int flags)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        int probeflags = PROBE_ANY;
+        int ret;
+
+        /*
+         * Don't probe for MCA ports on non-MCA machines.
+         */
+        if (up->port.flags & UPF_BOOT_ONLYMCA && !MCA_bus)
+                return;
+
+        /*
+         * Find the region that we can probe for.  This in turn
+         * tells us whether we can probe for the type of port.
+         */
+        ret = serial8250_request_std_resource(up);
+        if (ret < 0)
+                return;
+
+        ret = serial8250_request_rsa_resource(up);
+        if (ret < 0)
+                probeflags &= ~PROBE_RSA;
+
+        if (flags & UART_CONFIG_TYPE)
+                autoconfig(up, probeflags);
+        if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
+                autoconfig_irq(up);
+
+        if (up->port.type != PORT_RSA && probeflags & PROBE_RSA)
+                serial8250_release_rsa_resource(up);
+        if (up->port.type == PORT_UNKNOWN)
+                serial8250_release_std_resource(up);
+}
+
+static int
+serial8250_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        if (ser->irq >= NR_IRQS || ser->irq < 0 ||
+            ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
+            ser->type >= ARRAY_SIZE(uart_config) || ser->type == PORT_CIRRUS ||
+            ser->type == PORT_STARTECH)
+                return -EINVAL;
+        return 0;
+}
+
+static const char *
+serial8250_type(struct uart_port *port)
+{
+        int type = port->type;
+
+        if (type >= ARRAY_SIZE(uart_config))
+                type = 0;
+        return uart_config[type].name;
+}
+
+static struct uart_ops serial8250_pops = {
+        .tx_empty       = serial8250_tx_empty,
+        .set_mctrl      = serial8250_set_mctrl,
+        .get_mctrl      = serial8250_get_mctrl,
+        .stop_tx        = serial8250_stop_tx,
+        .start_tx       = serial8250_start_tx,
+        .stop_rx        = serial8250_stop_rx,
+        .enable_ms      = serial8250_enable_ms,
+        .break_ctl      = serial8250_break_ctl,
+        .startup        = serial8250_startup,
+        .shutdown       = serial8250_shutdown,
+        .set_termios    = serial8250_set_termios,
+        .pm             = serial8250_pm,
+        .type           = serial8250_type,
+        .release_port   = serial8250_release_port,
+        .request_port   = serial8250_request_port,
+        .config_port    = serial8250_config_port,
+        .verify_port    = serial8250_verify_port,
+};
+
+static struct uart_8250_port serial8250_ports[UART_NR];
+
+static void __init serial8250_isa_init_ports(void)
+{
+        struct uart_8250_port *up;
+        static int first = 1;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+
+                up->port.line = i;
+                spin_lock_init(&up->port.lock);
+
+                init_timer(&up->timer);
+                up->timer.function = serial8250_timeout;
+
+                /*
+                 * ALPHA_KLUDGE_MCR needs to be killed.
+                 */
+                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
+                up->mcr_force = ALPHA_KLUDGE_MCR;
+
+                up->port.ops = &serial8250_pops;
+        }
+
+        for (i = 0, up = serial8250_ports; i < ARRAY_SIZE(old_serial_port);
+             i++, up++) {
+                up->port.iobase   = old_serial_port[i].port;
+                up->port.irq      = irq_canonicalize(old_serial_port[i].irq);
+                up->port.uartclk  = old_serial_port[i].baud_base * 16;
+                up->port.flags    = old_serial_port[i].flags;
+                up->port.hub6     = old_serial_port[i].hub6;
+                up->port.membase  = old_serial_port[i].iomem_base;
+                up->port.iotype   = old_serial_port[i].io_type;
+                up->port.regshift = old_serial_port[i].iomem_reg_shift;
+                if (share_irqs)
+                        up->port.flags |= UPF_SHARE_IRQ;
+        }
+}
+
+static void __init
+serial8250_register_ports(struct uart_driver *drv, struct device *dev)
+{
+        int i;
+
+        serial8250_isa_init_ports();
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+
+                up->port.dev = dev;
+                uart_add_one_port(drv, &up->port);
+        }
+}
+
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static inline void wait_for_xmitr(struct uart_8250_port *up)
+{
+        unsigned int status, tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        do {
+                status = serial_in(up, UART_LSR);
+
+                if (status & UART_LSR_BI)
+                        up->lsr_break_flag = UART_LSR_BI;
+
+                if (--tmout == 0)
+                        break;
+                udelay(1);
+        } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & UPF_CONS_FLOW) {
+                tmout = 1000000;
+                while (--tmout &&
+                       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
+                        udelay(1);
+        }
+}
+
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ */
+static void
+serial8250_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_8250_port *up = &serial8250_ports[co->index];
+        unsigned int ier;
+        int i;
+
+        /*
+         *      First save the UER then disable the interrupts
+         */
+        ier = serial_in(up, UART_IER);
+
+        if (up->capabilities & UART_CAP_UUE)
+                serial_out(up, UART_IER, UART_IER_UUE);
+        else
+                serial_out(up, UART_IER, 0);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++, s++) {
+                wait_for_xmitr(up);
+
+                /*
+                 *      Send the character out.
+                 *      If a LF, also do CR...
+                 */
+                serial_out(up, UART_TX, *s);
+                if (*s == 10) {
+                        wait_for_xmitr(up);
+                        serial_out(up, UART_TX, 13);
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(up);
+        serial_out(up, UART_IER, ier);
+}
+
+static int serial8250_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        port = &serial8250_ports[co->index].port;
+        if (!port->iobase && !port->membase)
+                return -ENODEV;
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static struct uart_driver serial8250_reg;
+static struct console serial8250_console = {
+        .name           = "ttyS",
+        .write          = serial8250_console_write,
+        .device         = uart_console_device,
+        .setup          = serial8250_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &serial8250_reg,
+};
+
+static int __init serial8250_console_init(void)
+{
+        serial8250_isa_init_ports();
+        register_console(&serial8250_console);
+        return 0;
+}
+console_initcall(serial8250_console_init);
+
+static int __init find_port(struct uart_port *p)
+{
+        int line;
+        struct uart_port *port;
+
+        for (line = 0; line < UART_NR; line++) {
+                port = &serial8250_ports[line].port;
+                if (p->iotype == port->iotype &&
+                    p->iobase == port->iobase &&
+                    p->membase == port->membase)
+                        return line;
+        }
+        return -ENODEV;
+}
+
+int __init serial8250_start_console(struct uart_port *port, char *options)
+{
+        int line;
+
+        line = find_port(port);
+        if (line < 0)
+                return -ENODEV;
+
+        add_preferred_console("ttyS", line, options);
+        printk("Adding console on ttyS%d at %s 0x%lx (options '%s')\n",
+                line, port->iotype == UPIO_MEM ? "MMIO" : "I/O port",
+                port->iotype == UPIO_MEM ? (unsigned long) port->mapbase :
+                    (unsigned long) port->iobase, options);
+        if (!(serial8250_console.flags & CON_ENABLED)) {
+                serial8250_console.flags &= ~CON_PRINTBUFFER;
+                register_console(&serial8250_console);
+        }
+        return line;
+}
+
+#define SERIAL8250_CONSOLE      &serial8250_console
+#else
+#define SERIAL8250_CONSOLE      NULL
+#endif
+
+static struct uart_driver serial8250_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial",
+        .devfs_name             = "tts/",
+        .dev_name               = "ttyS",
+        .major                  = TTY_MAJOR,
+        .minor                  = 64,
+        .nr                     = UART_NR,
+        .cons                   = SERIAL8250_CONSOLE,
+};
+
+int __init early_serial_setup(struct uart_port *port)
+{
+        if (port->line >= ARRAY_SIZE(serial8250_ports))
+                return -ENODEV;
+
+        serial8250_isa_init_ports();
+        serial8250_ports[port->line].port       = *port;
+        serial8250_ports[port->line].port.ops   = &serial8250_pops;
+        return 0;
+}
+
+/**
+ *      serial8250_suspend_port - suspend one serial port
+ *      @line:  serial line number
+ *      @level: the level of port suspension, as per uart_suspend_port
+ *
+ *      Suspend one serial port.
+ */
+void serial8250_suspend_port(int line)
+{
+        uart_suspend_port(&serial8250_reg, &serial8250_ports[line].port);
+}
+
+/**
+ *      serial8250_resume_port - resume one serial port
+ *      @line:  serial line number
+ *      @level: the level of port resumption, as per uart_resume_port
+ *
+ *      Resume one serial port.
+ */
+void serial8250_resume_port(int line)
+{
+        uart_resume_port(&serial8250_reg, &serial8250_ports[line].port);
+}
+
+/*
+ * Register a set of serial devices attached to a platform device.  The
+ * list is terminated with a zero flags entry, which means we expect
+ * all entries to have at least UPF_BOOT_AUTOCONF set.
+ */
+static int __devinit serial8250_probe(struct device *dev)
+{
+        struct plat_serial8250_port *p = dev->platform_data;
+        struct uart_port port;
+
+        memset(&port, 0, sizeof(struct uart_port));
+
+        for (; p && p->flags != 0; p++) {
+                port.iobase     = p->iobase;
+                port.membase    = p->membase;
+                port.irq        = p->irq;
+                port.uartclk    = p->uartclk;
+                port.regshift   = p->regshift;
+                port.iotype     = p->iotype;
+                port.flags      = p->flags;
+                port.mapbase    = p->mapbase;
+                port.dev        = dev;
+                if (share_irqs)
+                        port.flags |= UPF_SHARE_IRQ;
+                serial8250_register_port(&port);
+        }
+        return 0;
+}
+
+/*
+ * Remove serial ports registered against a platform device.
+ */
+static int __devexit serial8250_remove(struct device *dev)
+{
+        int i;
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+
+                if (up->port.dev == dev)
+                        serial8250_unregister_port(i);
+        }
+        return 0;
+}
+
+static int serial8250_suspend(struct device *dev, pm_message_t state, u32 level)
+{
+        int i;
+
+        if (level != SUSPEND_DISABLE)
+                return 0;
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+
+                if (up->port.type != PORT_UNKNOWN && up->port.dev == dev)
+                        uart_suspend_port(&serial8250_reg, &up->port);
+        }
+
+        return 0;
+}
+
+static int serial8250_resume(struct device *dev, u32 level)
+{
+        int i;
+
+        if (level != RESUME_ENABLE)
+                return 0;
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+
+                if (up->port.type != PORT_UNKNOWN && up->port.dev == dev)
+                        uart_resume_port(&serial8250_reg, &up->port);
+        }
+
+        return 0;
+}
+
+static struct device_driver serial8250_isa_driver = {
+        .name           = "serial8250",
+        .bus            = &platform_bus_type,
+        .probe          = serial8250_probe,
+        .remove         = __devexit_p(serial8250_remove),
+        .suspend        = serial8250_suspend,
+        .resume         = serial8250_resume,
+};
+
+/*
+ * This "device" covers _all_ ISA 8250-compatible serial devices listed
+ * in the table in include/asm/serial.h
+ */
+static struct platform_device *serial8250_isa_devs;
+
+/*
+ * serial8250_register_port and serial8250_unregister_port allows for
+ * 16x50 serial ports to be configured at run-time, to support PCMCIA
+ * modems and PCI multiport cards.
+ */
+static DECLARE_MUTEX(serial_sem);
+
+static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port *port)
+{
+        int i;
+
+        /*
+         * First, find a port entry which matches.
+         */
+        for (i = 0; i < UART_NR; i++)
+                if (uart_match_port(&serial8250_ports[i].port, port))
+                        return &serial8250_ports[i];
+
+        /*
+         * We didn't find a matching entry, so look for the first
+         * free entry.  We look for one which hasn't been previously
+         * used (indicated by zero iobase).
+         */
+        for (i = 0; i < UART_NR; i++)
+                if (serial8250_ports[i].port.type == PORT_UNKNOWN &&
+                    serial8250_ports[i].port.iobase == 0)
+                        return &serial8250_ports[i];
+
+        /*
+         * That also failed.  Last resort is to find any entry which
+         * doesn't have a real port associated with it.
+         */
+        for (i = 0; i < UART_NR; i++)
+                if (serial8250_ports[i].port.type == PORT_UNKNOWN)
+                        return &serial8250_ports[i];
+
+        return NULL;
+}
+
+/**
+ *      serial8250_register_port - register a serial port
+ *      @port: serial port template
+ *
+ *      Configure the serial port specified by the request. If the
+ *      port exists and is in use, it is hung up and unregistered
+ *      first.
+ *
+ *      The port is then probed and if necessary the IRQ is autodetected
+ *      If this fails an error is returned.
+ *
+ *      On success the port is ready to use and the line number is returned.
+ */
+int serial8250_register_port(struct uart_port *port)
+{
+        struct uart_8250_port *uart;
+        int ret = -ENOSPC;
+
+        if (port->uartclk == 0)
+                return -EINVAL;
+
+        down(&serial_sem);
+
+        uart = serial8250_find_match_or_unused(port);
+        if (uart) {
+                uart_remove_one_port(&serial8250_reg, &uart->port);
+
+                uart->port.iobase   = port->iobase;
+                uart->port.membase  = port->membase;
+                uart->port.irq      = port->irq;
+                uart->port.uartclk  = port->uartclk;
+                uart->port.fifosize = port->fifosize;
+                uart->port.regshift = port->regshift;
+                uart->port.iotype   = port->iotype;
+                uart->port.flags    = port->flags | UPF_BOOT_AUTOCONF;
+                uart->port.mapbase  = port->mapbase;
+                if (port->dev)
+                        uart->port.dev = port->dev;
+
+                ret = uart_add_one_port(&serial8250_reg, &uart->port);
+                if (ret == 0)
+                        ret = uart->port.line;
+        }
+        up(&serial_sem);
+
+        return ret;
+}
+EXPORT_SYMBOL(serial8250_register_port);
+
+/**
+ *      serial8250_unregister_port - remove a 16x50 serial port at runtime
+ *      @line: serial line number
+ *
+ *      Remove one serial port.  This may not be called from interrupt
+ *      context.  We hand the port back to the our control.
+ */
+void serial8250_unregister_port(int line)
+{
+        struct uart_8250_port *uart = &serial8250_ports[line];
+
+        down(&serial_sem);
+        uart_remove_one_port(&serial8250_reg, &uart->port);
+        if (serial8250_isa_devs) {
+                uart->port.flags &= ~UPF_BOOT_AUTOCONF;
+                uart->port.type = PORT_UNKNOWN;
+                uart->port.dev = &serial8250_isa_devs->dev;
+                uart_add_one_port(&serial8250_reg, &uart->port);
+        } else {
+                uart->port.dev = NULL;
+        }
+        up(&serial_sem);
+}
+EXPORT_SYMBOL(serial8250_unregister_port);
+
+static int __init serial8250_init(void)
+{
+        int ret, i;
+
+        printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
+                "%d ports, IRQ sharing %sabled\n", (int) UART_NR,
+                share_irqs ? "en" : "dis");
+
+        for (i = 0; i < NR_IRQS; i++)
+                spin_lock_init(&irq_lists[i].lock);
+
+        ret = uart_register_driver(&serial8250_reg);
+        if (ret)
+                goto out;
+
+        serial8250_isa_devs = platform_device_register_simple("serial8250",
+                                                              -1, NULL, 0);
+        if (IS_ERR(serial8250_isa_devs)) {
+                ret = PTR_ERR(serial8250_isa_devs);
+                goto unreg;
+        }
+
+        serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev);
+
+        ret = driver_register(&serial8250_isa_driver);
+        if (ret == 0)
+                goto out;
+
+        platform_device_unregister(serial8250_isa_devs);
+ unreg:
+        uart_unregister_driver(&serial8250_reg);
+ out:
+        return ret;
+}
+
+static void __exit serial8250_exit(void)
+{
+        struct platform_device *isa_dev = serial8250_isa_devs;
+
+        /*
+         * This tells serial8250_unregister_port() not to re-register
+         * the ports (thereby making serial8250_isa_driver permanently
+         * in use.)
+         */
+        serial8250_isa_devs = NULL;
+
+        driver_unregister(&serial8250_isa_driver);
+        platform_device_unregister(isa_dev);
+
+        uart_unregister_driver(&serial8250_reg);
+}
+
+module_init(serial8250_init);
+module_exit(serial8250_exit);
+
+EXPORT_SYMBOL(serial8250_suspend_port);
+EXPORT_SYMBOL(serial8250_resume_port);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.90 $");
+
+module_param(share_irqs, uint, 0644);
+MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
+        " (unsafe)");
+
+#ifdef CONFIG_SERIAL_8250_RSA
+module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444);
+MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");
+#endif
+MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
+
+/**
+ *      register_serial - configure a 16x50 serial port at runtime
+ *      @req: request structure
+ *
+ *      Configure the serial port specified by the request. If the
+ *      port exists and is in use an error is returned. If the port
+ *      is not currently in the table it is added.
+ *
+ *      The port is then probed and if necessary the IRQ is autodetected
+ *      If this fails an error is returned.
+ *
+ *      On success the port is ready to use and the line number is returned.
+ */
+int register_serial(struct serial_struct *req)
+{
+        struct uart_port port;
+
+        port.iobase   = req->port;
+        port.membase  = req->iomem_base;
+        port.irq      = req->irq;
+        port.uartclk  = req->baud_base * 16;
+        port.fifosize = req->xmit_fifo_size;
+        port.regshift = req->iomem_reg_shift;
+        port.iotype   = req->io_type;
+        port.flags    = req->flags | UPF_BOOT_AUTOCONF;
+        port.mapbase  = req->iomap_base;
+        port.dev      = NULL;
+
+        if (share_irqs)
+                port.flags |= UPF_SHARE_IRQ;
+
+        if (HIGH_BITS_OFFSET)
+                port.iobase |= (long) req->port_high << HIGH_BITS_OFFSET;
+
+        /*
+         * If a clock rate wasn't specified by the low level driver, then
+         * default to the standard clock rate.  This should be 115200 (*16)
+         * and should not depend on the architecture's BASE_BAUD definition.
+         * However, since this API will be deprecated, it's probably a
+         * better idea to convert the drivers to use the new API
+         * (serial8250_register_port and serial8250_unregister_port).
+         */
+        if (port.uartclk == 0) {
+                printk(KERN_WARNING
+                       "Serial: registering port at [%08x,%08lx,%p] irq %d with zero baud_base\n",
+                       port.iobase, port.mapbase, port.membase, port.irq);
+                printk(KERN_WARNING "Serial: see %s:%d for more information\n",
+                       __FILE__, __LINE__);
+                dump_stack();
+
+                /*
+                 * Fix it up for now, but this is only a temporary measure.
+                 */
+                port.uartclk = BASE_BAUD * 16;
+        }
+
+        return serial8250_register_port(&port);
+}
+EXPORT_SYMBOL(register_serial);
+
+/**
+ *      unregister_serial - remove a 16x50 serial port at runtime
+ *      @line: serial line number
+ *
+ *      Remove one serial port.  This may not be called from interrupt
+ *      context.  We hand the port back to our local PM control.
+ */
+void unregister_serial(int line)
+{
+        serial8250_unregister_port(line);
+}
+EXPORT_SYMBOL(unregister_serial);
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
new file mode 100644
index 000000000000..4f3d62f222f4
--- /dev/null
+++ b/drivers/serial/8250.h
@@ -0,0 +1,87 @@
+/*
+ *  linux/drivers/char/8250.h
+ *
+ *  Driver for 8250/16550-type serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright (C) 2001 Russell King.
+ *
+ * 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.
+ *
+ *  $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $
+ */
+
+#include <linux/config.h>
+
+int serial8250_register_port(struct uart_port *);
+void serial8250_unregister_port(int line);
+void serial8250_suspend_port(int line);
+void serial8250_resume_port(int line);
+
+struct old_serial_port {
+        unsigned int uart;
+        unsigned int baud_base;
+        unsigned int port;
+        unsigned int irq;
+        unsigned int flags;
+        unsigned char hub6;
+        unsigned char io_type;
+        unsigned char *iomem_base;
+        unsigned short iomem_reg_shift;
+};
+
+/*
+ * This replaces serial_uart_config in include/linux/serial.h
+ */
+struct serial8250_config {
+        const char      *name;
+        unsigned short  fifo_size;
+        unsigned short  tx_loadsz;
+        unsigned char   fcr;
+        unsigned int    flags;
+};
+
+#define UART_CAP_FIFO   (1 << 8)        /* UART has FIFO */
+#define UART_CAP_EFR    (1 << 9)        /* UART has EFR */
+#define UART_CAP_SLEEP  (1 << 10)       /* UART has IER sleep */
+#define UART_CAP_AFE    (1 << 11)       /* MCR-based hw flow control */
+#define UART_CAP_UUE    (1 << 12)       /* UART needs IER bit 6 set (Xscale) */
+
+#if defined(__i386__) && (defined(CONFIG_M386) || defined(CONFIG_M486))
+#define _INLINE_ inline
+#else
+#define _INLINE_
+#endif
+
+#define PROBE_RSA       (1 << 0)
+#define PROBE_ANY       (~0)
+
+#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
+
+#ifdef CONFIG_SERIAL_8250_SHARE_IRQ
+#define SERIAL8250_SHARE_IRQS 1
+#else
+#define SERIAL8250_SHARE_IRQS 0
+#endif
+
+#if defined(__alpha__) && !defined(CONFIG_PCI)
+/*
+ * Digital did something really horribly wrong with the OUT1 and OUT2
+ * lines on at least some ALPHA's.  The failure mode is that if either
+ * is cleared, the machine locks up with endless interrupts.
+ */
+#define ALPHA_KLUDGE_MCR  (UART_MCR_OUT2 | UART_MCR_OUT1)
+#elif defined(CONFIG_SBC8560)
+/*
+ * WindRiver did something similarly broken on their SBC8560 board. The
+ * UART tristates its IRQ output while OUT2 is clear, but they pulled
+ * the interrupt line _up_ instead of down, so if we register the IRQ
+ * while the UART is in that state, we die in an IRQ storm. */
+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
+#else
+#define ALPHA_KLUDGE_MCR 0
+#endif
diff --git a/drivers/serial/8250_acorn.c b/drivers/serial/8250_acorn.c
new file mode 100644
index 000000000000..32af3650e8b4
--- /dev/null
+++ b/drivers/serial/8250_acorn.c
@@ -0,0 +1,142 @@
+/*
+ *  linux/drivers/serial/acorn.c
+ *
+ *  Copyright (C) 1996-2003 Russell King.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/tty.h>
+#include <linux/serial_core.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/ecard.h>
+#include <asm/string.h>
+
+#include "8250.h"
+
+#define MAX_PORTS       3
+
+struct serial_card_type {
+        unsigned int    num_ports;
+        unsigned int    uartclk;
+        unsigned int    type;
+        unsigned int    offset[MAX_PORTS];
+};
+
+struct serial_card_info {
+        unsigned int    num_ports;
+        int             ports[MAX_PORTS];
+};
+
+static int __devinit
+serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
+{
+        struct serial_card_info *info;
+        struct serial_card_type *type = id->data;
+        struct uart_port port;
+        unsigned long bus_addr;
+        unsigned char __iomem *virt_addr;
+        unsigned int i;
+
+        info = kmalloc(sizeof(struct serial_card_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        memset(info, 0, sizeof(struct serial_card_info));
+        info->num_ports = type->num_ports;
+
+        bus_addr = ecard_resource_start(ec, type->type);
+        virt_addr = ioremap(bus_addr, ecard_resource_len(ec, type->type));
+        if (!virt_addr) {
+                kfree(info);
+                return -ENOMEM;
+        }
+
+        ecard_set_drvdata(ec, info);
+
+        memset(&port, 0, sizeof(struct uart_port));
+        port.irq        = ec->irq;
+        port.flags      = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
+        port.uartclk    = type->uartclk;
+        port.iotype     = UPIO_MEM;
+        port.regshift   = 2;
+        port.dev        = &ec->dev;
+
+        for (i = 0; i < info->num_ports; i ++) {
+                port.membase = virt_addr + type->offset[i];
+                port.mapbase = bus_addr + type->offset[i];
+
+                info->ports[i] = serial8250_register_port(&port);
+        }
+
+        return 0;
+}
+
+static void __devexit serial_card_remove(struct expansion_card *ec)
+{
+        struct serial_card_info *info = ecard_get_drvdata(ec);
+        int i;
+
+        ecard_set_drvdata(ec, NULL);
+
+        for (i = 0; i < info->num_ports; i++)
+                if (info->ports[i] > 0)
+                        serial8250_unregister_port(info->ports[i]);
+
+        kfree(info);
+}
+
+static struct serial_card_type atomwide_type = {
+        .num_ports      = 3,
+        .uartclk        = 7372800,
+        .type           = ECARD_RES_IOCSLOW,
+        .offset         = { 0x2800, 0x2400, 0x2000 },
+};
+
+static struct serial_card_type serport_type = {
+        .num_ports      = 2,
+        .uartclk        = 3686400,
+        .type           = ECARD_RES_IOCSLOW,
+        .offset         = { 0x2000, 0x2020 },
+};
+
+static const struct ecard_id serial_cids[] = {
+        { MANU_ATOMWIDE,        PROD_ATOMWIDE_3PSERIAL, &atomwide_type  },
+        { MANU_SERPORT,         PROD_SERPORT_DSPORT,    &serport_type   },
+        { 0xffff, 0xffff }
+};
+
+static struct ecard_driver serial_card_driver = {
+        .probe          = serial_card_probe,
+        .remove         = __devexit_p(serial_card_remove),
+        .id_table       = serial_cids,
+        .drv = {
+                .name   = "8250_acorn",
+        },
+};
+
+static int __init serial_card_init(void)
+{
+        return ecard_register_driver(&serial_card_driver);
+}
+
+static void __exit serial_card_exit(void)
+{
+        ecard_remove_driver(&serial_card_driver);
+}
+
+MODULE_AUTHOR("Russell King");
+MODULE_DESCRIPTION("Acorn 8250-compatible serial port expansion card driver");
+MODULE_LICENSE("GPL");
+
+module_init(serial_card_init);
+module_exit(serial_card_exit);
diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
new file mode 100644
index 000000000000..6b9ead288517
--- /dev/null
+++ b/drivers/serial/8250_acpi.c
@@ -0,0 +1,171 @@
+/*
+ * 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->min_address_range;
+        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->range_length) {
+                port->iobase = io->min_base_address;
+                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_ext_irq *ext_irq)
+{
+        if (ext_irq->number_of_interrupts > 0)
+                port->irq = acpi_register_gsi(ext_irq->interrupts[0],
+                           ext_irq->edge_level, ext_irq->active_high_low);
+        return AE_OK;
+}
+
+static acpi_status acpi_serial_irq(struct uart_port *port,
+                                   struct acpi_resource_irq *irq)
+{
+        if (irq->number_of_interrupts > 0)
+                port->irq = acpi_register_gsi(irq->interrupts[0],
+                           irq->edge_level, irq->active_high_low);
+        return AE_OK;
+}
+
+static acpi_status acpi_serial_resource(struct acpi_resource *res, void *data)
+{
+        struct uart_port *port = (struct uart_port *) data;
+        struct acpi_resource_address64 addr;
+        acpi_status status;
+
+        status = acpi_resource_to_address64(res, &addr);
+        if (ACPI_SUCCESS(status))
+                return acpi_serial_mmio(port, &addr);
+        else if (res->id == ACPI_RSTYPE_IO)
+                return acpi_serial_port(port, &res->data.io);
+        else if (res->id == ACPI_RSTYPE_EXT_IRQ)
+                return acpi_serial_ext_irq(port, &res->data.extended_irq);
+        else if (res->id == ACPI_RSTYPE_IRQ)
+                return acpi_serial_irq(port, &res->data.irq);
+        return AE_OK;
+}
+
+static int acpi_serial_add(struct acpi_device *device)
+{
+        struct serial_private *priv;
+        acpi_status status;
+        struct uart_port port;
+        int result;
+
+        memset(&port, 0, sizeof(struct uart_port));
+
+        port.uartclk = 1843200;
+        port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
+
+        priv = kmalloc(sizeof(struct serial_private), GFP_KERNEL);
+        if (!priv) {
+                result = -ENOMEM;
+                goto fail;
+        }
+        memset(priv, 0, sizeof(*priv));
+
+        status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+                                     acpi_serial_resource, &port);
+        if (ACPI_FAILURE(status)) {
+                result = -ENODEV;
+                goto fail;
+        }
+
+        if (!port.mapbase && !port.iobase) {
+                printk(KERN_ERR "%s: no iomem or port address in %s _CRS\n",
+                        __FUNCTION__, device->pnp.bus_id);
+                result = -ENODEV;
+                goto fail;
+        }
+
+        priv->line = serial8250_register_port(&port);
+        if (priv->line < 0) {
+                printk(KERN_WARNING "Couldn't register serial port %s: %d\n",
+                        device->pnp.bus_id, priv->line);
+                result = -ENODEV;
+                goto fail;
+        }
+
+        acpi_driver_data(device) = priv;
+        return 0;
+
+fail:
+        kfree(priv);
+
+        return result;
+}
+
+static int acpi_serial_remove(struct acpi_device *device, int type)
+{
+        struct serial_private *priv;
+
+        if (!device || !acpi_driver_data(device))
+                return -EINVAL;
+
+        priv = acpi_driver_data(device);
+        serial8250_unregister_port(priv->line);
+        kfree(priv);
+
+        return 0;
+}
+
+static struct acpi_driver acpi_serial_driver = {
+        .name =         "serial",
+        .class =        "",
+        .ids =          "PNP0501",
+        .ops =  {
+                .add =          acpi_serial_add,
+                .remove =       acpi_serial_remove,
+        },
+};
+
+static int __init acpi_serial_init(void)
+{
+        return acpi_bus_register_driver(&acpi_serial_driver);
+}
+
+static void __exit acpi_serial_exit(void)
+{
+        acpi_bus_unregister_driver(&acpi_serial_driver);
+}
+
+module_init(acpi_serial_init);
+module_exit(acpi_serial_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic 8250/16x50 ACPI serial driver");
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
new file mode 100644
index 000000000000..b7a5dd710228
--- /dev/null
+++ b/drivers/serial/8250_early.c
@@ -0,0 +1,255 @@
+/*
+ * Early serial console for 8250/16550 devices
+ *
+ * (c) Copyright 2004 Hewlett-Packard Development Company, L.P.
+ *      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 version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Based on the 8250.c serial driver, Copyright (C) 2001 Russell King,
+ * and on early_printk.c by Andi Kleen.
+ *
+ * This is for use before the serial driver has initialized, in
+ * particular, before the UARTs have been discovered and named.
+ * Instead of specifying the console device as, e.g., "ttyS0",
+ * we locate the device directly by its MMIO or I/O port address.
+ *
+ * The user can specify the device directly, e.g.,
+ *      console=uart,io,0x3f8,9600n8
+ *      console=uart,mmio,0xff5e0000,115200n8
+ * or platform code can call early_uart_console_init() to set
+ * the early UART device.
+ *
+ * After the normal serial driver starts, we try to locate the
+ * matching ttyS device and start a console there.
+ */
+
+#include <linux/tty.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/serial_core.h>
+#include <linux/serial_reg.h>
+#include <linux/serial.h>
+#include <asm/io.h>
+#include <asm/serial.h>
+
+struct early_uart_device {
+        struct uart_port port;
+        char options[16];               /* e.g., 115200n8 */
+        unsigned int baud;
+};
+
+static struct early_uart_device early_device __initdata;
+static int early_uart_registered __initdata;
+
+static unsigned int __init serial_in(struct uart_port *port, int offset)
+{
+        if (port->iotype == UPIO_MEM)
+                return readb(port->membase + offset);
+        else
+                return inb(port->iobase + offset);
+}
+
+static void __init serial_out(struct uart_port *port, int offset, int value)
+{
+        if (port->iotype == UPIO_MEM)
+                writeb(value, port->membase + offset);
+        else
+                outb(value, port->iobase + offset);
+}
+
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
+static void __init wait_for_xmitr(struct uart_port *port)
+{
+        unsigned int status;
+
+        for (;;) {
+                status = serial_in(port, UART_LSR);
+                if ((status & BOTH_EMPTY) == BOTH_EMPTY)
+                        return;
+                cpu_relax();
+        }
+}
+
+static void __init putc(struct uart_port *port, unsigned char c)
+{
+        wait_for_xmitr(port);
+        serial_out(port, UART_TX, c);
+}
+
+static void __init early_uart_write(struct console *console, const char *s, unsigned int count)
+{
+        struct uart_port *port = &early_device.port;
+        unsigned int ier;
+
+        /* Save the IER and disable interrupts */
+        ier = serial_in(port, UART_IER);
+        serial_out(port, UART_IER, 0);
+
+        while (*s && count-- > 0) {
+                putc(port, *s);
+                if (*s == '\n')
+                        putc(port, '\r');
+                s++;
+        }
+
+        /* Wait for transmitter to become empty and restore the IER */
+        wait_for_xmitr(port);
+        serial_out(port, UART_IER, ier);
+}
+
+static unsigned int __init probe_baud(struct uart_port *port)
+{
+        unsigned char lcr, dll, dlm;
+        unsigned int quot;
+
+        lcr = serial_in(port, UART_LCR);
+        serial_out(port, UART_LCR, lcr | UART_LCR_DLAB);
+        dll = serial_in(port, UART_DLL);
+        dlm = serial_in(port, UART_DLM);
+        serial_out(port, UART_LCR, lcr);
+
+        quot = (dlm << 8) | dll;
+        return (port->uartclk / 16) / quot;
+}
+
+static void __init init_port(struct early_uart_device *device)
+{
+        struct uart_port *port = &device->port;
+        unsigned int divisor;
+        unsigned char c;
+
+        serial_out(port, UART_LCR, 0x3);        /* 8n1 */
+        serial_out(port, UART_IER, 0);          /* no interrupt */
+        serial_out(port, UART_FCR, 0);          /* no fifo */
+        serial_out(port, UART_MCR, 0x3);        /* DTR + RTS */
+
+        divisor = port->uartclk / (16 * device->baud);
+        c = serial_in(port, UART_LCR);
+        serial_out(port, UART_LCR, c | UART_LCR_DLAB);
+        serial_out(port, UART_DLL, divisor & 0xff);
+        serial_out(port, UART_DLM, (divisor >> 8) & 0xff);
+        serial_out(port, UART_LCR, c & ~UART_LCR_DLAB);
+}
+
+static int __init parse_options(struct early_uart_device *device, char *options)
+{
+        struct uart_port *port = &device->port;
+        int mapsize = 64;
+        int mmio, length;
+
+        if (!options)
+                return -ENODEV;
+
+        port->uartclk = BASE_BAUD * 16;
+        if (!strncmp(options, "mmio,", 5)) {
+                port->iotype = UPIO_MEM;
+                port->mapbase = simple_strtoul(options + 5, &options, 0);
+                port->membase = ioremap(port->mapbase, mapsize);
+                if (!port->membase) {
+                        printk(KERN_ERR "%s: Couldn't ioremap 0x%lx\n",
+                                __FUNCTION__, port->mapbase);
+                        return -ENOMEM;
+                }
+                mmio = 1;
+        } else if (!strncmp(options, "io,", 3)) {
+                port->iotype = UPIO_PORT;
+                port->iobase = simple_strtoul(options + 3, &options, 0);
+                mmio = 0;
+        } else
+                return -EINVAL;
+
+        if ((options = strchr(options, ','))) {
+                options++;
+                device->baud = simple_strtoul(options, 0, 0);
+                length = min(strcspn(options, " "), sizeof(device->options));
+                strncpy(device->options, options, length);
+        } else {
+                device->baud = probe_baud(port);
+                snprintf(device->options, sizeof(device->options), "%u",
+                        device->baud);
+        }
+
+        printk(KERN_INFO "Early serial console at %s 0x%lx (options '%s')\n",
+                mmio ? "MMIO" : "I/O port",
+                mmio ? port->mapbase : (unsigned long) port->iobase,
+                device->options);
+        return 0;
+}
+
+static int __init early_uart_setup(struct console *console, char *options)
+{
+        struct early_uart_device *device = &early_device;
+        int err;
+
+        if (device->port.membase || device->port.iobase)
+                return 0;
+
+        if ((err = parse_options(device, options)) < 0)
+                return err;
+
+        init_port(device);
+        return 0;
+}
+
+static struct console early_uart_console __initdata = {
+        .name   = "uart",
+        .write  = early_uart_write,
+        .setup  = early_uart_setup,
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,
+};
+
+static int __init early_uart_console_init(void)
+{
+        if (!early_uart_registered) {
+                register_console(&early_uart_console);
+                early_uart_registered = 1;
+        }
+        return 0;
+}
+console_initcall(early_uart_console_init);
+
+int __init early_serial_console_init(char *cmdline)
+{
+        char *options;
+        int err;
+
+        options = strstr(cmdline, "console=uart,");
+        if (!options)
+                return -ENODEV;
+
+        options = strchr(cmdline, ',') + 1;
+        if ((err = early_uart_setup(NULL, options)) < 0)
+                return err;
+        return early_uart_console_init();
+}
+
+static int __init early_uart_console_switch(void)
+{
+        struct early_uart_device *device = &early_device;
+        struct uart_port *port = &device->port;
+        int mmio, line;
+
+        if (!(early_uart_console.flags & CON_ENABLED))
+                return 0;
+
+        /* Try to start the normal driver on a matching line.  */
+        mmio = (port->iotype == UPIO_MEM);
+        line = serial8250_start_console(port, device->options);
+        if (line < 0)
+                printk("No ttyS device at %s 0x%lx for console\n",
+                        mmio ? "MMIO" : "I/O port",
+                        mmio ? port->mapbase :
+                            (unsigned long) port->iobase);
+
+        unregister_console(&early_uart_console);
+        if (mmio)
+                iounmap(port->membase);
+
+        return 0;
+}
+late_initcall(early_uart_console_switch);
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c
new file mode 100644
index 000000000000..431aa5761a7a
--- /dev/null
+++ b/drivers/serial/8250_gsc.c
@@ -0,0 +1,120 @@
+/*
+ *      Serial Device Initialisation for Lasi/Asp/Wax/Dino
+ *
+ *      (c) Copyright Matthew Wilcox <willy@debian.org> 2001-2002
+ *
+ *      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/errno.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/serial_core.h>
+#include <linux/signal.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+
+#include <asm/hardware.h>
+#include <asm/parisc-device.h>
+#include <asm/io.h>
+#include <asm/serial.h> /* for LASI_BASE_BAUD */
+
+#include "8250.h"
+
+static int __init 
+serial_init_chip(struct parisc_device *dev)
+{
+        static int serial_line_nr;
+        struct uart_port port;
+        unsigned long address;
+        int err;
+
+        if (!dev->irq) {
+                /* We find some unattached serial ports by walking native
+                 * busses.  These should be silently ignored.  Otherwise,
+                 * what we have here is a missing parent device, so tell
+                 * the user what they're missing.
+                 */
+                if (parisc_parent(dev)->id.hw_type != HPHW_IOA) {
+                        printk(KERN_INFO "Serial: device 0x%lx not configured.\n"
+                                "Enable support for Wax, Lasi, Asp or Dino.\n", dev->hpa);
+                }
+                return -ENODEV;
+        }
+
+        address = dev->hpa;
+        if (dev->id.sversion != 0x8d) {
+                address += 0x800;
+        }
+
+        memset(&port, 0, sizeof(struct uart_port));
+        port.mapbase = address;
+        port.irq = dev->irq;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
+        port.uartclk = LASI_BASE_BAUD * 16;
+        port.dev = &dev->dev;
+
+        err = serial8250_register_port(&port);
+        if (err < 0) {
+                printk(KERN_WARNING "serial8250_register_port returned error %d\n", err);
+                return err;
+        }
+        
+        return 0;
+}
+
+static struct parisc_device_id serial_tbl[] = {
+        { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00075 },
+        { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008c },
+        { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0008d },
+        { 0 }
+};
+
+/* Hack.  Some machines have SERIAL_0 attached to Lasi and SERIAL_1
+ * attached to Dino.  Unfortunately, Dino appears before Lasi in the device
+ * tree.  To ensure that ttyS0 == SERIAL_0, we register two drivers; one
+ * which only knows about Lasi and then a second which will find all the
+ * other serial ports.  HPUX ignores this problem.
+ */
+static struct parisc_device_id lasi_tbl[] = {
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x03B, 0x0008C }, /* C1xx/C1xxL */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x03C, 0x0008C }, /* B132L */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x03D, 0x0008C }, /* B160L */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x03E, 0x0008C }, /* B132L+ */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x03F, 0x0008C }, /* B180L+ */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x046, 0x0008C }, /* Rocky2 120 */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x047, 0x0008C }, /* Rocky2 150 */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x04E, 0x0008C }, /* Kiji L2 132 */
+        { HPHW_FIO, HVERSION_REV_ANY_ID, 0x056, 0x0008C }, /* Raven+ */
+        { 0 }
+};
+
+
+MODULE_DEVICE_TABLE(parisc, serial_tbl);
+
+static struct parisc_driver lasi_driver = {
+        .name           = "serial_1",
+        .id_table       = lasi_tbl,
+        .probe          = serial_init_chip,
+};
+
+static struct parisc_driver serial_driver = {
+        .name           = "serial",
+        .id_table       = serial_tbl,
+        .probe          = serial_init_chip,
+};
+
+int __init probe_serial_gsc(void)
+{
+        register_parisc_driver(&lasi_driver);
+        register_parisc_driver(&serial_driver);
+        return 0;
+}
+
+module_init(probe_serial_gsc);
diff --git a/drivers/serial/8250_hp300.c b/drivers/serial/8250_hp300.c
new file mode 100644
index 000000000000..b8d51eb56bff
--- /dev/null
+++ b/drivers/serial/8250_hp300.c
@@ -0,0 +1,329 @@
+/*
+ * Driver for the 98626/98644/internal serial interface on hp300/hp400
+ * (based on the National Semiconductor INS8250/NS16550AF/WD16C552 UARTs)
+ *
+ * Ported from 2.2 and modified to use the normal 8250 driver
+ * by Kars de Jong <jongk@linux-m68k.org>, May 2004.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serialP.h>
+#include <linux/serial_core.h>
+#include <linux/delay.h>
+#include <linux/dio.h>
+#include <linux/console.h>
+#include <asm/io.h>
+
+#if !defined(CONFIG_HPDCA) && !defined(CONFIG_HPAPCI)
+#warning CONFIG_8250 defined but neither CONFIG_HPDCA nor CONFIG_HPAPCI defined, are you sure?
+#endif
+
+#ifdef CONFIG_HPAPCI
+struct hp300_port
+{
+        struct hp300_port *next;        /* next port */
+        int line;                       /* line (tty) number */
+};
+
+static struct hp300_port *hp300_ports;
+#endif
+
+#ifdef CONFIG_HPDCA
+
+static int __devinit hpdca_init_one(struct dio_dev *d,
+                                const struct dio_device_id *ent);
+static void __devexit hpdca_remove_one(struct dio_dev *d);
+
+static struct dio_device_id hpdca_dio_tbl[] = {
+        { DIO_ID_DCA0 },
+        { DIO_ID_DCA0REM },
+        { DIO_ID_DCA1 },
+        { DIO_ID_DCA1REM },
+        { 0 }
+};
+
+static struct dio_driver hpdca_driver = {
+        .name      = "hpdca",
+        .id_table  = hpdca_dio_tbl,
+        .probe     = hpdca_init_one,
+        .remove    = __devexit_p(hpdca_remove_one),
+};
+
+#endif
+
+extern int hp300_uart_scode;
+
+/* Offset to UART registers from base of DCA */
+#define UART_OFFSET     17
+
+#define DCA_ID          0x01    /* ID (read), reset (write) */
+#define DCA_IC          0x03    /* Interrupt control        */
+
+/* Interrupt control */
+#define DCA_IC_IE       0x80    /* Master interrupt enable  */
+
+#define HPDCA_BAUD_BASE 153600
+
+/* Base address of the Frodo part */
+#define FRODO_BASE      (0x41c000)
+
+/*
+ * Where we find the 8250-like APCI ports, and how far apart they are.
+ */
+#define FRODO_APCIBASE          0x0
+#define FRODO_APCISPACE         0x20
+#define FRODO_APCI_OFFSET(x)    (FRODO_APCIBASE + ((x) * FRODO_APCISPACE))
+
+#define HPAPCI_BAUD_BASE 500400
+
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+/*
+ * Parse the bootinfo to find descriptions for headless console and 
+ * debug serial ports and register them with the 8250 driver.
+ * This function should be called before serial_console_init() is called
+ * to make sure the serial console will be available for use. IA-64 kernel
+ * calls this function from setup_arch() after the EFI and ACPI tables have
+ * been parsed.
+ */
+int __init hp300_setup_serial_console(void)
+{
+        int scode;
+        struct uart_port port;
+
+        memset(&port, 0, sizeof(port));
+
+        if (hp300_uart_scode < 0 || hp300_uart_scode > DIO_SCMAX)
+                return 0;
+
+        if (DIO_SCINHOLE(hp300_uart_scode))
+                return 0;
+
+        scode = hp300_uart_scode;
+
+        /* Memory mapped I/O */
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
+        port.type = PORT_UNKNOWN;
+
+        /* Check for APCI console */
+        if (scode == 256) {
+#ifdef CONFIG_HPAPCI
+                printk(KERN_INFO "Serial console is HP APCI 1\n");
+
+                port.uartclk = HPAPCI_BAUD_BASE * 16;
+                port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1));
+                port.membase = (char *)(port.mapbase + DIO_VIRADDRBASE);
+                port.regshift = 2;
+                add_preferred_console("ttyS", port.line, "9600n8");
+#else
+                printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n");
+                return 0;
+#endif
+        }
+        else {
+#ifdef CONFIG_HPDCA
+                unsigned long pa = dio_scodetophysaddr(scode);
+                if (!pa) {
+                        return 0;
+                }
+
+                printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode);
+
+                port.uartclk = HPDCA_BAUD_BASE * 16;
+                port.mapbase = (pa + UART_OFFSET);
+                port.membase = (char *)(port.mapbase + DIO_VIRADDRBASE);
+                port.regshift = 1;
+                port.irq = DIO_IPL(pa + DIO_VIRADDRBASE);
+
+                /* Enable board-interrupts */
+                out_8(pa + DIO_VIRADDRBASE + DCA_IC, DCA_IC_IE);
+
+                if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) {
+                        add_preferred_console("ttyS", port.line, "9600n8");
+                }
+#else
+                printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");
+                return 0;
+#endif
+        }
+
+        if (early_serial_setup(&port) < 0) {
+                printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n");
+        }
+
+        return 0;
+}
+#endif /* CONFIG_SERIAL_8250_CONSOLE */
+
+#ifdef CONFIG_HPDCA
+static int __devinit hpdca_init_one(struct dio_dev *d,
+                                const struct dio_device_id *ent)
+{
+        struct serial_struct serial_req;
+        int line;
+
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+        if (hp300_uart_scode == d->scode) {
+                /* Already got it. */
+                return 0;
+        }
+#endif
+        memset(&serial_req, 0, sizeof(struct serial_struct));
+
+        /* Memory mapped I/O */
+        serial_req.io_type = SERIAL_IO_MEM;
+        serial_req.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
+        serial_req.irq = d->ipl;
+        serial_req.baud_base = HPDCA_BAUD_BASE;
+        serial_req.iomap_base = (d->resource.start + UART_OFFSET);
+        serial_req.iomem_base = (char *)(serial_req.iomap_base + DIO_VIRADDRBASE);
+        serial_req.iomem_reg_shift = 1;
+        line = register_serial(&serial_req);
+
+        if (line < 0) {
+                printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d"
+                       " irq %d failed\n", d->scode, serial_req.irq);
+                return -ENOMEM;
+        }
+
+        /* Enable board-interrupts */
+        out_8(d->resource.start + DIO_VIRADDRBASE + DCA_IC, DCA_IC_IE);
+        dio_set_drvdata(d, (void *)line);
+
+        /* Reset the DCA */
+        out_8(d->resource.start + DIO_VIRADDRBASE + DCA_ID, 0xff);
+        udelay(100);
+
+        return 0;
+}
+#endif
+
+static int __init hp300_8250_init(void)
+{
+        static int called = 0;
+        int num_ports;
+#ifdef CONFIG_HPAPCI
+        int line;
+        unsigned long base;
+        struct serial_struct serial_req;
+        struct hp300_port *port;
+        int i;
+#endif
+        if (called)
+                return -ENODEV;
+        called = 1;
+
+        if (!MACH_IS_HP300)
+                return -ENODEV;
+
+        num_ports = 0;
+
+#ifdef CONFIG_HPDCA
+        if (dio_module_init(&hpdca_driver) == 0)
+                num_ports++;
+#endif
+#ifdef CONFIG_HPAPCI
+        if (hp300_model < HP_400) {
+                if (!num_ports)
+                        return -ENODEV;
+                return 0;
+        }
+        /* These models have the Frodo chip.
+         * Port 0 is reserved for the Apollo Domain keyboard.
+         * Port 1 is either the console or the DCA.
+         */
+        for (i = 1; i < 4; i++) {
+                /* Port 1 is the console on a 425e, on other machines it's mapped to
+                 * DCA.
+                 */
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+                if (i == 1) {
+                        continue;
+                }
+#endif
+
+                /* Create new serial device */
+                port = kmalloc(sizeof(struct hp300_port), GFP_KERNEL);
+                if (!port)
+                        return -ENOMEM;
+
+                memset(&serial_req, 0, sizeof(struct serial_struct));
+
+                base = (FRODO_BASE + FRODO_APCI_OFFSET(i));
+
+                /* Memory mapped I/O */
+                serial_req.io_type = SERIAL_IO_MEM;
+                serial_req.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
+                /* XXX - no interrupt support yet */
+                serial_req.irq = 0;
+                serial_req.baud_base = HPAPCI_BAUD_BASE;
+                serial_req.iomap_base = base;
+                serial_req.iomem_base = (char *)(serial_req.iomap_base + DIO_VIRADDRBASE);
+                serial_req.iomem_reg_shift = 2;
+
+                line = register_serial(&serial_req);
+
+                if (line < 0) {
+                        printk(KERN_NOTICE "8250_hp300: register_serial() APCI %d"
+                               " irq %d failed\n", i, serial_req.irq);
+                        kfree(port);
+                        continue;
+                }
+
+                port->line = line;
+                port->next = hp300_ports;
+                hp300_ports = port;
+
+                num_ports++;
+        }
+#endif
+
+        /* Any boards found? */
+        if (!num_ports)
+                return -ENODEV;
+
+        return 0;
+}
+
+#ifdef CONFIG_HPDCA
+static void __devexit hpdca_remove_one(struct dio_dev *d)
+{
+        int line;
+
+        line = (int) dio_get_drvdata(d);
+        if (d->resource.start) {
+                /* Disable board-interrupts */
+                out_8(d->resource.start + DIO_VIRADDRBASE + DCA_IC, 0);
+        }
+        unregister_serial(line);
+}
+#endif
+
+static void __exit hp300_8250_exit(void)
+{
+#ifdef CONFIG_HPAPCI
+        struct hp300_port *port, *to_free;
+
+        for (port = hp300_ports; port; ) {
+                unregister_serial(port->line);
+                to_free = port;
+                port = port->next;
+                kfree(to_free);
+        }
+
+        hp300_ports = NULL;
+#endif
+#ifdef CONFIG_HPDCA
+        dio_unregister_driver(&hpdca_driver);
+#endif
+}
+
+module_init(hp300_8250_init);
+module_exit(hp300_8250_exit);
+MODULE_DESCRIPTION("HP DCA/APCI serial driver");
+MODULE_AUTHOR("Kars de Jong <jongk@linux-m68k.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
new file mode 100644
index 000000000000..f8d90d0ecfea
--- /dev/null
+++ b/drivers/serial/8250_pci.c
@@ -0,0 +1,2303 @@
+/*
+ *  linux/drivers/char/8250_pci.c
+ *
+ *  Probe module for 8250/16550-type PCI serial ports.
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright (C) 2001 Russell King, All Rights Reserved.
+ *
+ * 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.
+ *
+ *  $Id: 8250_pci.c,v 1.28 2002/11/02 11:14:18 rmk Exp $
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/tty.h>
+#include <linux/serial_core.h>
+#include <linux/8250_pci.h>
+#include <linux/bitops.h>
+
+#include <asm/byteorder.h>
+#include <asm/io.h>
+
+#include "8250.h"
+
+#undef SERIAL_DEBUG_PCI
+
+/*
+ * Definitions for PCI support.
+ */
+#define FL_BASE_MASK            0x0007
+#define FL_BASE0                0x0000
+#define FL_BASE1                0x0001
+#define FL_BASE2                0x0002
+#define FL_BASE3                0x0003
+#define FL_BASE4                0x0004
+#define FL_GET_BASE(x)          (x & FL_BASE_MASK)
+
+/* Use successive BARs (PCI base address registers),
+   else use offset into some specified BAR */
+#define FL_BASE_BARS            0x0008
+
+/* do not assign an irq */
+#define FL_NOIRQ                0x0080
+
+/* Use the Base address register size to cap number of ports */
+#define FL_REGION_SZ_CAP        0x0100
+
+struct pci_board {
+        unsigned int flags;
+        unsigned int num_ports;
+        unsigned int base_baud;
+        unsigned int uart_offset;
+        unsigned int reg_shift;
+        unsigned int first_offset;
+};
+
+/*
+ * init function returns:
+ *  > 0 - number of ports
+ *  = 0 - use board->num_ports
+ *  < 0 - error
+ */
+struct pci_serial_quirk {
+        u32     vendor;
+        u32     device;
+        u32     subvendor;
+        u32     subdevice;
+        int     (*init)(struct pci_dev *dev);
+        int     (*setup)(struct pci_dev *dev, struct pci_board *board,
+                         struct uart_port *port, int idx);
+        void    (*exit)(struct pci_dev *dev);
+};
+
+#define PCI_NUM_BAR_RESOURCES   6
+
+struct serial_private {
+        unsigned int            nr;
+        void __iomem            *remapped_bar[PCI_NUM_BAR_RESOURCES];
+        struct pci_serial_quirk *quirk;
+        int                     line[0];
+};
+
+static void moan_device(const char *str, struct pci_dev *dev)
+{
+        printk(KERN_WARNING "%s: %s\n"
+               KERN_WARNING "Please send the output of lspci -vv, this\n"
+               KERN_WARNING "message (0x%04x,0x%04x,0x%04x,0x%04x), the\n"
+               KERN_WARNING "manufacturer and name of serial board or\n"
+               KERN_WARNING "modem board to rmk+serial@arm.linux.org.uk.\n",
+               pci_name(dev), str, dev->vendor, dev->device,
+               dev->subsystem_vendor, dev->subsystem_device);
+}
+
+static int
+setup_port(struct pci_dev *dev, struct uart_port *port,
+           int bar, int offset, int regshift)
+{
+        struct serial_private *priv = pci_get_drvdata(dev);
+        unsigned long base, len;
+
+        if (bar >= PCI_NUM_BAR_RESOURCES)
+                return -EINVAL;
+
+        if (pci_resource_flags(dev, bar) & IORESOURCE_MEM) {
+                base = pci_resource_start(dev, bar);
+                len =  pci_resource_len(dev, bar);
+
+                if (!priv->remapped_bar[bar])
+                        priv->remapped_bar[bar] = ioremap(base, len);
+                if (!priv->remapped_bar[bar])
+                        return -ENOMEM;
+
+                port->iotype = UPIO_MEM;
+                port->mapbase = base + offset;
+                port->membase = priv->remapped_bar[bar] + offset;
+                port->regshift = regshift;
+        } else {
+                base = pci_resource_start(dev, bar) + offset;
+                port->iotype = UPIO_PORT;
+                port->iobase = base;
+        }
+        return 0;
+}
+
+/*
+ * AFAVLAB uses a different mixture of BARs and offsets
+ * Not that ugly ;) -- HW
+ */
+static int
+afavlab_setup(struct pci_dev *dev, struct pci_board *board,
+              struct uart_port *port, int idx)
+{
+        unsigned int bar, offset = board->first_offset;
+        
+        bar = FL_GET_BASE(board->flags);
+        if (idx < 4)
+                bar += idx;
+        else {
+                bar = 4;
+                offset += (idx - 4) * board->uart_offset;
+        }
+
+        return setup_port(dev, port, bar, offset, board->reg_shift);
+}
+
+/*
+ * HP's Remote Management Console.  The Diva chip came in several
+ * different versions.  N-class, L2000 and A500 have two Diva chips, each
+ * with 3 UARTs (the third UART on the second chip is unused).  Superdome
+ * and Keystone have one Diva chip with 3 UARTs.  Some later machines have
+ * one Diva chip, but it has been expanded to 5 UARTs.
+ */
+static int __devinit pci_hp_diva_init(struct pci_dev *dev)
+{
+        int rc = 0;
+
+        switch (dev->subsystem_device) {
+        case PCI_DEVICE_ID_HP_DIVA_TOSCA1:
+        case PCI_DEVICE_ID_HP_DIVA_HALFDOME:
+        case PCI_DEVICE_ID_HP_DIVA_KEYSTONE:
+        case PCI_DEVICE_ID_HP_DIVA_EVEREST:
+                rc = 3;
+                break;
+        case PCI_DEVICE_ID_HP_DIVA_TOSCA2:
+                rc = 2;
+                break;
+        case PCI_DEVICE_ID_HP_DIVA_MAESTRO:
+                rc = 4;
+                break;
+        case PCI_DEVICE_ID_HP_DIVA_POWERBAR:
+                rc = 1;
+                break;
+        }
+
+        return rc;
+}
+
+/*
+ * HP's Diva chip puts the 4th/5th serial port further out, and
+ * some serial ports are supposed to be hidden on certain models.
+ */
+static int
+pci_hp_diva_setup(struct pci_dev *dev, struct pci_board *board,
+              struct uart_port *port, int idx)
+{
+        unsigned int offset = board->first_offset;
+        unsigned int bar = FL_GET_BASE(board->flags);
+
+        switch (dev->subsystem_device) {
+        case PCI_DEVICE_ID_HP_DIVA_MAESTRO:
+                if (idx == 3)
+                        idx++;
+                break;
+        case PCI_DEVICE_ID_HP_DIVA_EVEREST:
+                if (idx > 0)
+                        idx++;
+                if (idx > 2)
+                        idx++;
+                break;
+        }
+        if (idx > 2)
+                offset = 0x18;
+
+        offset += idx * board->uart_offset;
+
+        return setup_port(dev, port, bar, offset, board->reg_shift);
+}
+
+/*
+ * Added for EKF Intel i960 serial boards
+ */
+static int __devinit pci_inteli960ni_init(struct pci_dev *dev)
+{
+        unsigned long oldval;
+
+        if (!(dev->subsystem_device & 0x1000))
+                return -ENODEV;
+
+        /* is firmware started? */
+        pci_read_config_dword(dev, 0x44, (void*) &oldval); 
+        if (oldval == 0x00001000L) { /* RESET value */ 
+                printk(KERN_DEBUG "Local i960 firmware missing");
+                return -ENODEV;
+        }
+        return 0;
+}
+
+/*
+ * Some PCI serial cards using the PLX 9050 PCI interface chip require
+ * that the card interrupt be explicitly enabled or disabled.  This
+ * seems to be mainly needed on card using the PLX which also use I/O
+ * mapped memory.
+ */
+static int __devinit pci_plx9050_init(struct pci_dev *dev)
+{
+        u8 irq_config;
+        void __iomem *p;
+
+        if ((pci_resource_flags(dev, 0) & IORESOURCE_MEM) == 0) {
+                moan_device("no memory in bar 0", dev);
+                return 0;
+        }
+
+        irq_config = 0x41;
+        if (dev->vendor == PCI_VENDOR_ID_PANACOM)
+                irq_config = 0x43;
+        if ((dev->vendor == PCI_VENDOR_ID_PLX) &&
+            (dev->device == PCI_DEVICE_ID_PLX_ROMULUS)) {
+                /*
+                 * As the megawolf cards have the int pins active
+                 * high, and have 2 UART chips, both ints must be
+                 * enabled on the 9050. Also, the UARTS are set in
+                 * 16450 mode by default, so we have to enable the
+                 * 16C950 'enhanced' mode so that we can use the
+                 * deep FIFOs
+                 */
+                irq_config = 0x5b;
+        }
+
+        /*
+         * enable/disable interrupts
+         */
+        p = ioremap(pci_resource_start(dev, 0), 0x80);
+        if (p == NULL)
+                return -ENOMEM;
+        writel(irq_config, p + 0x4c);
+
+        /*
+         * Read the register back to ensure that it took effect.
+         */
+        readl(p + 0x4c);
+        iounmap(p);
+
+        return 0;
+}
+
+static void __devexit pci_plx9050_exit(struct pci_dev *dev)
+{
+        u8 __iomem *p;
+
+        if ((pci_resource_flags(dev, 0) & IORESOURCE_MEM) == 0)
+                return;
+
+        /*
+         * disable interrupts
+         */
+        p = ioremap(pci_resource_start(dev, 0), 0x80);
+        if (p != NULL) {
+                writel(0, p + 0x4c);
+
+                /*
+                 * Read the register back to ensure that it took effect.
+                 */
+                readl(p + 0x4c);
+                iounmap(p);
+        }
+}
+
+/* SBS Technologies Inc. PMC-OCTPRO and P-OCTAL cards */
+static int
+sbs_setup(struct pci_dev *dev, struct pci_board *board,
+                struct uart_port *port, int idx)
+{
+        unsigned int bar, offset = board->first_offset;
+
+        bar = 0;
+
+        if (idx < 4) {
+                /* first four channels map to 0, 0x100, 0x200, 0x300 */
+                offset += idx * board->uart_offset;
+        } else if (idx < 8) {
+                /* last four channels map to 0x1000, 0x1100, 0x1200, 0x1300 */
+                offset += idx * board->uart_offset + 0xC00;
+        } else /* we have only 8 ports on PMC-OCTALPRO */
+                return 1;
+
+        return setup_port(dev, port, bar, offset, board->reg_shift);
+}
+
+/*
+* This does initialization for PMC OCTALPRO cards:
+* maps the device memory, resets the UARTs (needed, bc
+* if the module is removed and inserted again, the card
+* is in the sleep mode) and enables global interrupt.
+*/
+
+/* global control register offset for SBS PMC-OctalPro */
+#define OCT_REG_CR_OFF          0x500
+
+static int __devinit sbs_init(struct pci_dev *dev)
+{
+        u8 __iomem *p;
+
+        p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
+
+        if (p == NULL)
+                return -ENOMEM;
+        /* Set bit-4 Control Register (UART RESET) in to reset the uarts */
+        writeb(0x10,p + OCT_REG_CR_OFF);
+        udelay(50);
+        writeb(0x0,p + OCT_REG_CR_OFF);
+
+        /* Set bit-2 (INTENABLE) of Control Register */
+        writeb(0x4, p + OCT_REG_CR_OFF);
+        iounmap(p);
+
+        return 0;
+}
+
+/*
+ * Disables the global interrupt of PMC-OctalPro
+ */
+
+static void __devexit sbs_exit(struct pci_dev *dev)
+{
+        u8 __iomem *p;
+
+        p = ioremap(pci_resource_start(dev, 0),pci_resource_len(dev,0));
+        if (p != NULL) {
+                writeb(0, p + OCT_REG_CR_OFF);
+        }
+        iounmap(p);
+}
+
+/*
+ * SIIG serial cards have an PCI interface chip which also controls
+ * the UART clocking frequency. Each UART can be clocked independently
+ * (except cards equiped with 4 UARTs) and initial clocking settings
+ * are stored in the EEPROM chip. It can cause problems because this
+ * version of serial driver doesn't support differently clocked UART's
+ * on single PCI card. To prevent this, initialization functions set
+ * high frequency clocking for all UART's on given card. It is safe (I
+ * hope) because it doesn't touch EEPROM settings to prevent conflicts
+ * with other OSes (like M$ DOS).
+ *
+ *  SIIG support added by Andrey Panin <pazke@donpac.ru>, 10/1999
+ * 
+ * There is two family of SIIG serial cards with different PCI
+ * interface chip and different configuration methods:
+ *     - 10x cards have control registers in IO and/or memory space;
+ *     - 20x cards have control registers in standard PCI configuration space.
+ *
+ * Note: some SIIG cards are probed by the parport_serial object.
+ */
+
+#define PCI_DEVICE_ID_SIIG_1S_10x (PCI_DEVICE_ID_SIIG_1S_10x_550 & 0xfffc)
+#define PCI_DEVICE_ID_SIIG_2S_10x (PCI_DEVICE_ID_SIIG_2S_10x_550 & 0xfff8)
+
+static int pci_siig10x_init(struct pci_dev *dev)
+{
+        u16 data;
+        void __iomem *p;
+
+        switch (dev->device & 0xfff8) {
+        case PCI_DEVICE_ID_SIIG_1S_10x: /* 1S */
+                data = 0xffdf;
+                break;
+        case PCI_DEVICE_ID_SIIG_2S_10x: /* 2S, 2S1P */
+                data = 0xf7ff;
+                break;
+        default:                        /* 1S1P, 4S */
+                data = 0xfffb;
+                break;
+        }
+
+        p = ioremap(pci_resource_start(dev, 0), 0x80);
+        if (p == NULL)
+                return -ENOMEM;
+
+        writew(readw(p + 0x28) & data, p + 0x28);
+        readw(p + 0x28);
+        iounmap(p);
+        return 0;
+}
+
+#define PCI_DEVICE_ID_SIIG_2S_20x (PCI_DEVICE_ID_SIIG_2S_20x_550 & 0xfffc)
+#define PCI_DEVICE_ID_SIIG_2S1P_20x (PCI_DEVICE_ID_SIIG_2S1P_20x_550 & 0xfffc)
+
+static int pci_siig20x_init(struct pci_dev *dev)
+{
+        u8 data;
+
+        /* Change clock frequency for the first UART. */
+        pci_read_config_byte(dev, 0x6f, &data);
+        pci_write_config_byte(dev, 0x6f, data & 0xef);
+
+        /* If this card has 2 UART, we have to do the same with second UART. */
+        if (((dev->device & 0xfffc) == PCI_DEVICE_ID_SIIG_2S_20x) ||
+            ((dev->device & 0xfffc) == PCI_DEVICE_ID_SIIG_2S1P_20x)) {
+                pci_read_config_byte(dev, 0x73, &data);
+                pci_write_config_byte(dev, 0x73, data & 0xef);
+        }
+        return 0;
+}
+
+int pci_siig10x_fn(struct pci_dev *dev, int enable)
+{
+        int ret = 0;
+        if (enable)
+                ret = pci_siig10x_init(dev);
+        return ret;
+}
+
+int pci_siig20x_fn(struct pci_dev *dev, int enable)
+{
+        int ret = 0;
+        if (enable)
+                ret = pci_siig20x_init(dev);
+        return ret;
+}
+
+EXPORT_SYMBOL(pci_siig10x_fn);
+EXPORT_SYMBOL(pci_siig20x_fn);
+
+/*
+ * Timedia has an explosion of boards, and to avoid the PCI table from
+ * growing *huge*, we use this function to collapse some 70 entries
+ * in the PCI table into one, for sanity's and compactness's sake.
+ */
+static unsigned short timedia_single_port[] = {
+        0x4025, 0x4027, 0x4028, 0x5025, 0x5027, 0
+};
+
+static unsigned short timedia_dual_port[] = {
+        0x0002, 0x4036, 0x4037, 0x4038, 0x4078, 0x4079, 0x4085,
+        0x4088, 0x4089, 0x5037, 0x5078, 0x5079, 0x5085, 0x6079, 
+        0x7079, 0x8079, 0x8137, 0x8138, 0x8237, 0x8238, 0x9079, 
+        0x9137, 0x9138, 0x9237, 0x9238, 0xA079, 0xB079, 0xC079,
+        0xD079, 0
+};
+
+static unsigned short timedia_quad_port[] = {
+        0x4055, 0x4056, 0x4095, 0x4096, 0x5056, 0x8156, 0x8157, 
+        0x8256, 0x8257, 0x9056, 0x9156, 0x9157, 0x9158, 0x9159, 
+        0x9256, 0x9257, 0xA056, 0xA157, 0xA158, 0xA159, 0xB056,
+        0xB157, 0
+};
+
+static unsigned short timedia_eight_port[] = {
+        0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166, 
+        0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0
+};
+
+static struct timedia_struct {
+        int num;
+        unsigned short *ids;
+} timedia_data[] = {
+        { 1, timedia_single_port },
+        { 2, timedia_dual_port },
+        { 4, timedia_quad_port },
+        { 8, timedia_eight_port },
+        { 0, NULL }
+};
+
+static int __devinit pci_timedia_init(struct pci_dev *dev)
+{
+        unsigned short *ids;
+        int i, j;
+
+        for (i = 0; timedia_data[i].num; i++) {
+                ids = timedia_data[i].ids;
+                for (j = 0; ids[j]; j++)
+                        if (dev->subsystem_device == ids[j])
+                                return timedia_data[i].num;
+        }
+        return 0;
+}
+
+/*
+ * Timedia/SUNIX uses a mixture of BARs and offsets
+ * Ugh, this is ugly as all hell --- TYT
+ */
+static int
+pci_timedia_setup(struct pci_dev *dev, struct pci_board *board,
+                  struct uart_port *port, int idx)
+{
+        unsigned int bar = 0, offset = board->first_offset;
+
+        switch (idx) {
+        case 0:
+                bar = 0;
+                break;
+        case 1:
+                offset = board->uart_offset;
+                bar = 0;
+                break;
+        case 2:
+                bar = 1;
+                break;
+        case 3:
+                offset = board->uart_offset;
+                bar = 1;
+        case 4: /* BAR 2 */
+        case 5: /* BAR 3 */
+        case 6: /* BAR 4 */
+        case 7: /* BAR 5 */
+                bar = idx - 2;
+        }
+
+        return setup_port(dev, port, bar, offset, board->reg_shift);
+}
+
+/*
+ * Some Titan cards are also a little weird
+ */
+static int
+titan_400l_800l_setup(struct pci_dev *dev, struct pci_board *board,
+                      struct uart_port *port, int idx)
+{
+        unsigned int bar, offset = board->first_offset;
+
+        switch (idx) {
+        case 0:
+                bar = 1;
+                break;
+        case 1:
+                bar = 2;
+                break;
+        default:
+                bar = 4;
+                offset = (idx - 2) * board->uart_offset;
+        }
+
+        return setup_port(dev, port, bar, offset, board->reg_shift);
+}
+
+static int __devinit pci_xircom_init(struct pci_dev *dev)
+{
+        msleep(100);
+        return 0;
+}
+
+static int __devinit pci_netmos_init(struct pci_dev *dev)
+{
+        /* subdevice 0x00PS means <P> parallel, <S> serial */
+        unsigned int num_serial = dev->subsystem_device & 0xf;
+
+        if (num_serial == 0)
+                return -ENODEV;
+        return num_serial;
+}
+
+static int
+pci_default_setup(struct pci_dev *dev, struct pci_board *board,
+                  struct uart_port *port, int idx)
+{
+        unsigned int bar, offset = board->first_offset, maxnr;
+
+        bar = FL_GET_BASE(board->flags);
+        if (board->flags & FL_BASE_BARS)
+                bar += idx;
+        else
+                offset += idx * board->uart_offset;
+
+        maxnr = (pci_resource_len(dev, bar) - board->first_offset) /
+                (8 << board->reg_shift);
+
+        if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
+                return 1;
+                        
+        return setup_port(dev, port, bar, offset, board->reg_shift);
+}
+
+/* This should be in linux/pci_ids.h */
+#define PCI_VENDOR_ID_SBSMODULARIO      0x124B
+#define PCI_SUBVENDOR_ID_SBSMODULARIO   0x124B
+#define PCI_DEVICE_ID_OCTPRO            0x0001
+#define PCI_SUBDEVICE_ID_OCTPRO232      0x0108
+#define PCI_SUBDEVICE_ID_OCTPRO422      0x0208
+#define PCI_SUBDEVICE_ID_POCTAL232      0x0308
+#define PCI_SUBDEVICE_ID_POCTAL422      0x0408
+
+/*
+ * Master list of serial port init/setup/exit quirks.
+ * This does not describe the general nature of the port.
+ * (ie, baud base, number and location of ports, etc)
+ *
+ * This list is ordered alphabetically by vendor then device.
+ * Specific entries must come before more generic entries.
+ */
+static struct pci_serial_quirk pci_serial_quirks[] = {
+        /*
+         * AFAVLAB cards.
+         *  It is not clear whether this applies to all products.
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_AFAVLAB,
+                .device         = PCI_ANY_ID,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = afavlab_setup,
+        },
+        /*
+         * HP Diva
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_HP,
+                .device         = PCI_DEVICE_ID_HP_DIVA,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_hp_diva_init,
+                .setup          = pci_hp_diva_setup,
+        },
+        /*
+         * Intel
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_80960_RP,
+                .subvendor      = 0xe4bf,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_inteli960ni_init,
+                .setup          = pci_default_setup,
+        },
+        /*
+         * Panacom
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_PANACOM,
+                .device         = PCI_DEVICE_ID_PANACOM_QUADMODEM,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_plx9050_init,
+                .setup          = pci_default_setup,
+                .exit           = __devexit_p(pci_plx9050_exit),
+        },              
+        {
+                .vendor         = PCI_VENDOR_ID_PANACOM,
+                .device         = PCI_DEVICE_ID_PANACOM_DUALMODEM,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_plx9050_init,
+                .setup          = pci_default_setup,
+                .exit           = __devexit_p(pci_plx9050_exit),
+        },
+        /*
+         * PLX
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_PLX,
+                .device         = PCI_DEVICE_ID_PLX_9050,
+                .subvendor      = PCI_SUBVENDOR_ID_KEYSPAN,
+                .subdevice      = PCI_SUBDEVICE_ID_KEYSPAN_SX2,
+                .init           = pci_plx9050_init,
+                .setup          = pci_default_setup,
+                .exit           = __devexit_p(pci_plx9050_exit),
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_PLX,
+                .device         = PCI_DEVICE_ID_PLX_ROMULUS,
+                .subvendor      = PCI_VENDOR_ID_PLX,
+                .subdevice      = PCI_DEVICE_ID_PLX_ROMULUS,
+                .init           = pci_plx9050_init,
+                .setup          = pci_default_setup,
+                .exit           = __devexit_p(pci_plx9050_exit),
+        },
+        /*
+         * SBS Technologies, Inc., PMC-OCTALPRO 232
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_SBSMODULARIO,
+                .device         = PCI_DEVICE_ID_OCTPRO,
+                .subvendor      = PCI_SUBVENDOR_ID_SBSMODULARIO,
+                .subdevice      = PCI_SUBDEVICE_ID_OCTPRO232,
+                .init           = sbs_init,
+                .setup          = sbs_setup,
+                .exit           = __devexit_p(sbs_exit),
+        },
+        /*
+         * SBS Technologies, Inc., PMC-OCTALPRO 422
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_SBSMODULARIO,
+                .device         = PCI_DEVICE_ID_OCTPRO,
+                .subvendor      = PCI_SUBVENDOR_ID_SBSMODULARIO,
+                .subdevice      = PCI_SUBDEVICE_ID_OCTPRO422,
+                .init           = sbs_init,
+                .setup          = sbs_setup,
+                .exit           = __devexit_p(sbs_exit),
+        },
+        /*
+         * SBS Technologies, Inc., P-Octal 232
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_SBSMODULARIO,
+                .device         = PCI_DEVICE_ID_OCTPRO,
+                .subvendor      = PCI_SUBVENDOR_ID_SBSMODULARIO,
+                .subdevice      = PCI_SUBDEVICE_ID_POCTAL232,
+                .init           = sbs_init,
+                .setup          = sbs_setup,
+                .exit           = __devexit_p(sbs_exit),
+        },
+        /*
+         * SBS Technologies, Inc., P-Octal 422
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_SBSMODULARIO,
+                .device         = PCI_DEVICE_ID_OCTPRO,
+                .subvendor      = PCI_SUBVENDOR_ID_SBSMODULARIO,
+                .subdevice      = PCI_SUBDEVICE_ID_POCTAL422,
+                .init           = sbs_init,
+                .setup          = sbs_setup,
+                .exit           = __devexit_p(sbs_exit),
+        },
+
+        /*
+         * SIIG cards.
+         *  It is not clear whether these could be collapsed.
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_1S_10x_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_1S_10x_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_1S_10x_850,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_2S_10x_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_2S_10x_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_2S_10x_850,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_4S_10x_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_4S_10x_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_4S_10x_850,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig10x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_1S_20x_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_1S_20x_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_1S_20x_850,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_2S_20x_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {       .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_2S_20x_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_2S_20x_850,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_4S_20x_550,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_4S_20x_650,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_SIIG,
+                .device         = PCI_DEVICE_ID_SIIG_4S_20x_850,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_siig20x_init,
+                .setup          = pci_default_setup,
+        },
+        /*
+         * Titan cards
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_TITAN,
+                .device         = PCI_DEVICE_ID_TITAN_400L,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = titan_400l_800l_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_TITAN,
+                .device         = PCI_DEVICE_ID_TITAN_800L,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = titan_400l_800l_setup,
+        },
+        /*
+         * Timedia cards
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_TIMEDIA,
+                .device         = PCI_DEVICE_ID_TIMEDIA_1889,
+                .subvendor      = PCI_VENDOR_ID_TIMEDIA,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_timedia_init,
+                .setup          = pci_timedia_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_TIMEDIA,
+                .device         = PCI_ANY_ID,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = pci_timedia_setup,
+        },
+        /*
+         * Xircom cards
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_XIRCOM,
+                .device         = PCI_DEVICE_ID_XIRCOM_X3201_MDM,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_xircom_init,
+                .setup          = pci_default_setup,
+        },
+        /*
+         * Netmos cards
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_NETMOS,
+                .device         = PCI_ANY_ID,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_netmos_init,
+                .setup          = pci_default_setup,
+        },
+        /*
+         * Default "match everything" terminator entry
+         */
+        {
+                .vendor         = PCI_ANY_ID,
+                .device         = PCI_ANY_ID,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = pci_default_setup,
+        }
+};
+
+static inline int quirk_id_matches(u32 quirk_id, u32 dev_id)
+{
+        return quirk_id == PCI_ANY_ID || quirk_id == dev_id;
+}
+
+static struct pci_serial_quirk *find_quirk(struct pci_dev *dev)
+{
+        struct pci_serial_quirk *quirk;
+
+        for (quirk = pci_serial_quirks; ; quirk++)
+                if (quirk_id_matches(quirk->vendor, dev->vendor) &&
+                    quirk_id_matches(quirk->device, dev->device) &&
+                    quirk_id_matches(quirk->subvendor, dev->subsystem_vendor) &&
+                    quirk_id_matches(quirk->subdevice, dev->subsystem_device))
+                        break;
+        return quirk;
+}
+
+static _INLINE_ int
+get_pci_irq(struct pci_dev *dev, struct pci_board *board, int idx)
+{
+        if (board->flags & FL_NOIRQ)
+                return 0;
+        else
+                return dev->irq;
+}
+
+/*
+ * This is the configuration table for all of the PCI serial boards
+ * which we support.  It is directly indexed by the pci_board_num_t enum
+ * value, which is encoded in the pci_device_id PCI probe table's
+ * driver_data member.
+ *
+ * The makeup of these names are:
+ *  pbn_bn{_bt}_n_baud
+ *
+ *  bn   = PCI BAR number
+ *  bt   = Index using PCI BARs
+ *  n    = number of serial ports
+ *  baud = baud rate
+ *
+ * Please note: in theory if n = 1, _bt infix should make no difference.
+ * ie, pbn_b0_1_115200 is the same as pbn_b0_bt_1_115200
+ */
+enum pci_board_num_t {
+        pbn_default = 0,
+
+        pbn_b0_1_115200,
+        pbn_b0_2_115200,
+        pbn_b0_4_115200,
+        pbn_b0_5_115200,
+
+        pbn_b0_1_921600,
+        pbn_b0_2_921600,
+        pbn_b0_4_921600,
+
+        pbn_b0_bt_1_115200,
+        pbn_b0_bt_2_115200,
+        pbn_b0_bt_8_115200,
+
+        pbn_b0_bt_1_460800,
+        pbn_b0_bt_2_460800,
+        pbn_b0_bt_4_460800,
+
+        pbn_b0_bt_1_921600,
+        pbn_b0_bt_2_921600,
+        pbn_b0_bt_4_921600,
+        pbn_b0_bt_8_921600,
+
+        pbn_b1_1_115200,
+        pbn_b1_2_115200,
+        pbn_b1_4_115200,
+        pbn_b1_8_115200,
+
+        pbn_b1_1_921600,
+        pbn_b1_2_921600,
+        pbn_b1_4_921600,
+        pbn_b1_8_921600,
+
+        pbn_b1_bt_2_921600,
+
+        pbn_b1_1_1382400,
+        pbn_b1_2_1382400,
+        pbn_b1_4_1382400,
+        pbn_b1_8_1382400,
+
+        pbn_b2_1_115200,
+        pbn_b2_8_115200,
+
+        pbn_b2_1_460800,
+        pbn_b2_4_460800,
+        pbn_b2_8_460800,
+        pbn_b2_16_460800,
+
+        pbn_b2_1_921600,
+        pbn_b2_4_921600,
+        pbn_b2_8_921600,
+
+        pbn_b2_bt_1_115200,
+        pbn_b2_bt_2_115200,
+        pbn_b2_bt_4_115200,
+
+        pbn_b2_bt_2_921600,
+        pbn_b2_bt_4_921600,
+
+        pbn_b3_4_115200,
+        pbn_b3_8_115200,
+
+        /*
+         * Board-specific versions.
+         */
+        pbn_panacom,
+        pbn_panacom2,
+        pbn_panacom4,
+        pbn_plx_romulus,
+        pbn_oxsemi,
+        pbn_intel_i960,
+        pbn_sgi_ioc3,
+        pbn_nec_nile4,
+        pbn_computone_4,
+        pbn_computone_6,
+        pbn_computone_8,
+        pbn_sbsxrsio,
+        pbn_exar_XR17C152,
+        pbn_exar_XR17C154,
+        pbn_exar_XR17C158,
+};
+
+/*
+ * uart_offset - the space between channels
+ * reg_shift   - describes how the UART registers are mapped
+ *               to PCI memory by the card.
+ * For example IER register on SBS, Inc. PMC-OctPro is located at
+ * offset 0x10 from the UART base, while UART_IER is defined as 1
+ * in include/linux/serial_reg.h,
+ * see first lines of serial_in() and serial_out() in 8250.c
+*/
+
+static struct pci_board pci_boards[] __devinitdata = {
+        [pbn_default] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_1_115200] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_2_115200] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 2,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_4_115200] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 4,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_5_115200] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 5,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b0_1_921600] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 1,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_2_921600] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_4_921600] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b0_bt_1_115200] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_2_115200] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_8_115200] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 8,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b0_bt_1_460800] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 1,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_2_460800] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_4_460800] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 4,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b0_bt_1_921600] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 1,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_2_921600] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_4_921600] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b0_bt_8_921600] = {
+                .flags          = FL_BASE0|FL_BASE_BARS,
+                .num_ports      = 8,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b1_1_115200] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_2_115200] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 2,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_4_115200] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 4,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_8_115200] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 8,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b1_1_921600] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 1,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_2_921600] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_4_921600] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_8_921600] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 8,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b1_bt_2_921600] = {
+                .flags          = FL_BASE1|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b1_1_1382400] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 1,
+                .base_baud      = 1382400,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_2_1382400] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 2,
+                .base_baud      = 1382400,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_4_1382400] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 4,
+                .base_baud      = 1382400,
+                .uart_offset    = 8,
+        },
+        [pbn_b1_8_1382400] = {
+                .flags          = FL_BASE1,
+                .num_ports      = 8,
+                .base_baud      = 1382400,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b2_1_115200] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_8_115200] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 8,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b2_1_460800] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 1,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_4_460800] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 4,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_8_460800] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 8,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_16_460800] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 16,
+                .base_baud      = 460800,
+                .uart_offset    = 8,
+         },
+
+        [pbn_b2_1_921600] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 1,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_4_921600] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_8_921600] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 8,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b2_bt_1_115200] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_bt_2_115200] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_bt_4_115200] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 4,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b2_bt_2_921600] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+        [pbn_b2_bt_4_921600] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 8,
+        },
+
+        [pbn_b3_4_115200] = {
+                .flags          = FL_BASE3,
+                .num_ports      = 4,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+        [pbn_b3_8_115200] = {
+                .flags          = FL_BASE3,
+                .num_ports      = 8,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        /*
+         * Entries following this are board-specific.
+         */
+
+        /*
+         * Panacom - IOMEM
+         */
+        [pbn_panacom] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 0x400,
+                .reg_shift      = 7,
+        },
+        [pbn_panacom2] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 0x400,
+                .reg_shift      = 7,
+        },
+        [pbn_panacom4] = {
+                .flags          = FL_BASE2|FL_BASE_BARS,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 0x400,
+                .reg_shift      = 7,
+        },
+
+        /* I think this entry is broken - the first_offset looks wrong --rmk */
+        [pbn_plx_romulus] = {
+                .flags          = FL_BASE2,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 8 << 2,
+                .reg_shift      = 2,
+                .first_offset   = 0x03,
+        },
+
+        /*
+         * This board uses the size of PCI Base region 0 to
+         * signal now many ports are available
+         */
+        [pbn_oxsemi] = {
+                .flags          = FL_BASE0|FL_REGION_SZ_CAP,
+                .num_ports      = 32,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
+
+        /*
+         * EKF addition for i960 Boards form EKF with serial port.
+         * Max 256 ports.
+         */
+        [pbn_intel_i960] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 32,
+                .base_baud      = 921600,
+                .uart_offset    = 8 << 2,
+                .reg_shift      = 2,
+                .first_offset   = 0x10000,
+        },
+        [pbn_sgi_ioc3] = {
+                .flags          = FL_BASE0|FL_NOIRQ,
+                .num_ports      = 1,
+                .base_baud      = 458333,
+                .uart_offset    = 8,
+                .reg_shift      = 0,
+                .first_offset   = 0x20178,
+        },
+
+        /*
+         * NEC Vrc-5074 (Nile 4) builtin UART.
+         */
+        [pbn_nec_nile4] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 1,
+                .base_baud      = 520833,
+                .uart_offset    = 8 << 3,
+                .reg_shift      = 3,
+                .first_offset   = 0x300,
+        },
+
+        /*
+         * Computone - uses IOMEM.
+         */
+        [pbn_computone_4] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 0x40,
+                .reg_shift      = 2,
+                .first_offset   = 0x200,
+        },
+        [pbn_computone_6] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 6,
+                .base_baud      = 921600,
+                .uart_offset    = 0x40,
+                .reg_shift      = 2,
+                .first_offset   = 0x200,
+        },
+        [pbn_computone_8] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 8,
+                .base_baud      = 921600,
+                .uart_offset    = 0x40,
+                .reg_shift      = 2,
+                .first_offset   = 0x200,
+        },
+        [pbn_sbsxrsio] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 8,
+                .base_baud      = 460800,
+                .uart_offset    = 256,
+                .reg_shift      = 4,
+        },
+        /*
+         * Exar Corp. XR17C15[248] Dual/Quad/Octal UART
+         *  Only basic 16550A support.
+         *  XR17C15[24] are not tested, but they should work.
+         */
+        [pbn_exar_XR17C152] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 2,
+                .base_baud      = 921600,
+                .uart_offset    = 0x200,
+        },
+        [pbn_exar_XR17C154] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 4,
+                .base_baud      = 921600,
+                .uart_offset    = 0x200,
+        },
+        [pbn_exar_XR17C158] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 8,
+                .base_baud      = 921600,
+                .uart_offset    = 0x200,
+        },
+};
+
+/*
+ * Given a complete unknown PCI device, try to use some heuristics to
+ * guess what the configuration might be, based on the pitiful PCI
+ * serial specs.  Returns 0 on success, 1 on failure.
+ */
+static int __devinit
+serial_pci_guess_board(struct pci_dev *dev, struct pci_board *board)
+{
+        int num_iomem, num_port, first_port = -1, i;
+        
+        /*
+         * If it is not a communications device or the programming
+         * interface is greater than 6, give up.
+         *
+         * (Should we try to make guesses for multiport serial devices
+         * later?) 
+         */
+        if ((((dev->class >> 8) != PCI_CLASS_COMMUNICATION_SERIAL) &&
+             ((dev->class >> 8) != PCI_CLASS_COMMUNICATION_MODEM)) ||
+            (dev->class & 0xff) > 6)
+                return -ENODEV;
+
+        num_iomem = num_port = 0;
+        for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
+                if (pci_resource_flags(dev, i) & IORESOURCE_IO) {
+                        num_port++;
+                        if (first_port == -1)
+                                first_port = i;
+                }
+                if (pci_resource_flags(dev, i) & IORESOURCE_MEM)
+                        num_iomem++;
+        }
+
+        /*
+         * If there is 1 or 0 iomem regions, and exactly one port,
+         * use it.  We guess the number of ports based on the IO
+         * region size.
+         */
+        if (num_iomem <= 1 && num_port == 1) {
+                board->flags = first_port;
+                board->num_ports = pci_resource_len(dev, first_port) / 8;
+                return 0;
+        }
+
+        /*
+         * Now guess if we've got a board which indexes by BARs.
+         * Each IO BAR should be 8 bytes, and they should follow
+         * consecutively.
+         */
+        first_port = -1;
+        num_port = 0;
+        for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
+                if (pci_resource_flags(dev, i) & IORESOURCE_IO &&
+                    pci_resource_len(dev, i) == 8 &&
+                    (first_port == -1 || (first_port + num_port) == i)) {
+                        num_port++;
+                        if (first_port == -1)
+                                first_port = i;
+                }
+        }
+
+        if (num_port > 1) {
+                board->flags = first_port | FL_BASE_BARS;
+                board->num_ports = num_port;
+                return 0;
+        }
+
+        return -ENODEV;
+}
+
+static inline int
+serial_pci_matches(struct pci_board *board, struct pci_board *guessed)
+{
+        return
+            board->num_ports == guessed->num_ports &&
+            board->base_baud == guessed->base_baud &&
+            board->uart_offset == guessed->uart_offset &&
+            board->reg_shift == guessed->reg_shift &&
+            board->first_offset == guessed->first_offset;
+}
+
+/*
+ * Probe one serial board.  Unfortunately, there is no rhyme nor reason
+ * to the arrangement of serial ports on a PCI card.
+ */
+static int __devinit
+pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
+{
+        struct serial_private *priv;
+        struct pci_board *board, tmp;
+        struct pci_serial_quirk *quirk;
+        int rc, nr_ports, i;
+
+        if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
+                printk(KERN_ERR "pci_init_one: invalid driver_data: %ld\n",
+                        ent->driver_data);
+                return -EINVAL;
+        }
+
+        board = &pci_boards[ent->driver_data];
+
+        rc = pci_enable_device(dev);
+        if (rc)
+                return rc;
+
+        if (ent->driver_data == pbn_default) {
+                /*
+                 * Use a copy of the pci_board entry for this;
+                 * avoid changing entries in the table.
+                 */
+                memcpy(&tmp, board, sizeof(struct pci_board));
+                board = &tmp;
+
+                /*
+                 * We matched one of our class entries.  Try to
+                 * determine the parameters of this board.
+                 */
+                rc = serial_pci_guess_board(dev, board);
+                if (rc)
+                        goto disable;
+        } else {
+                /*
+                 * We matched an explicit entry.  If we are able to
+                 * detect this boards settings with our heuristic,
+                 * then we no longer need this entry.
+                 */
+                memcpy(&tmp, &pci_boards[pbn_default], sizeof(struct pci_board));
+                rc = serial_pci_guess_board(dev, &tmp);
+                if (rc == 0 && serial_pci_matches(board, &tmp))
+                        moan_device("Redundant entry in serial pci_table.",
+                                    dev);
+        }
+
+        nr_ports = board->num_ports;
+
+        /*
+         * Find an init and setup quirks.
+         */
+        quirk = find_quirk(dev);
+
+        /*
+         * Run the new-style initialization function.
+         * The initialization function returns:
+         *  <0  - error
+         *   0  - use board->num_ports
+         *  >0  - number of ports
+         */
+        if (quirk->init) {
+                rc = quirk->init(dev);
+                if (rc < 0)
+                        goto disable;
+                if (rc)
+                        nr_ports = rc;
+        }
+
+        priv = kmalloc(sizeof(struct serial_private) +
+                       sizeof(unsigned int) * nr_ports,
+                       GFP_KERNEL);
+        if (!priv) {
+                rc = -ENOMEM;
+                goto deinit;
+        }
+
+        memset(priv, 0, sizeof(struct serial_private) +
+                        sizeof(unsigned int) * nr_ports);
+
+        priv->quirk = quirk;
+        pci_set_drvdata(dev, priv);
+
+        for (i = 0; i < nr_ports; i++) {
+                struct uart_port serial_port;
+                memset(&serial_port, 0, sizeof(struct uart_port));
+
+                serial_port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF |
+                                    UPF_SHARE_IRQ;
+                serial_port.uartclk = board->base_baud * 16;
+                serial_port.irq = get_pci_irq(dev, board, i);
+                serial_port.dev = &dev->dev;
+                if (quirk->setup(dev, board, &serial_port, i))
+                        break;
+#ifdef SERIAL_DEBUG_PCI
+                printk("Setup PCI port: port %x, irq %d, type %d\n",
+                       serial_port.iobase, serial_port.irq, serial_port.iotype);
+#endif
+                
+                priv->line[i] = serial8250_register_port(&serial_port);
+                if (priv->line[i] < 0) {
+                        printk(KERN_WARNING "Couldn't register serial port %s: %d\n", pci_name(dev), priv->line[i]);
+                        break;
+                }
+        }
+
+        priv->nr = i;
+
+        return 0;
+
+ deinit:
+        if (quirk->exit)
+                quirk->exit(dev);
+ disable:
+        pci_disable_device(dev);
+        return rc;
+}
+
+static void __devexit pciserial_remove_one(struct pci_dev *dev)
+{
+        struct serial_private *priv = pci_get_drvdata(dev);
+
+        pci_set_drvdata(dev, NULL);
+
+        if (priv) {
+                struct pci_serial_quirk *quirk;
+                int i;
+
+                for (i = 0; i < priv->nr; i++)
+                        serial8250_unregister_port(priv->line[i]);
+
+                for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
+                        if (priv->remapped_bar[i])
+                                iounmap(priv->remapped_bar[i]);
+                        priv->remapped_bar[i] = NULL;
+                }
+
+                /*
+                 * Find the exit quirks.
+                 */
+                quirk = find_quirk(dev);
+                if (quirk->exit)
+                        quirk->exit(dev);
+
+                pci_disable_device(dev);
+
+                kfree(priv);
+        }
+}
+
+static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
+{
+        struct serial_private *priv = pci_get_drvdata(dev);
+
+        if (priv) {
+                int i;
+
+                for (i = 0; i < priv->nr; i++)
+                        serial8250_suspend_port(priv->line[i]);
+        }
+        pci_save_state(dev);
+        pci_set_power_state(dev, pci_choose_state(dev, state));
+        return 0;
+}
+
+static int pciserial_resume_one(struct pci_dev *dev)
+{
+        struct serial_private *priv = pci_get_drvdata(dev);
+
+        pci_set_power_state(dev, PCI_D0);
+        pci_restore_state(dev);
+
+        if (priv) {
+                int i;
+
+                /*
+                 * The device may have been disabled.  Re-enable it.
+                 */
+                pci_enable_device(dev);
+
+                /*
+                 * Ensure that the board is correctly configured.
+                 */
+                if (priv->quirk->init)
+                        priv->quirk->init(dev);
+
+                for (i = 0; i < priv->nr; i++)
+                        serial8250_resume_port(priv->line[i]);
+        }
+        return 0;
+}
+
+static struct pci_device_id serial_pci_tbl[] = {
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232, 0, 0,
+                pbn_b1_8_1382400 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_232, 0, 0,
+                pbn_b1_4_1382400 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_232, 0, 0,
+                pbn_b1_2_1382400 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232, 0, 0,
+                pbn_b1_8_1382400 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_232, 0, 0,
+                pbn_b1_4_1382400 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_232, 0, 0,
+                pbn_b1_2_1382400 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485, 0, 0,
+                pbn_b1_8_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_4_4, 0, 0,
+                pbn_b1_8_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485, 0, 0,
+                pbn_b1_4_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485_2_2, 0, 0,
+                pbn_b1_4_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_485, 0, 0,
+                pbn_b1_2_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6, 0, 0,
+                pbn_b1_8_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1, 0, 0,
+                pbn_b1_8_921600 },
+        {       PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V351,
+                PCI_SUBVENDOR_ID_CONNECT_TECH,
+                PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1, 0, 0,
+                pbn_b1_4_921600 },
+
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_bt_1_115200 },
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM2,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_bt_2_115200 },
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM422,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_bt_4_115200 },
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM232,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_bt_2_115200 },
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM4,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_bt_4_115200 },
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM8,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_8_115200 },
+        {       PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM8,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_8_115200 },
+
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_GTEK_SERIAL2,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_2_115200 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_SPCOM200,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_2_921600 },
+        /*
+         * VScom SPCOM800, from sl@s.pl
+         */
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_SPCOM800, 
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_8_921600 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_1077,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b2_4_921600 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_KEYSPAN,
+                PCI_SUBDEVICE_ID_KEYSPAN_SX2, 0, 0,
+                pbn_panacom },
+        {       PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_QUADMODEM,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_panacom4 },
+        {       PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_DUALMODEM,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_panacom2 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_CHASE_PCIFAST,
+                PCI_SUBDEVICE_ID_CHASE_PCIFAST4, 0, 0, 
+                pbn_b2_4_460800 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_CHASE_PCIFAST,
+                PCI_SUBDEVICE_ID_CHASE_PCIFAST8, 0, 0, 
+                pbn_b2_8_460800 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_CHASE_PCIFAST,
+                PCI_SUBDEVICE_ID_CHASE_PCIFAST16, 0, 0, 
+                pbn_b2_16_460800 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_CHASE_PCIFAST,
+                PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC, 0, 0, 
+                pbn_b2_16_460800 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_CHASE_PCIRAS,
+                PCI_SUBDEVICE_ID_CHASE_PCIRAS4, 0, 0, 
+                pbn_b2_4_460800 },
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
+                PCI_SUBVENDOR_ID_CHASE_PCIRAS,
+                PCI_SUBDEVICE_ID_CHASE_PCIRAS8, 0, 0, 
+                pbn_b2_8_460800 },
+        /*
+         * Megawolf Romulus PCI Serial Card, from Mike Hudson
+         * (Exoray@isys.ca)
+         */
+        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_ROMULUS,
+                0x10b5, 0x106a, 0, 0,
+                pbn_plx_romulus },
+        {       PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_QSC100,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_4_115200 },
+        {       PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_DSC100,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_2_115200 },
+        {       PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_ESC100D,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_8_115200 },
+        {       PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_ESC100M,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_8_115200 },
+        {       PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_OXSEMI_16PCI954,
+                PCI_VENDOR_ID_SPECIALIX, PCI_SUBDEVICE_ID_SPECIALIX_SPEED4, 0, 0,
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_4_115200 },
+        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_921600 },
+
+        /*
+         * SBS Technologies, Inc. P-Octal and PMC-OCTPRO cards,
+         * from skokodyn@yahoo.com
+         */
+        {       PCI_VENDOR_ID_SBSMODULARIO, PCI_DEVICE_ID_OCTPRO,
+                PCI_SUBVENDOR_ID_SBSMODULARIO, PCI_SUBDEVICE_ID_OCTPRO232, 0, 0,
+                pbn_sbsxrsio },
+        {       PCI_VENDOR_ID_SBSMODULARIO, PCI_DEVICE_ID_OCTPRO,
+                PCI_SUBVENDOR_ID_SBSMODULARIO, PCI_SUBDEVICE_ID_OCTPRO422, 0, 0,
+                pbn_sbsxrsio },
+        {       PCI_VENDOR_ID_SBSMODULARIO, PCI_DEVICE_ID_OCTPRO,
+                PCI_SUBVENDOR_ID_SBSMODULARIO, PCI_SUBDEVICE_ID_POCTAL232, 0, 0,
+                pbn_sbsxrsio },
+        {       PCI_VENDOR_ID_SBSMODULARIO, PCI_DEVICE_ID_OCTPRO,
+                PCI_SUBVENDOR_ID_SBSMODULARIO, PCI_SUBDEVICE_ID_POCTAL422, 0, 0,
+                pbn_sbsxrsio },
+
+        /*
+         * Digitan DS560-558, from jimd@esoft.com
+         */
+        {       PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_ATT_VENUS_MODEM,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b1_1_115200 },
+
+        /*
+         * Titan Electronic cards
+         *  The 400L and 800L have a custom setup quirk.
+         */
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b0_1_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b0_2_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800B,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100L,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_1_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200L,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_bt_2_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400L,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_4_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800L,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_8_921600 },
+
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_1_460800 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_1_460800 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_1_460800 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_10x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_2_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_10x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_2_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_10x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_2_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_10x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_4_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_10x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_4_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_10x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_4_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_20x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_1_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_20x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_1_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_20x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_1_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_20x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_20x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_20x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_4_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_4_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_4_921600 },
+
+        /*
+         * Computone devices submitted by Doug McNash dmcnash@computone.com
+         */
+        {       PCI_VENDOR_ID_COMPUTONE, PCI_DEVICE_ID_COMPUTONE_PG,
+                PCI_SUBVENDOR_ID_COMPUTONE, PCI_SUBDEVICE_ID_COMPUTONE_PG4,
+                0, 0, pbn_computone_4 },
+        {       PCI_VENDOR_ID_COMPUTONE, PCI_DEVICE_ID_COMPUTONE_PG,
+                PCI_SUBVENDOR_ID_COMPUTONE, PCI_SUBDEVICE_ID_COMPUTONE_PG8,
+                0, 0, pbn_computone_8 },
+        {       PCI_VENDOR_ID_COMPUTONE, PCI_DEVICE_ID_COMPUTONE_PG,
+                PCI_SUBVENDOR_ID_COMPUTONE, PCI_SUBDEVICE_ID_COMPUTONE_PG6,
+                0, 0, pbn_computone_6 },
+
+        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI95N,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_oxsemi },
+        {       PCI_VENDOR_ID_TIMEDIA, PCI_DEVICE_ID_TIMEDIA_1889,
+                PCI_VENDOR_ID_TIMEDIA, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_1_921600 },
+
+        /*
+         * AFAVLAB serial card, from Harald Welte <laforge@gnumonks.org>
+         */
+        {       PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P028,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_8_115200 },
+        {       PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P030,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_8_115200 },
+
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DSERIAL,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_115200 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATRO_A,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_115200 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATRO_B,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_115200 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_OCTO_A,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_4_460800 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_OCTO_B,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_4_460800 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PORT_PLUS,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_460800 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUAD_A,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_460800 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUAD_B,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_2_460800 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_SSERIAL,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_1_115200 },
+        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PORT_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_1_460800 },
+
+        /*
+         * Dell Remote Access Card 4 - Tim_T_Murphy@Dell.com
+         */
+        {       PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_RAC4,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_1_1382400 },
+
+        /*
+         * Dell Remote Access Card III - Tim_T_Murphy@Dell.com
+         */
+        {       PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_RACIII,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b1_1_1382400 },
+
+        /*
+         * RAStel 2 port modem, gerg@moreton.com.au
+         */
+        {       PCI_VENDOR_ID_MORETON, PCI_DEVICE_ID_RASTEL_2PORT,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_bt_2_115200 },
+
+        /*
+         * EKF addition for i960 Boards form EKF with serial port
+         */
+        {       PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_80960_RP,
+                0xE4BF, PCI_ANY_ID, 0, 0,
+                pbn_intel_i960 },
+
+        /*
+         * Xircom Cardbus/Ethernet combos
+         */
+        {       PCI_VENDOR_ID_XIRCOM, PCI_DEVICE_ID_XIRCOM_X3201_MDM,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_1_115200 },
+        /*
+         * Xircom RBM56G cardbus modem - Dirk Arnold (temp entry)
+         */
+        {       PCI_VENDOR_ID_XIRCOM, PCI_DEVICE_ID_XIRCOM_RBM56G,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_1_115200 },
+
+        /*
+         * Untested PCI modems, sent in from various folks...
+         */
+
+        /*
+         * Elsa Model 56K PCI Modem, from Andreas Rath <arh@01019freenet.de>
+         */
+        {       PCI_VENDOR_ID_ROCKWELL, 0x1004,
+                0x1048, 0x1500, 0, 0,
+                pbn_b1_1_115200 },
+
+        {       PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,
+                0xFF00, 0, 0, 0,
+                pbn_sgi_ioc3 },
+
+        /*
+         * HP Diva card
+         */
+        {       PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA,
+                PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_RMP3, 0, 0,
+                pbn_b1_1_115200 },
+        {       PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_5_115200 },
+        {       PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b2_1_115200 },
+
+        /*
+         * NEC Vrc-5074 (Nile 4) builtin UART.
+         */
+        {       PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NILE4,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_nec_nile4 },
+
+        {       PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM4,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b3_4_115200 },
+        {       PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM8,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b3_8_115200 },
+
+        /*
+         * Exar Corp. XR17C15[248] Dual/Quad/Octal UART
+         */
+        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
+                PCI_ANY_ID, PCI_ANY_ID,
+                0,
+                0, pbn_exar_XR17C152 },
+        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C154,
+                PCI_ANY_ID, PCI_ANY_ID,
+                0,
+                0, pbn_exar_XR17C154 },
+        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C158,
+                PCI_ANY_ID, PCI_ANY_ID,
+                0,
+                0, pbn_exar_XR17C158 },
+
+        /*
+         * Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke)
+         */
+        {       PCI_VENDOR_ID_TOPIC, PCI_DEVICE_ID_TOPIC_TP560,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_1_115200 },
+
+        /*
+         * These entries match devices with class COMMUNICATION_SERIAL,
+         * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
+         */
+        {       PCI_ANY_ID, PCI_ANY_ID,
+                PCI_ANY_ID, PCI_ANY_ID,
+                PCI_CLASS_COMMUNICATION_SERIAL << 8,
+                0xffff00, pbn_default },
+        {       PCI_ANY_ID, PCI_ANY_ID,
+                PCI_ANY_ID, PCI_ANY_ID,
+                PCI_CLASS_COMMUNICATION_MODEM << 8,
+                0xffff00, pbn_default },
+        {       PCI_ANY_ID, PCI_ANY_ID,
+                PCI_ANY_ID, PCI_ANY_ID,
+                PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
+                0xffff00, pbn_default },
+        { 0, }
+};
+
+static struct pci_driver serial_pci_driver = {
+        .name           = "serial",
+        .probe          = pciserial_init_one,
+        .remove         = __devexit_p(pciserial_remove_one),
+        .suspend        = pciserial_suspend_one,
+        .resume         = pciserial_resume_one,
+        .id_table       = serial_pci_tbl,
+};
+
+static int __init serial8250_pci_init(void)
+{
+        return pci_register_driver(&serial_pci_driver);
+}
+
+static void __exit serial8250_pci_exit(void)
+{
+        pci_unregister_driver(&serial_pci_driver);
+}
+
+module_init(serial8250_pci_init);
+module_exit(serial8250_pci_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic 8250/16x50 PCI serial probe module");
+MODULE_DEVICE_TABLE(pci, serial_pci_tbl);
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
new file mode 100644
index 000000000000..18c58fb73899
--- /dev/null
+++ b/drivers/serial/8250_pnp.c
@@ -0,0 +1,457 @@
+/*
+ *  linux/drivers/char/8250_pnp.c
+ *
+ *  Probe module for 8250/16550-type ISAPNP serial ports.
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright (C) 2001 Russell King, All Rights Reserved.
+ *
+ *  Ported to the Linux PnP Layer - (C) Adam Belay.
+ *
+ * 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.
+ *
+ *  $Id: 8250_pnp.c,v 1.10 2002/07/21 21:32:30 rmk Exp $
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pnp.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/serial_core.h>
+#include <linux/bitops.h>
+
+#include <asm/byteorder.h>
+
+#include "8250.h"
+
+#define UNKNOWN_DEV 0x3000
+
+
+static const struct pnp_device_id pnp_dev_table[] = {
+        /* Archtek America Corp. */
+        /* Archtek SmartLink Modem 3334BT Plug & Play */
+        {       "AAC000F",              0       },
+        /* Anchor Datacomm BV */
+        /* SXPro 144 External Data Fax Modem Plug & Play */
+        {       "ADC0001",              0       },
+        /* SXPro 288 External Data Fax Modem Plug & Play */
+        {       "ADC0002",              0       },
+        /* PROLiNK 1456VH ISA PnP K56flex Fax Modem */
+        {       "AEI0250",              0       },
+        /* Actiontec ISA PNP 56K X2 Fax Modem */
+        {       "AEI1240",              0       },
+        /* Rockwell 56K ACF II Fax+Data+Voice Modem */
+        {       "AKY1021",              0 /*SPCI_FL_NO_SHIRQ*/  },
+        /* AZT3005 PnP SOUND DEVICE */
+        {       "AZT4001",              0       },
+        /* Best Data Products Inc. Smart One 336F PnP Modem */
+        {       "BDP3336",              0       },
+        /*  Boca Research */
+        /* Boca Complete Ofc Communicator 14.4 Data-FAX */
+        {       "BRI0A49",              0       },
+        /* Boca Research 33,600 ACF Modem */
+        {       "BRI1400",              0       },
+        /* Boca 33.6 Kbps Internal FD34FSVD */
+        {       "BRI3400",              0       },
+        /* Boca 33.6 Kbps Internal FD34FSVD */
+        {       "BRI0A49",              0       },
+        /* Best Data Products Inc. Smart One 336F PnP Modem */
+        {       "BDP3336",              0       },
+        /* Computer Peripherals Inc */
+        /* EuroViVa CommCenter-33.6 SP PnP */
+        {       "CPI4050",              0       },
+        /* Creative Labs */
+        /* Creative Labs Phone Blaster 28.8 DSVD PnP Voice */
+        {       "CTL3001",              0       },
+        /* Creative Labs Modem Blaster 28.8 DSVD PnP Voice */
+        {       "CTL3011",              0       },
+        /* Creative */
+        /* Creative Modem Blaster Flash56 DI5601-1 */
+        {       "DMB1032",              0       },
+        /* Creative Modem Blaster V.90 DI5660 */
+        {       "DMB2001",              0       },
+        /* E-Tech */
+        /* E-Tech CyberBULLET PC56RVP */
+        {       "ETT0002",              0       },
+        /* FUJITSU */
+        /* Fujitsu 33600 PnP-I2 R Plug & Play */
+        {       "FUJ0202",              0       },
+        /* Fujitsu FMV-FX431 Plug & Play */
+        {       "FUJ0205",              0       },
+        /* Fujitsu 33600 PnP-I4 R Plug & Play */
+        {       "FUJ0206",              0       },
+        /* Fujitsu Fax Voice 33600 PNP-I5 R Plug & Play */
+        {       "FUJ0209",              0       },
+        /* Archtek America Corp. */
+        /* Archtek SmartLink Modem 3334BT Plug & Play */
+        {       "GVC000F",              0       },
+        /* Hayes */
+        /* Hayes Optima 288 V.34-V.FC + FAX + Voice Plug & Play */
+        {       "HAY0001",              0       },
+        /* Hayes Optima 336 V.34 + FAX + Voice PnP */
+        {       "HAY000C",              0       },
+        /* Hayes Optima 336B V.34 + FAX + Voice PnP */
+        {       "HAY000D",              0       },
+        /* Hayes Accura 56K Ext Fax Modem PnP */
+        {       "HAY5670",              0       },
+        /* Hayes Accura 56K Ext Fax Modem PnP */
+        {       "HAY5674",              0       },
+        /* Hayes Accura 56K Fax Modem PnP */
+        {       "HAY5675",              0       },
+        /* Hayes 288, V.34 + FAX */
+        {       "HAYF000",              0       },
+        /* Hayes Optima 288 V.34 + FAX + Voice, Plug & Play */
+        {       "HAYF001",              0       },
+        /* IBM */
+        /* IBM Thinkpad 701 Internal Modem Voice */
+        {       "IBM0033",              0       },
+        /* Intertex */
+        /* Intertex 28k8 33k6 Voice EXT PnP */
+        {       "IXDC801",              0       },
+        /* Intertex 33k6 56k Voice EXT PnP */
+        {       "IXDC901",              0       },
+        /* Intertex 28k8 33k6 Voice SP EXT PnP */
+        {       "IXDD801",              0       },
+        /* Intertex 33k6 56k Voice SP EXT PnP */
+        {       "IXDD901",              0       },
+        /* Intertex 28k8 33k6 Voice SP INT PnP */
+        {       "IXDF401",              0       },
+        /* Intertex 28k8 33k6 Voice SP EXT PnP */
+        {       "IXDF801",              0       },
+        /* Intertex 33k6 56k Voice SP EXT PnP */
+        {       "IXDF901",              0       },
+        /* Kortex International */
+        /* KORTEX 28800 Externe PnP */
+        {       "KOR4522",              0       },
+        /* KXPro 33.6 Vocal ASVD PnP */
+        {       "KORF661",              0       },
+        /* Lasat */
+        /* LASAT Internet 33600 PnP */
+        {       "LAS4040",              0       },
+        /* Lasat Safire 560 PnP */
+        {       "LAS4540",              0       },
+        /* Lasat Safire 336  PnP */
+        {       "LAS5440",              0       },
+        /* Microcom, Inc. */
+        /* Microcom TravelPorte FAST V.34 Plug & Play */
+        {       "MNP0281",              0       },
+        /* Microcom DeskPorte V.34 FAST or FAST+ Plug & Play */
+        {       "MNP0336",              0       },
+        /* Microcom DeskPorte FAST EP 28.8 Plug & Play */
+        {       "MNP0339",              0       },
+        /* Microcom DeskPorte 28.8P Plug & Play */
+        {       "MNP0342",              0       },
+        /* Microcom DeskPorte FAST ES 28.8 Plug & Play */
+        {       "MNP0500",              0       },
+        /* Microcom DeskPorte FAST ES 28.8 Plug & Play */
+        {       "MNP0501",              0       },
+        /* Microcom DeskPorte 28.8S Internal Plug & Play */
+        {       "MNP0502",              0       },
+        /* Motorola */
+        /* Motorola BitSURFR Plug & Play */
+        {       "MOT1105",              0       },
+        /* Motorola TA210 Plug & Play */
+        {       "MOT1111",              0       },
+        /* Motorola HMTA 200 (ISDN) Plug & Play */
+        {       "MOT1114",              0       },
+        /* Motorola BitSURFR Plug & Play */
+        {       "MOT1115",              0       },
+        /* Motorola Lifestyle 28.8 Internal */
+        {       "MOT1190",              0       },
+        /* Motorola V.3400 Plug & Play */
+        {       "MOT1501",              0       },
+        /* Motorola Lifestyle 28.8 V.34 Plug & Play */
+        {       "MOT1502",              0       },
+        /* Motorola Power 28.8 V.34 Plug & Play */
+        {       "MOT1505",              0       },
+        /* Motorola ModemSURFR External 28.8 Plug & Play */
+        {       "MOT1509",              0       },
+        /* Motorola Premier 33.6 Desktop Plug & Play */
+        {       "MOT150A",              0       },
+        /* Motorola VoiceSURFR 56K External PnP */
+        {       "MOT150F",              0       },
+        /* Motorola ModemSURFR 56K External PnP */
+        {       "MOT1510",              0       },
+        /* Motorola ModemSURFR 56K Internal PnP */
+        {       "MOT1550",              0       },
+        /* Motorola ModemSURFR Internal 28.8 Plug & Play */
+        {       "MOT1560",              0       },
+        /* Motorola Premier 33.6 Internal Plug & Play */
+        {       "MOT1580",              0       },
+        /* Motorola OnlineSURFR 28.8 Internal Plug & Play */
+        {       "MOT15B0",              0       },
+        /* Motorola VoiceSURFR 56K Internal PnP */
+        {       "MOT15F0",              0       },
+        /* Com 1 */
+        /*  Deskline K56 Phone System PnP */
+        {       "MVX00A1",              0       },
+        /* PC Rider K56 Phone System PnP */
+        {       "MVX00F2",              0       },
+        /* NEC 98NOTE SPEAKER PHONE FAX MODEM(33600bps) */
+        {       "nEC8241",              0       },
+        /* Pace 56 Voice Internal Plug & Play Modem */
+        {       "PMC2430",              0       },
+        /* Generic */
+        /* Generic standard PC COM port  */
+        {       "PNP0500",              0       },
+        /* Generic 16550A-compatible COM port */
+        {       "PNP0501",              0       },
+        /* Compaq 14400 Modem */
+        {       "PNPC000",              0       },
+        /* Compaq 2400/9600 Modem */
+        {       "PNPC001",              0       },
+        /* Dial-Up Networking Serial Cable between 2 PCs */
+        {       "PNPC031",              0       },
+        /* Dial-Up Networking Parallel Cable between 2 PCs */
+        {       "PNPC032",              0       },
+        /* Standard 9600 bps Modem */
+        {       "PNPC100",              0       },
+        /* Standard 14400 bps Modem */
+        {       "PNPC101",              0       },
+        /*  Standard 28800 bps Modem*/
+        {       "PNPC102",              0       },
+        /*  Standard Modem*/
+        {       "PNPC103",              0       },
+        /*  Standard 9600 bps Modem*/
+        {       "PNPC104",              0       },
+        /*  Standard 14400 bps Modem*/
+        {       "PNPC105",              0       },
+        /*  Standard 28800 bps Modem*/
+        {       "PNPC106",              0       },
+        /*  Standard Modem */
+        {       "PNPC107",              0       },
+        /* Standard 9600 bps Modem */
+        {       "PNPC108",              0       },
+        /* Standard 14400 bps Modem */
+        {       "PNPC109",              0       },
+        /* Standard 28800 bps Modem */
+        {       "PNPC10A",              0       },
+        /* Standard Modem */
+        {       "PNPC10B",              0       },
+        /* Standard 9600 bps Modem */
+        {       "PNPC10C",              0       },
+        /* Standard 14400 bps Modem */
+        {       "PNPC10D",              0       },
+        /* Standard 28800 bps Modem */
+        {       "PNPC10E",              0       },
+        /* Standard Modem */
+        {       "PNPC10F",              0       },
+        /* Standard PCMCIA Card Modem */
+        {       "PNP2000",              0       },
+        /* Rockwell */
+        /* Modular Technology */
+        /* Rockwell 33.6 DPF Internal PnP */
+        /* Modular Technology 33.6 Internal PnP */
+        {       "ROK0030",              0       },
+        /* Kortex International */
+        /* KORTEX 14400 Externe PnP */
+        {       "ROK0100",              0       },
+        /* Rockwell 28.8 */
+        {       "ROK4120",              0       },
+        /* Viking Components, Inc */
+        /* Viking 28.8 INTERNAL Fax+Data+Voice PnP */
+        {       "ROK4920",              0       },
+        /* Rockwell */
+        /* British Telecom */
+        /* Modular Technology */
+        /* Rockwell 33.6 DPF External PnP */
+        /* BT Prologue 33.6 External PnP */
+        /* Modular Technology 33.6 External PnP */
+        {       "RSS00A0",              0       },
+        /* Viking 56K FAX INT */
+        {       "RSS0262",              0       },
+        /* K56 par,VV,Voice,Speakphone,AudioSpan,PnP */
+        {       "RSS0250",              0       },
+        /* SupraExpress 28.8 Data/Fax PnP modem */
+        {       "SUP1310",              0       },
+        /* SupraExpress 33.6 Data/Fax PnP modem */
+        {       "SUP1421",              0       },
+        /* SupraExpress 33.6 Data/Fax PnP modem */
+        {       "SUP1590",              0       },
+        /* SupraExpress 33.6 Data/Fax PnP modem */
+        {       "SUP1760",              0       },
+        /* Phoebe Micro */
+        /* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */
+        {       "TEX0011",              0       },
+        /* Archtek America Corp. */
+        /* Archtek SmartLink Modem 3334BT Plug & Play */
+        {       "UAC000F",              0       },
+        /* 3Com Corp. */
+        /* Gateway Telepath IIvi 33.6 */
+        {       "USR0000",              0       },
+        /* U.S. Robotics Sporster 33.6K Fax INT PnP */
+        {       "USR0002",              0       },
+        /*  Sportster Vi 14.4 PnP FAX Voicemail */
+        {       "USR0004",              0       },
+        /* U.S. Robotics 33.6K Voice INT PnP */
+        {       "USR0006",              0       },
+        /* U.S. Robotics 33.6K Voice EXT PnP */
+        {       "USR0007",              0       },
+        /* U.S. Robotics Courier V.Everything INT PnP */
+        {       "USR0009",              0       },
+        /* U.S. Robotics 33.6K Voice INT PnP */
+        {       "USR2002",              0       },
+        /* U.S. Robotics 56K Voice INT PnP */
+        {       "USR2070",              0       },
+        /* U.S. Robotics 56K Voice EXT PnP */
+        {       "USR2080",              0       },
+        /* U.S. Robotics 56K FAX INT */
+        {       "USR3031",              0       },
+        /* U.S. Robotics 56K FAX INT */
+        {       "USR3050",              0       },
+        /* U.S. Robotics 56K Voice INT PnP */
+        {       "USR3070",              0       },
+        /* U.S. Robotics 56K Voice EXT PnP */
+        {       "USR3080",              0       },
+        /* U.S. Robotics 56K Voice INT PnP */
+        {       "USR3090",              0       },
+        /* U.S. Robotics 56K Message  */
+        {       "USR9100",              0       },
+        /* U.S. Robotics 56K FAX EXT PnP*/
+        {       "USR9160",              0       },
+        /* U.S. Robotics 56K FAX INT PnP*/
+        {       "USR9170",              0       },
+        /* U.S. Robotics 56K Voice EXT PnP*/
+        {       "USR9180",              0       },
+        /* U.S. Robotics 56K Voice INT PnP*/
+        {       "USR9190",              0       },
+        /* Rockwell's (PORALiNK) 33600 INT PNP */
+        {       "WCI0003",              0       },
+        /* Unkown PnP modems */
+        {       "PNPCXXX",              UNKNOWN_DEV     },
+        /* More unkown PnP modems */
+        {       "PNPDXXX",              UNKNOWN_DEV     },
+        {       "",                     0       }
+};
+
+MODULE_DEVICE_TABLE(pnp, pnp_dev_table);
+
+static char *modem_names[] __devinitdata = {
+        "MODEM", "Modem", "modem", "FAX", "Fax", "fax",
+        "56K", "56k", "K56", "33.6", "28.8", "14.4",
+        "33,600", "28,800", "14,400", "33.600", "28.800", "14.400",
+        "33600", "28800", "14400", "V.90", "V.34", "V.32", NULL
+};
+
+static int __devinit check_name(char *name)
+{
+        char **tmp;
+
+        for (tmp = modem_names; *tmp; tmp++)
+                if (strstr(name, *tmp))
+                        return 1;
+
+        return 0;
+}
+
+static int __devinit check_resources(struct pnp_option *option)
+{
+        struct pnp_option *tmp;
+        if (!option)
+                return 0;
+
+        for (tmp = option; tmp; tmp = tmp->next) {
+                struct pnp_port *port;
+                for (port = tmp->port; port; port = port->next)
+                        if ((port->size == 8) &&
+                            ((port->min == 0x2f8) ||
+                             (port->min == 0x3f8) ||
+                             (port->min == 0x2e8) ||
+                             (port->min == 0x3e8)))
+                                return 1;
+        }
+
+        return 0;
+}
+
+/*
+ * Given a complete unknown PnP device, try to use some heuristics to
+ * detect modems. Currently use such heuristic set:
+ *     - dev->name or dev->bus->name must contain "modem" substring;
+ *     - device must have only one IO region (8 byte long) with base address
+ *       0x2e8, 0x3e8, 0x2f8 or 0x3f8.
+ *
+ * Such detection looks very ugly, but can detect at least some of numerous
+ * PnP modems, alternatively we must hardcode all modems in pnp_devices[]
+ * table.
+ */
+static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags)
+{
+        if (!(check_name(pnp_dev_name(dev)) || (dev->card && check_name(dev->card->name))))
+                return -ENODEV;
+
+        if (check_resources(dev->independent))
+                return 0;
+
+        if (check_resources(dev->dependent))
+                return 0;
+
+        return -ENODEV;
+}
+
+static int __devinit
+serial_pnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id)
+{
+        struct uart_port port;
+        int ret, line, flags = dev_id->driver_data;
+
+        if (flags & UNKNOWN_DEV) {
+                ret = serial_pnp_guess_board(dev, &flags);
+                if (ret < 0)
+                        return ret;
+        }
+
+        memset(&port, 0, sizeof(struct uart_port));
+        port.irq = pnp_irq(dev,0);
+        port.iobase = pnp_port_start(dev, 0);
+
+#ifdef SERIAL_DEBUG_PNP
+        printk("Setup PNP port: port %x, irq %d, type %d\n",
+               port.iobase, port.irq, port.iotype);
+#endif
+
+        port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
+        port.uartclk = 1843200;
+        port.dev = &dev->dev;
+
+        line = serial8250_register_port(&port);
+
+        if (line >= 0)
+                pnp_set_drvdata(dev, (void *)((long)line + 1));
+        return line >= 0 ? 0 : -ENODEV;
+
+}
+
+static void __devexit serial_pnp_remove(struct pnp_dev * dev)
+{
+        long line = (long)pnp_get_drvdata(dev);
+        if (line)
+                serial8250_unregister_port(line - 1);
+}
+
+static struct pnp_driver serial_pnp_driver = {
+        .name           = "serial",
+        .id_table       = pnp_dev_table,
+        .probe          = serial_pnp_probe,
+        .remove         = __devexit_p(serial_pnp_remove),
+};
+
+static int __init serial8250_pnp_init(void)
+{
+        return pnp_register_driver(&serial_pnp_driver);
+}
+
+static void __exit serial8250_pnp_exit(void)
+{
+        pnp_unregister_driver(&serial_pnp_driver);
+}
+
+module_init(serial8250_pnp_init);
+module_exit(serial8250_pnp_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic 8250/16x50 PnP serial driver");
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
new file mode 100644
index 000000000000..6e44b46c9e9d
--- /dev/null
+++ b/drivers/serial/Kconfig
@@ -0,0 +1,846 @@
+#
+# Serial device configuration
+#
+# $Id: Kconfig,v 1.11 2004/03/11 18:08:04 lethal Exp $
+#
+
+menu "Serial drivers"
+
+#
+# The new 8250/16550 serial drivers
+config SERIAL_8250
+        tristate "8250/16550 and compatible serial support"
+        depends on (BROKEN || !(SPARC64 || SPARC32))
+        select SERIAL_CORE
+        ---help---
+          This selects whether you want to include the driver for the standard
+          serial ports.  The standard answer is Y.  People who might say N
+          here are those that are setting up dedicated Ethernet WWW/FTP
+          servers, or users that have one of the various bus mice instead of a
+          serial mouse and don't intend to use their machine's standard serial
+          port for anything.  (Note that the Cyclades and Stallion multi
+          serial port drivers do not need this driver built in for them to
+          work.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called serial.
+          [WARNING: Do not compile this driver as a module if you are using
+          non-standard serial ports, since the configuration information will
+          be lost when the driver is unloaded.  This limitation may be lifted
+          in the future.]
+
+          BTW1: If you have a mouseman serial mouse which is not recognized by
+          the X window system, try running gpm first.
+
+          BTW2: If you intend to use a software modem (also called Winmodem)
+          under Linux, forget it.  These modems are crippled and require
+          proprietary drivers which are only available under Windows.
+
+          Most people will say Y or M here, so that they can use serial mice,
+          modems and similar devices connecting to the standard serial ports.
+
+config SERIAL_8250_CONSOLE
+        bool "Console on 8250/16550 and compatible serial port"
+        depends on SERIAL_8250=y
+        select SERIAL_CORE_CONSOLE
+        ---help---
+          If you say Y here, it will be possible to use a serial port as the
+          system console (the system console is the device which receives all
+          kernel messages and warnings and which allows logins in single user
+          mode). This could be useful if some terminal or printer is connected
+          to that serial port.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyS1". (Try "man bootparam" or see the documentation of
+          your boot loader (grub or lilo or loadlin) about how to pass options
+          to the kernel at boot time.)
+
+          If you don't have a VGA card installed and you say Y here, the
+          kernel will automatically use the first serial line, /dev/ttyS0, as
+          system console.
+
+          If unsure, say N.
+
+config SERIAL_8250_CS
+        tristate "8250/16550 PCMCIA device support"
+        depends on PCMCIA && SERIAL_8250
+        ---help---
+          Say Y here to enable support for 16-bit PCMCIA serial devices,
+          including serial port cards, modems, and the modem functions of
+          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
+          credit-card size devices often used with laptops.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called serial_cs.
+
+          If unsure, say N.
+
+config SERIAL_8250_ACPI
+        bool "8250/16550 device discovery via ACPI namespace"
+        default y if IA64
+        depends on ACPI_BUS && SERIAL_8250
+        ---help---
+          If you wish to enable serial port discovery via the ACPI
+          namespace, say Y here.  If unsure, say N.
+
+config SERIAL_8250_NR_UARTS
+        int "Maximum number of non-legacy 8250/16550 serial ports"
+        depends on SERIAL_8250
+        default "4"
+        ---help---
+          Set this to the number of non-legacy serial ports you want
+          the driver to support.  This includes any ports discovered
+          via ACPI or PCI enumeration and any ports that may be added
+          at run-time via hot-plug.
+
+config SERIAL_8250_EXTENDED
+        bool "Extended 8250/16550 serial driver options"
+        depends on SERIAL_8250
+        help
+          If you wish to use any non-standard features of the standard "dumb"
+          driver, say Y here. This includes HUB6 support, shared serial
+          interrupts, special multiport support, support for more than the
+          four COM 1/2/3/4 boards, etc.
+
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about serial driver options. If unsure, say N.
+
+config SERIAL_8250_MANY_PORTS
+        bool "Support more than 4 legacy serial ports"
+        depends on SERIAL_8250_EXTENDED && !IA64
+        help
+          Say Y here if you have dumb serial boards other than the four
+          standard COM 1/2/3/4 ports. This may happen if you have an AST
+          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
+          from <http://www.tldp.org/docs.html#howto>), or other custom
+          serial port hardware which acts similar to standard serial port
+          hardware. If you only use the standard COM 1/2/3/4 ports, you can
+          say N here to save some memory. You can also say Y if you have an
+          "intelligent" multiport card such as Cyclades, Digiboards, etc.
+
+config SERIAL_8250_SHARE_IRQ
+        bool "Support for sharing serial interrupts"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Some serial boards have hardware support which allows multiple dumb
+          serial ports on the same board to share a single IRQ. To enable
+          support for this in the serial driver, say Y here.
+
+config SERIAL_8250_DETECT_IRQ
+        bool "Autodetect IRQ on standard ports (unsafe)"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Say Y here if you want the kernel to try to guess which IRQ
+          to use for your serial port.
+
+          This is considered unsafe; it is far better to configure the IRQ in
+          a boot script using the setserial command.
+
+          If unsure, say N.
+
+config SERIAL_8250_MULTIPORT
+        bool "Support special multiport boards"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Some multiport serial ports have special ports which are used to
+          signal when there are any serial ports on the board which need
+          servicing. Say Y here to enable the serial driver to take advantage
+          of those special I/O ports.
+
+config SERIAL_8250_RSA
+        bool "Support RSA serial ports"
+        depends on SERIAL_8250_EXTENDED
+        help
+          ::: To be written :::
+
+comment "Non-8250 serial port support"
+
+config SERIAL_8250_ACORN
+        tristate "Acorn expansion card serial port support"
+        depends on ARM && ARCH_ACORN && SERIAL_8250
+        help
+          If you have an Atomwide Serial card or Serial Port card for an Acorn
+          system, say Y to this option.  The driver can handle 1, 2, or 3 port
+          cards.  If unsure, say N.
+
+config SERIAL_AMBA_PL010
+        tristate "ARM AMBA PL010 serial port support"
+        depends on ARM_AMBA
+        select SERIAL_CORE
+        help
+          This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
+          an Integrator/AP or Integrator/PP2 platform, say Y or M here.
+
+          If unsure, say N.
+
+config SERIAL_AMBA_PL010_CONSOLE
+        bool "Support for console on AMBA serial port"
+        depends on SERIAL_AMBA_PL010=y
+        select SERIAL_CORE_CONSOLE
+        ---help---
+          Say Y here if you wish to use an AMBA PrimeCell UART as the system
+          console (the system console is the device which receives all kernel
+          messages and warnings and which allows logins in single user mode).
+
+          Even if you say Y here, the currently visible framebuffer console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyAM0". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_AMBA_PL011
+        tristate "ARM AMBA PL011 serial port support"
+        depends on ARM_AMBA
+        select SERIAL_CORE
+        help
+          This selects the ARM(R) AMBA(R) PrimeCell PL011 UART.  If you have
+          an Integrator/PP2, Integrator/CP or Versatile platform, say Y or M
+          here.
+
+          If unsure, say N.
+
+config SERIAL_AMBA_PL011_CONSOLE
+        bool "Support for console on AMBA serial port"
+        depends on SERIAL_AMBA_PL011=y
+        select SERIAL_CORE_CONSOLE
+        ---help---
+          Say Y here if you wish to use an AMBA PrimeCell UART as the system
+          console (the system console is the device which receives all kernel
+          messages and warnings and which allows logins in single user mode).
+
+          Even if you say Y here, the currently visible framebuffer console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyAM0". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_CLPS711X
+        tristate "CLPS711X serial port support"
+        depends on ARM && ARCH_CLPS711X
+        select SERIAL_CORE
+        help
+          ::: To be written :::
+
+config SERIAL_CLPS711X_CONSOLE
+        bool "Support for console on CLPS711X serial port"
+        depends on SERIAL_CLPS711X=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyCL1". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_S3C2410
+        tristate "Samsung S3C2410 Serial port support"
+        depends on ARM && ARCH_S3C2410
+        select SERIAL_CORE
+        help
+          Support for the on-chip UARTs on the Samsung S3C2410X CPU,
+          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
+          provide all of these ports, depending on how the serial port
+          pins are configured.
+
+config SERIAL_S3C2410_CONSOLE
+        bool "Support for console on S3C2410 serial port"
+        depends on SERIAL_S3C2410=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Allow selection of the S3C2410 on-board serial ports for use as
+          an virtual console.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttySACx". (Try "man bootparam" or see the documentation of
+          your boot loader about how to pass options to the kernel at
+          boot time.)
+
+config SERIAL_BAST_SIO
+        bool "Support for BAST SuperIO serial ports"
+        depends on ARCH_BAST && SERIAL_8250=y
+        help
+          Support for registerin the SuperIO chip on BAST board with
+          the 8250/16550 uart code.
+
+config SERIAL_DZ
+        bool "DECstation DZ serial driver"
+        depends on MACH_DECSTATION && MIPS32
+        select SERIAL_CORE
+        help
+          DZ11-family serial controllers for VAXstations, including the
+          DC7085, M7814, and M7819.
+
+config SERIAL_DZ_CONSOLE
+        bool "Support console on DECstation DZ serial driver"
+        depends on SERIAL_DZ=y
+        select SERIAL_CORE_CONSOLE
+        help
+          If you say Y here, it will be possible to use a serial port as the
+          system console (the system console is the device which receives all
+          kernel messages and warnings and which allows logins in single user
+          mode).  Note that the firmware uses ttyS0 as the serial console on
+          the Maxine and ttyS2 on the others.
+
+          If unsure, say Y.
+
+config SERIAL_21285
+        tristate "DC21285 serial port support"
+        depends on ARM && FOOTBRIDGE
+        select SERIAL_CORE
+        help
+          If you have a machine based on a 21285 (Footbridge) StrongARM(R)/
+          PCI bridge you can enable its onboard serial port by enabling this
+          option.
+
+config SERIAL_21285_CONSOLE
+        bool "Console on DC21285 serial port"
+        depends on SERIAL_21285=y
+        select SERIAL_CORE_CONSOLE
+        help
+          If you have enabled the serial port on the 21285 footbridge you can
+          make it the console by answering Y to this option.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyFB". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_UART00
+        bool "Excalibur serial port (uart00) support"
+        depends on ARM && ARCH_CAMELOT
+        select SERIAL_CORE
+        help
+          Say Y here if you want to use the hard logic uart on Excalibur. This
+          driver also supports soft logic implementations of this uart core.
+
+config SERIAL_UART00_CONSOLE
+        bool "Support for console on Excalibur serial port"
+        depends on SERIAL_UART00
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you want to support a serial console on an Excalibur
+          hard logic uart or uart00 IP core.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyS1". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_MPSC
+        bool "Marvell MPSC serial port support"
+        depends on PPC32 && MV64X60
+        select SERIAL_CORE
+        help
+          Say Y here if you want to use the Marvell MPSC serial controller.
+
+config SERIAL_MPSC_CONSOLE
+        bool "Support for console on Marvell MPSC serial port"
+        depends on SERIAL_MPSC
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you want to support a serial console on a Marvell MPSC.
+
+config SERIAL_PXA
+        bool "PXA serial port support"
+        depends on ARM && ARCH_PXA
+        select SERIAL_CORE
+        help
+          If you have a machine based on an Intel XScale PXA2xx CPU you
+          can enable its onboard serial ports by enabling this option.
+
+config SERIAL_PXA_CONSOLE
+        bool "Console on PXA serial port"
+        depends on SERIAL_PXA
+        select SERIAL_CORE_CONSOLE
+        help
+          If you have enabled the serial port on the Intel XScale PXA
+          CPU you can make it the console by answering Y to this option.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttySA0". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_SA1100
+        bool "SA1100 serial port support"
+        depends on ARM && ARCH_SA1100
+        select SERIAL_CORE
+        help
+          If you have a machine based on a SA1100/SA1110 StrongARM(R) CPU you
+          can enable its onboard serial port by enabling this option.
+          Please read <file:Documentation/arm/SA1100/serial_UART> for further
+          info.
+
+config SERIAL_SA1100_CONSOLE
+        bool "Console on SA1100 serial port"
+        depends on SERIAL_SA1100
+        select SERIAL_CORE_CONSOLE
+        help
+          If you have enabled the serial port on the SA1100/SA1110 StrongARM
+          CPU you can make it the console by answering Y to this option.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttySA0". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_IMX
+        bool "IMX serial port support"
+        depends on ARM && ARCH_IMX
+        select SERIAL_CORE
+        help
+          If you have a machine based on a Motorola IMX CPU you
+          can enable its onboard serial port by enabling this option.
+
+config SERIAL_IMX_CONSOLE
+        bool "Console on IMX serial port"
+        depends on SERIAL_IMX
+        select SERIAL_CORE_CONSOLE
+        help
+          If you have enabled the serial port on the Motorola IMX
+          CPU you can make it the console by answering Y to this option.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttySA0". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_SUNCORE
+        bool
+        depends on SPARC32 || SPARC64
+        select SERIAL_CORE
+        select SERIAL_CORE_CONSOLE
+        default y
+
+config SERIAL_SUNZILOG
+        tristate "Sun Zilog8530 serial support"
+        depends on SPARC32 || SPARC64
+        help
+          This driver supports the Zilog8530 serial ports found on many Sparc
+          systems.  Say Y or M if you want to be able to these serial ports.
+
+config SERIAL_SUNZILOG_CONSOLE
+        bool "Console on Sun Zilog8530 serial port"
+        depends on SERIAL_SUNZILOG=y
+        help
+          If you would like to be able to use the Zilog8530 serial port
+          on your Sparc system as the console, you can do so by answering
+          Y to this option.
+
+config SERIAL_SUNSU
+        tristate "Sun SU serial support"
+        depends on (SPARC32 || SPARC64) && PCI
+        help
+          This driver supports the 8250 serial ports that run the keyboard and
+          mouse on (PCI) UltraSPARC systems.  Say Y or M if you want to be able
+          to these serial ports.
+
+config SERIAL_SUNSU_CONSOLE
+        bool "Console on Sun SU serial port"
+        depends on SERIAL_SUNSU=y
+        help
+          If you would like to be able to use the SU serial port
+          on your Sparc system as the console, you can do so by answering
+          Y to this option.
+
+config SERIAL_MUX
+        tristate "Serial MUX support"
+        depends on PARISC
+        select SERIAL_CORE
+        default y
+        ---help---
+          Saying Y here will enable the hardware MUX serial driver for
+          the Nova and K class systems.  The hardware MUX is not 8250/16550 
+          compatible therefore the /dev/ttyB0 device is shared between the 
+          Serial MUX and the PDC software console.  The following steps 
+          need to be completed to use the Serial MUX:
+
+            1. create the device entry (mknod /dev/ttyB0 c 11 0)
+            2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0
+            3. Add device ttyB0 to /etc/securetty (if you want to log on as
+                 root on this console.)
+            4. Change the kernel command console parameter to: console=ttyB0
+
+config SERIAL_MUX_CONSOLE
+        bool "Support for console on serial MUX"
+        depends on SERIAL_MUX
+        select SERIAL_CORE_CONSOLE
+        default y
+
+config PDC_CONSOLE
+        bool "PDC software console support"
+        depends on PARISC && !SERIAL_MUX && VT
+        default n
+        help
+          Saying Y here will enable the software based PDC console to be 
+          used as the system console.  This is useful for machines in 
+          which the hardware based console has not been written yet.  The
+          following steps must be competed to use the PDC console:
+
+            1. create the device entry (mknod /dev/ttyB0 c 11 0)
+            2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0
+            3. Add device ttyB0 to /etc/securetty (if you want to log on as
+                 root on this console.)
+            4. Change the kernel command console parameter to: console=ttyB0
+
+config SERIAL_SUNSAB
+        tristate "Sun Siemens SAB82532 serial support"
+        depends on (SPARC32 || SPARC64) && PCI
+        help
+          This driver supports the Siemens SAB82532 DUSCC serial ports on newer
+          (PCI) UltraSPARC systems.  Say Y or M if you want to be able to these
+          serial ports.
+
+config SERIAL_SUNSAB_CONSOLE
+        bool "Console on Sun Siemens SAB82532 serial port"
+        depends on SERIAL_SUNSAB=y
+        help
+          If you would like to be able to use the SAB82532 serial port
+          on your Sparc system as the console, you can do so by answering
+          Y to this option.
+
+config SERIAL_IP22_ZILOG
+        tristate "IP22 Zilog8530 serial support"
+        depends on SGI_IP22
+        select SERIAL_CORE
+        help
+          This driver supports the Zilog8530 serial ports found on SGI IP22
+          systems.  Say Y or M if you want to be able to these serial ports.
+
+config SERIAL_IP22_ZILOG_CONSOLE
+        bool "Console on IP22 Zilog8530 serial port"
+        depends on SERIAL_IP22_ZILOG=y
+        select SERIAL_CORE_CONSOLE
+
+config V850E_UART
+        bool "NEC V850E on-chip UART support"
+        depends on V850E_MA1 || V850E_ME2 || V850E_TEG || V850E2_ANNA || V850E_AS85EP1
+        select SERIAL_CORE
+        default y
+
+config V850E_UARTB
+        bool
+        depends V850E_UART && V850E_ME2
+        default y
+
+config V850E_UART_CONSOLE
+        bool "Use NEC V850E on-chip UART for console"
+        depends on V850E_UART
+        select SERIAL_CORE_CONSOLE
+
+config SERIAL_SH_SCI
+        tristate "SH SCI(F) serial port support"
+        depends on SUPERH || H8300
+        select SERIAL_CORE
+
+config SERIAL_SH_SCI_CONSOLE
+        bool "Support for console on SH SCI(F)"
+        depends on SERIAL_SH_SCI=y
+        select SERIAL_CORE_CONSOLE
+
+config SERIAL_AU1X00
+        bool "Enable Au1x00 UART Support"
+        depends on MIPS && SOC_AU1X00
+        select SERIAL_CORE
+        help
+          If you have an Alchemy AU1X00 processor (MIPS based) and you want
+          to use serial ports, say Y.  Otherwise, say N.
+
+config SERIAL_AU1X00_CONSOLE
+        bool "Enable Au1x00 serial console"
+        depends on SERIAL_AU1X00
+        select SERIAL_CORE_CONSOLE
+        help
+          If you have an Alchemy AU1X00 processor (MIPS based) and you want
+          to use a console on a serial port, say Y.  Otherwise, say N.
+
+config SERIAL_CORE
+        tristate
+
+config SERIAL_CORE_CONSOLE
+        bool
+
+config SERIAL_68328
+        bool "68328 serial support"
+        depends on M68328 || M68EZ328 || M68VZ328
+        help
+          This driver supports the built-in serial port of the Motorola 68328
+          (standard, EZ and VZ varities).
+
+config SERIAL_68328_RTS_CTS
+        bool "Support RTS/CTS on 68328 serial port"
+        depends on SERIAL_68328
+
+config SERIAL_COLDFIRE
+        bool "ColdFire serial support"
+        depends on COLDFIRE
+        help
+          This driver supports the built-in serial ports of the Motorola ColdFire
+          family of CPUs.
+
+config SERIAL_68360_SMC
+        bool "68360 SMC uart support"
+        depends on M68360
+        help
+          This driver supports the SMC serial ports of the Motorola 68360 CPU.
+
+config SERIAL_68360_SCC
+        bool "68360 SCC uart support"
+        depends on M68360
+        help
+          This driver supports the SCC serial ports of the Motorola 68360 CPU.
+
+config SERIAL_68360
+        bool
+        depends on SERIAL_68360_SMC || SERIAL_68360_SCC
+        default y
+
+config SERIAL_PMACZILOG
+        tristate "PowerMac z85c30 ESCC support"
+        depends on PPC_OF && PPC_PMAC
+        select SERIAL_CORE
+        help
+          This driver supports the Zilog z85C30 serial ports found on
+          PowerMac machines.
+          Say Y or M if you want to be able to these serial ports.
+
+config SERIAL_PMACZILOG_CONSOLE
+        bool "Console on PowerMac z85c30 serial port"
+        depends on SERIAL_PMACZILOG=y
+        select SERIAL_CORE_CONSOLE
+        help
+          If you would like to be able to use the z85c30 serial port
+          on your PowerMac as the console, you can do so by answering
+          Y to this option.
+
+config SERIAL_LH7A40X
+        tristate "Sharp LH7A40X embedded UART support"
+        depends on ARM && ARCH_LH7A40X
+        select SERIAL_CORE
+        help
+          This enables support for the three on-board UARTs of the
+          Sharp LH7A40X series CPUs.  Choose Y or M.
+
+config SERIAL_LH7A40X_CONSOLE
+        bool "Support for console on Sharp LH7A40X serial port"
+        depends on SERIAL_LH7A40X=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you wish to use one of the serial ports as the
+          system console--the system console is the device which
+          receives all kernel messages and warnings and which allows
+          logins in single user mode.
+
+          Even if you say Y here, the currently visible framebuffer console
+          (/dev/tty0) will still be used as the default system console, but
+          you can alter that using a kernel command line, for example
+          "console=ttyAM1".
+
+config SERIAL_CPM
+        tristate "CPM SCC/SMC serial port support"
+        depends on CPM2 || 8xx
+        select SERIAL_CORE
+        help
+          This driver supports the SCC and SMC serial ports on Motorola 
+          embedded PowerPC that contain a CPM1 (8xx) or CPM2 (8xxx)
+
+config SERIAL_CPM_CONSOLE
+        bool "Support for console on CPM SCC/SMC serial port"
+        depends on SERIAL_CPM=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you wish to use a SCC or SMC CPM UART as the system
+          console (the system console is the device which receives all kernel
+          messages and warnings and which allows logins in single user mode).
+
+          Even if you say Y here, the currently visible framebuffer console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyCPM0". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+config SERIAL_CPM_SCC1
+        bool "Support for SCC1 serial port"
+        depends on SERIAL_CPM=y
+        help
+          Select the is option to use SCC1 as a serial port
+
+config SERIAL_CPM_SCC2
+        bool "Support for SCC2 serial port"
+        depends on SERIAL_CPM=y
+        help
+          Select the is option to use SCC2 as a serial port
+
+config SERIAL_CPM_SCC3
+        bool "Support for SCC3 serial port"
+        depends on SERIAL_CPM=y
+        help
+          Select the is option to use SCC3 as a serial port
+
+config SERIAL_CPM_SCC4
+        bool "Support for SCC4 serial port"
+        depends on SERIAL_CPM=y
+        help
+          Select the is option to use SCC4 as a serial port
+
+config SERIAL_CPM_SMC1
+        bool "Support for SMC1 serial port"
+        depends on SERIAL_CPM=y
+        help
+          Select the is option to use SMC1 as a serial port
+
+config SERIAL_CPM_SMC2
+        bool "Support for SMC2 serial port"
+        depends on SERIAL_CPM=y
+        help
+          Select the is option to use SMC2 as a serial port
+
+config SERIAL_SGI_L1_CONSOLE
+        bool "SGI Altix L1 serial console support"
+        depends on IA64_GENERIC || IA64_SGI_SN2
+        select SERIAL_CORE
+        select SERIAL_CORE_CONSOLE
+        help
+                If you have an SGI Altix and you would like to use the system
+                controller serial port as your console (you want this!),
+                say Y.  Otherwise, say N.
+
+config SERIAL_MPC52xx
+        tristate "Freescale MPC52xx family PSC serial support"
+        depends on PPC_MPC52xx
+        select SERIAL_CORE
+        help
+          This drivers support the MPC52xx PSC serial ports. If you would
+          like to use them, you must answer Y or M to this option. Not that
+          for use as console, it must be included in kernel and not as a
+          module.
+
+config SERIAL_MPC52xx_CONSOLE
+        bool "Console on a Freescale MPC52xx family PSC serial port"
+        depends on SERIAL_MPC52xx=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Select this options if you'd like to use one of the PSC serial port
+          of the Freescale MPC52xx family as a console.
+
+config SERIAL_MPC52xx_CONSOLE_BAUD
+        int "Freescale MPC52xx family PSC serial port baud"
+        depends on SERIAL_MPC52xx_CONSOLE=y
+        default "9600"
+        help
+          Select the MPC52xx console baud rate.
+          This value is only used if the bootloader doesn't pass in the
+          console baudrate
+
+config SERIAL_ICOM
+        tristate "IBM Multiport Serial Adapter"
+        depends on PPC_ISERIES || PPC_PSERIES
+        select SERIAL_CORE
+        help
+          This driver is for a family of multiport serial adapters
+          including 2 port RVX, 2 port internal modem, 4 port internal
+          modem and a split 1 port RVX and 1 port internal modem.
+
+          This driver can also be built as a module.  If so, the module
+          will be called icom.
+
+config SERIAL_M32R_SIO
+        bool "M32R SIO I/F"
+        depends on M32R
+        default y
+        select SERIAL_CORE
+        help
+          Say Y here if you want to use the M32R serial controller.
+
+config SERIAL_M32R_SIO_CONSOLE
+        bool "use SIO console"
+        depends on SERIAL_M32R_SIO=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you want to support a serial console.
+
+          If you use an M3T-M32700UT or an OPSPUT platform,
+          please say also y for SERIAL_M32R_PLDSIO.
+
+config SERIAL_M32R_PLDSIO
+        bool "M32R SIO I/F on a PLD"
+        depends on SERIAL_M32R_SIO=y
+        default n
+        help
+          Say Y here if you want to use the M32R serial controller
+          on a PLD (Programmable Logic Device).
+
+          If you use an M3T-M32700UT or an OPSPUT platform,
+          please say Y.
+
+config SERIAL_TXX9
+        bool "TMPTX39XX/49XX SIO support"
+        depends HAS_TXX9_SERIAL
+        select SERIAL_CORE
+        default y
+
+config HAS_TXX9_SERIAL
+        bool
+
+config SERIAL_TXX9_CONSOLE
+        bool "TMPTX39XX/49XX SIO Console support"
+        depends on SERIAL_TXX9=y
+        select SERIAL_CORE_CONSOLE
+
+config SERIAL_TXX9_STDSERIAL
+        bool "TX39XX/49XX SIO act as standard serial"
+        depends on !SERIAL_8250 && SERIAL_TXX9
+
+config SERIAL_VR41XX
+        tristate "NEC VR4100 series Serial Interface Unit support"
+        depends on CPU_VR41XX
+        select SERIAL_CORE
+        help
+          If you have a NEC VR4100 series processor and you want to use
+          Serial Interface Unit(SIU) or Debug Serial Interface Unit(DSIU)
+          (not include VR4111/VR4121 DSIU), say Y.  Otherwise, say N.
+
+config SERIAL_VR41XX_CONSOLE
+        bool "Enable NEC VR4100 series Serial Interface Unit console"
+        depends on SERIAL_VR41XX
+        select SERIAL_CORE_CONSOLE
+        help
+          If you have a NEC VR4100 series processor and you want to use
+          a console on a serial port, say Y.  Otherwise, say N.
+
+config SERIAL_JSM
+        tristate "Digi International NEO PCI Support"
+        depends on PCI
+        select SERIAL_CORE
+        help
+          This is a driver for Digi International's Neo series
+          of cards which provide multiple serial ports. You would need
+          something like this to connect more than two modems to your Linux
+          box, for instance in order to become a dial-in server. This driver
+          supports PCI boards only.
+          If you have a card like this, say Y here and read the file
+          <file:Documentation/jsm.txt>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called jsm.
+
+endmenu
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
new file mode 100644
index 000000000000..81b77d769b84
--- /dev/null
+++ b/drivers/serial/Makefile
@@ -0,0 +1,54 @@
+#
+# Makefile for the kernel serial device drivers.
+#
+#  $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $
+#
+
+serial-8250-y :=
+serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o
+serial-8250-$(CONFIG_PNP) += 8250_pnp.o
+serial-8250-$(CONFIG_GSC) += 8250_gsc.o
+serial-8250-$(CONFIG_PCI) += 8250_pci.o
+serial-8250-$(CONFIG_HP300) += 8250_hp300.o
+
+obj-$(CONFIG_SERIAL_CORE) += serial_core.o
+obj-$(CONFIG_SERIAL_21285) += 21285.o
+obj-$(CONFIG_SERIAL_8250) += 8250.o $(serial-8250-y)
+obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
+obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
+obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
+obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
+obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
+obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
+obj-$(CONFIG_SERIAL_PXA) += pxa.o
+obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
+obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
+obj-$(CONFIG_SERIAL_UART00) += uart00.o
+obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
+obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
+obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
+obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
+obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
+obj-$(CONFIG_SERIAL_MUX) += mux.o
+obj-$(CONFIG_SERIAL_68328) += 68328serial.o
+obj-$(CONFIG_SERIAL_68360) += 68360serial.o
+obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o
+obj-$(CONFIG_V850E_UART) += v850e_uart.o
+obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o
+obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o
+obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o
+obj-$(CONFIG_SERIAL_DZ) += dz.o
+obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
+obj-$(CONFIG_SERIAL_BAST_SIO) += bast_sio.o
+obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o
+obj-$(CONFIG_SERIAL_CPM) += cpm_uart/
+obj-$(CONFIG_SERIAL_IMX) += imx.o
+obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o
+obj-$(CONFIG_SERIAL_ICOM) += icom.o
+obj-$(CONFIG_SERIAL_M32R_SIO) += m32r_sio.o
+obj-$(CONFIG_SERIAL_MPSC) += mpsc.o
+obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o
+obj-$(CONFIG_SERIAL_JSM) += jsm/
+obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o
+obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o
+obj-$(CONFIG_BLK_DEV_SGIIOC4) += ioc4_serial.o
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
new file mode 100644
index 000000000000..ac57fdc8711b
--- /dev/null
+++ b/drivers/serial/amba-pl010.c
@@ -0,0 +1,840 @@
+/*
+ *  linux/drivers/char/amba.c
+ *
+ *  Driver for AMBA serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright 1999 ARM Limited
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: amba.c,v 1.41 2002/07/28 10:03:27 rmk Exp $
+ *
+ * This is a generic driver for ARM AMBA-type serial ports.  They
+ * have a lot of 16550-like features, but are not register compatible.
+ * Note that although they do have CTS, DCD and DSR inputs, they do
+ * not have an RI input, nor do they have DTR or RTS outputs.  If
+ * required, these have to be supplied via some other means (eg, GPIO)
+ * and hooked into this driver.
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/hardware/amba.h>
+#include <asm/hardware/amba_serial.h>
+
+#define UART_NR         2
+
+#define SERIAL_AMBA_MAJOR       204
+#define SERIAL_AMBA_MINOR       16
+#define SERIAL_AMBA_NR          UART_NR
+
+#define AMBA_ISR_PASS_LIMIT     256
+
+/*
+ * Access macros for the AMBA UARTs
+ */
+#define UART_GET_INT_STATUS(p)  readb((p)->membase + UART010_IIR)
+#define UART_PUT_ICR(p, c)      writel((c), (p)->membase + UART010_ICR)
+#define UART_GET_FR(p)          readb((p)->membase + UART01x_FR)
+#define UART_GET_CHAR(p)        readb((p)->membase + UART01x_DR)
+#define UART_PUT_CHAR(p, c)     writel((c), (p)->membase + UART01x_DR)
+#define UART_GET_RSR(p)         readb((p)->membase + UART01x_RSR)
+#define UART_GET_CR(p)          readb((p)->membase + UART010_CR)
+#define UART_PUT_CR(p,c)        writel((c), (p)->membase + UART010_CR)
+#define UART_GET_LCRL(p)        readb((p)->membase + UART010_LCRL)
+#define UART_PUT_LCRL(p,c)      writel((c), (p)->membase + UART010_LCRL)
+#define UART_GET_LCRM(p)        readb((p)->membase + UART010_LCRM)
+#define UART_PUT_LCRM(p,c)      writel((c), (p)->membase + UART010_LCRM)
+#define UART_GET_LCRH(p)        readb((p)->membase + UART010_LCRH)
+#define UART_PUT_LCRH(p,c)      writel((c), (p)->membase + UART010_LCRH)
+#define UART_RX_DATA(s)         (((s) & UART01x_FR_RXFE) == 0)
+#define UART_TX_READY(s)        (((s) & UART01x_FR_TXFF) == 0)
+#define UART_TX_EMPTY(p)        ((UART_GET_FR(p) & UART01x_FR_TMSK) == 0)
+
+#define UART_DUMMY_RSR_RX       /*256*/0
+#define UART_PORT_SIZE          64
+
+/*
+ * 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)
+
+/*
+ * We wrap our port structure around the generic uart_port.
+ */
+struct uart_amba_port {
+        struct uart_port        port;
+        unsigned int            dtr_mask;
+        unsigned int            rts_mask;
+        unsigned int            old_status;
+};
+
+static void pl010_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        unsigned int cr;
+
+        cr = UART_GET_CR(port);
+        cr &= ~UART010_CR_TIE;
+        UART_PUT_CR(port, cr);
+}
+
+static void pl010_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        unsigned int cr;
+
+        cr = UART_GET_CR(port);
+        cr |= UART010_CR_TIE;
+        UART_PUT_CR(port, cr);
+}
+
+static void pl010_stop_rx(struct uart_port *port)
+{
+        unsigned int cr;
+
+        cr = UART_GET_CR(port);
+        cr &= ~(UART010_CR_RIE | UART010_CR_RTIE);
+        UART_PUT_CR(port, cr);
+}
+
+static void pl010_enable_ms(struct uart_port *port)
+{
+        unsigned int cr;
+
+        cr = UART_GET_CR(port);
+        cr |= UART010_CR_MSIE;
+        UART_PUT_CR(port, cr);
+}
+
+static void
+#ifdef SUPPORT_SYSRQ
+pl010_rx_chars(struct uart_port *port, struct pt_regs *regs)
+#else
+pl010_rx_chars(struct uart_port *port)
+#endif
+{
+        struct tty_struct *tty = port->info->tty;
+        unsigned int status, ch, flag, rsr, max_count = 256;
+
+        status = UART_GET_FR(port);
+        while (UART_RX_DATA(status) && max_count--) {
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /*
+                         * If this failed then we will throw away the
+                         * bytes but must do so to clear interrupts.
+                         */
+                }
+
+                ch = UART_GET_CHAR(port);
+                flag = TTY_NORMAL;
+
+                port->icount.rx++;
+
+                /*
+                 * Note that the error handling code is
+                 * out of the main execution path
+                 */
+                rsr = UART_GET_RSR(port) | UART_DUMMY_RSR_RX;
+                if (rsr & UART01x_RSR_ANY) {
+                        if (rsr & UART01x_RSR_BE) {
+                                rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
+                                port->icount.brk++;
+                                if (uart_handle_break(port))
+                                        goto ignore_char;
+                        } else if (rsr & UART01x_RSR_PE)
+                                port->icount.parity++;
+                        else if (rsr & UART01x_RSR_FE)
+                                port->icount.frame++;
+                        if (rsr & UART01x_RSR_OE)
+                                port->icount.overrun++;
+
+                        rsr &= port->read_status_mask;
+
+                        if (rsr & UART01x_RSR_BE)
+                                flag = TTY_BREAK;
+                        else if (rsr & UART01x_RSR_PE)
+                                flag = TTY_PARITY;
+                        else if (rsr & UART01x_RSR_FE)
+                                flag = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char(port, ch, regs))
+                        goto ignore_char;
+
+                if ((rsr & port->ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+                if ((rsr & UART01x_RSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+        ignore_char:
+                status = UART_GET_FR(port);
+        }
+        tty_flip_buffer_push(tty);
+        return;
+}
+
+static void pl010_tx_chars(struct uart_port *port)
+{
+        struct circ_buf *xmit = &port->info->xmit;
+        int count;
+
+        if (port->x_char) {
+                UART_PUT_CHAR(port, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                pl010_stop_tx(port, 0);
+                return;
+        }
+
+        count = port->fifosize >> 1;
+        do {
+                UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                pl010_stop_tx(port, 0);
+}
+
+static void pl010_modem_status(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int status, delta;
+
+        UART_PUT_ICR(&uap->port, 0);
+
+        status = UART_GET_FR(&uap->port) & UART01x_FR_MODEM_ANY;
+
+        delta = status ^ uap->old_status;
+        uap->old_status = status;
+
+        if (!delta)
+                return;
+
+        if (delta & UART01x_FR_DCD)
+                uart_handle_dcd_change(&uap->port, status & UART01x_FR_DCD);
+
+        if (delta & UART01x_FR_DSR)
+                uap->port.icount.dsr++;
+
+        if (delta & UART01x_FR_CTS)
+                uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
+
+        wake_up_interruptible(&uap->port.info->delta_msr_wait);
+}
+
+static irqreturn_t pl010_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = dev_id;
+        unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;
+        int handled = 0;
+
+        spin_lock(&port->lock);
+
+        status = UART_GET_INT_STATUS(port);
+        if (status) {
+                do {
+                        if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
+#ifdef SUPPORT_SYSRQ
+                                pl010_rx_chars(port, regs);
+#else
+                                pl010_rx_chars(port);
+#endif
+                        if (status & UART010_IIR_MIS)
+                                pl010_modem_status(port);
+                        if (status & UART010_IIR_TIS)
+                                pl010_tx_chars(port);
+
+                        if (pass_counter-- == 0)
+                                break;
+
+                        status = UART_GET_INT_STATUS(port);
+                } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
+                                   UART010_IIR_TIS));
+                handled = 1;
+        }
+
+        spin_unlock(&port->lock);
+
+        return IRQ_RETVAL(handled);
+}
+
+static unsigned int pl010_tx_empty(struct uart_port *port)
+{
+        return UART_GET_FR(port) & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
+}
+
+static unsigned int pl010_get_mctrl(struct uart_port *port)
+{
+        unsigned int result = 0;
+        unsigned int status;
+
+        status = UART_GET_FR(port);
+        if (status & UART01x_FR_DCD)
+                result |= TIOCM_CAR;
+        if (status & UART01x_FR_DSR)
+                result |= TIOCM_DSR;
+        if (status & UART01x_FR_CTS)
+                result |= TIOCM_CTS;
+
+        return result;
+}
+
+static void pl010_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int ctrls = 0, ctrlc = 0;
+
+        if (mctrl & TIOCM_RTS)
+                ctrlc |= uap->rts_mask;
+        else
+                ctrls |= uap->rts_mask;
+
+        if (mctrl & TIOCM_DTR)
+                ctrlc |= uap->dtr_mask;
+        else
+                ctrls |= uap->dtr_mask;
+
+        __raw_writel(ctrls, SC_CTRLS);
+        __raw_writel(ctrlc, SC_CTRLC);
+}
+
+static void pl010_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long flags;
+        unsigned int lcr_h;
+
+        spin_lock_irqsave(&port->lock, flags);
+        lcr_h = UART_GET_LCRH(port);
+        if (break_state == -1)
+                lcr_h |= UART01x_LCRH_BRK;
+        else
+                lcr_h &= ~UART01x_LCRH_BRK;
+        UART_PUT_LCRH(port, lcr_h);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int pl010_startup(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        int retval;
+
+        /*
+         * Allocate the IRQ
+         */
+        retval = request_irq(port->irq, pl010_int, 0, "uart-pl010", port);
+        if (retval)
+                return retval;
+
+        /*
+         * initialise the old status of the modem signals
+         */
+        uap->old_status = UART_GET_FR(port) & UART01x_FR_MODEM_ANY;
+
+        /*
+         * Finally, enable interrupts
+         */
+        UART_PUT_CR(port, UART01x_CR_UARTEN | UART010_CR_RIE |
+                          UART010_CR_RTIE);
+
+        return 0;
+}
+
+static void pl010_shutdown(struct uart_port *port)
+{
+        /*
+         * Free the interrupt
+         */
+        free_irq(port->irq, port);
+
+        /*
+         * disable all interrupts, disable the port
+         */
+        UART_PUT_CR(port, 0);
+
+        /* disable break condition and fifos */
+        UART_PUT_LCRH(port, UART_GET_LCRH(port) &
+                ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN));
+}
+
+static void
+pl010_set_termios(struct uart_port *port, struct termios *termios,
+                     struct termios *old)
+{
+        unsigned int lcr_h, old_cr;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = uart_get_divisor(port, baud);
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                lcr_h = UART01x_LCRH_WLEN_5;
+                break;
+        case CS6:
+                lcr_h = UART01x_LCRH_WLEN_6;
+                break;
+        case CS7:
+                lcr_h = UART01x_LCRH_WLEN_7;
+                break;
+        default: // CS8
+                lcr_h = UART01x_LCRH_WLEN_8;
+                break;
+        }
+        if (termios->c_cflag & CSTOPB)
+                lcr_h |= UART01x_LCRH_STP2;
+        if (termios->c_cflag & PARENB) {
+                lcr_h |= UART01x_LCRH_PEN;
+                if (!(termios->c_cflag & PARODD))
+                        lcr_h |= UART01x_LCRH_EPS;
+        }
+        if (port->fifosize > 1)
+                lcr_h |= UART01x_LCRH_FEN;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        port->read_status_mask = UART01x_RSR_OE;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= UART01x_RSR_BE;
+
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= UART01x_RSR_BE;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= UART01x_RSR_OE;
+        }
+
+        /*
+         * Ignore all characters if CREAD is not set.
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= UART_DUMMY_RSR_RX;
+
+        /* first, disable everything */
+        old_cr = UART_GET_CR(port) & ~UART010_CR_MSIE;
+
+        if (UART_ENABLE_MS(port, termios->c_cflag))
+                old_cr |= UART010_CR_MSIE;
+
+        UART_PUT_CR(port, 0);
+
+        /* Set baud rate */
+        quot -= 1;
+        UART_PUT_LCRM(port, ((quot & 0xf00) >> 8));
+        UART_PUT_LCRL(port, (quot & 0xff));
+
+        /*
+         * ----------v----------v----------v----------v-----
+         * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
+         * ----------^----------^----------^----------^-----
+         */
+        UART_PUT_LCRH(port, lcr_h);
+        UART_PUT_CR(port, old_cr);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *pl010_type(struct uart_port *port)
+{
+        return port->type == PORT_AMBA ? "AMBA" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'
+ */
+static void pl010_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, UART_PORT_SIZE);
+}
+
+/*
+ * Request the memory region(s) being used by 'port'
+ */
+static int pl010_request_port(struct uart_port *port)
+{
+        return request_mem_region(port->mapbase, UART_PORT_SIZE, "uart-pl010")
+                        != NULL ? 0 : -EBUSY;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void pl010_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = PORT_AMBA;
+                pl010_request_port(port);
+        }
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int pl010_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        int ret = 0;
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_AMBA)
+                ret = -EINVAL;
+        if (ser->irq < 0 || ser->irq >= NR_IRQS)
+                ret = -EINVAL;
+        if (ser->baud_base < 9600)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops amba_pl010_pops = {
+        .tx_empty       = pl010_tx_empty,
+        .set_mctrl      = pl010_set_mctrl,
+        .get_mctrl      = pl010_get_mctrl,
+        .stop_tx        = pl010_stop_tx,
+        .start_tx       = pl010_start_tx,
+        .stop_rx        = pl010_stop_rx,
+        .enable_ms      = pl010_enable_ms,
+        .break_ctl      = pl010_break_ctl,
+        .startup        = pl010_startup,
+        .shutdown       = pl010_shutdown,
+        .set_termios    = pl010_set_termios,
+        .type           = pl010_type,
+        .release_port   = pl010_release_port,
+        .request_port   = pl010_request_port,
+        .config_port    = pl010_config_port,
+        .verify_port    = pl010_verify_port,
+};
+
+static struct uart_amba_port amba_ports[UART_NR] = {
+        {
+                .port   = {
+                        .membase        = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE),
+                        .mapbase        = INTEGRATOR_UART0_BASE,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = IRQ_UARTINT0,
+                        .uartclk        = 14745600,
+                        .fifosize       = 16,
+                        .ops            = &amba_pl010_pops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .dtr_mask       = 1 << 5,
+                .rts_mask       = 1 << 4,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE),
+                        .mapbase        = INTEGRATOR_UART1_BASE,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = IRQ_UARTINT1,
+                        .uartclk        = 14745600,
+                        .fifosize       = 16,
+                        .ops            = &amba_pl010_pops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .dtr_mask       = 1 << 7,
+                .rts_mask       = 1 << 6,
+        }
+};
+
+#ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
+
+static void
+pl010_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_port *port = &amba_ports[co->index].port;
+        unsigned int status, old_cr;
+        int i;
+
+        /*
+         *      First save the CR then disable the interrupts
+         */
+        old_cr = UART_GET_CR(port);
+        UART_PUT_CR(port, UART01x_CR_UARTEN);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++) {
+                do {
+                        status = UART_GET_FR(port);
+                } while (!UART_TX_READY(status));
+                UART_PUT_CHAR(port, s[i]);
+                if (s[i] == '\n') {
+                        do {
+                                status = UART_GET_FR(port);
+                        } while (!UART_TX_READY(status));
+                        UART_PUT_CHAR(port, '\r');
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the TCR
+         */
+        do {
+                status = UART_GET_FR(port);
+        } while (status & UART01x_FR_BUSY);
+        UART_PUT_CR(port, old_cr);
+}
+
+static void __init
+pl010_console_get_options(struct uart_port *port, int *baud,
+                             int *parity, int *bits)
+{
+        if (UART_GET_CR(port) & UART01x_CR_UARTEN) {
+                unsigned int lcr_h, quot;
+                lcr_h = UART_GET_LCRH(port);
+
+                *parity = 'n';
+                if (lcr_h & UART01x_LCRH_PEN) {
+                        if (lcr_h & UART01x_LCRH_EPS)
+                                *parity = 'e';
+                        else
+                                *parity = 'o';
+                }
+
+                if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7)
+                        *bits = 7;
+                else
+                        *bits = 8;
+
+                quot = UART_GET_LCRL(port) | UART_GET_LCRM(port) << 8;
+                *baud = port->uartclk / (16 * (quot + 1));
+        }
+}
+
+static int __init pl010_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        port = &amba_ports[co->index].port;
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                pl010_console_get_options(port, &baud, &parity, &bits);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver amba_reg;
+static struct console amba_console = {
+        .name           = "ttyAM",
+        .write          = pl010_console_write,
+        .device         = uart_console_device,
+        .setup          = pl010_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &amba_reg,
+};
+
+static int __init amba_console_init(void)
+{
+        /*
+         * All port initializations are done statically
+         */
+        register_console(&amba_console);
+        return 0;
+}
+console_initcall(amba_console_init);
+
+static int __init amba_late_console_init(void)
+{
+        if (!(amba_console.flags & CON_ENABLED))
+                register_console(&amba_console);
+        return 0;
+}
+late_initcall(amba_late_console_init);
+
+#define AMBA_CONSOLE    &amba_console
+#else
+#define AMBA_CONSOLE    NULL
+#endif
+
+static struct uart_driver amba_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "ttyAM",
+        .dev_name               = "ttyAM",
+        .major                  = SERIAL_AMBA_MAJOR,
+        .minor                  = SERIAL_AMBA_MINOR,
+        .nr                     = UART_NR,
+        .cons                   = AMBA_CONSOLE,
+};
+
+static int pl010_probe(struct amba_device *dev, void *id)
+{
+        int i;
+
+        for (i = 0; i < UART_NR; i++) {
+                if (amba_ports[i].port.mapbase != dev->res.start)
+                        continue;
+
+                amba_ports[i].port.dev = &dev->dev;
+                uart_add_one_port(&amba_reg, &amba_ports[i].port);
+                amba_set_drvdata(dev, &amba_ports[i]);
+                break;
+        }
+
+        return 0;
+}
+
+static int pl010_remove(struct amba_device *dev)
+{
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
+
+        if (uap)
+                uart_remove_one_port(&amba_reg, &uap->port);
+
+        amba_set_drvdata(dev, NULL);
+
+        return 0;
+}
+
+static int pl010_suspend(struct amba_device *dev, u32 state)
+{
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
+
+        if (uap)
+                uart_suspend_port(&amba_reg, &uap->port);
+
+        return 0;
+}
+
+static int pl010_resume(struct amba_device *dev)
+{
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
+
+        if (uap)
+                uart_resume_port(&amba_reg, &uap->port);
+
+        return 0;
+}
+
+static struct amba_id pl010_ids[] __initdata = {
+        {
+                .id     = 0x00041010,
+                .mask   = 0x000fffff,
+        },
+        { 0, 0 },
+};
+
+static struct amba_driver pl010_driver = {
+        .drv = {
+                .name   = "uart-pl010",
+        },
+        .id_table       = pl010_ids,
+        .probe          = pl010_probe,
+        .remove         = pl010_remove,
+        .suspend        = pl010_suspend,
+        .resume         = pl010_resume,
+};
+
+static int __init pl010_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Serial: AMBA driver $Revision: 1.41 $\n");
+
+        ret = uart_register_driver(&amba_reg);
+        if (ret == 0) {
+                ret = amba_driver_register(&pl010_driver);
+                if (ret)
+                        uart_unregister_driver(&amba_reg);
+        }
+        return ret;
+}
+
+static void __exit pl010_exit(void)
+{
+        amba_driver_unregister(&pl010_driver);
+        uart_unregister_driver(&amba_reg);
+}
+
+module_init(pl010_init);
+module_exit(pl010_exit);
+
+MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd");
+MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.41 $");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
new file mode 100644
index 000000000000..ff658a830f34
--- /dev/null
+++ b/drivers/serial/amba-pl011.c
@@ -0,0 +1,869 @@
+/*
+ *  linux/drivers/char/amba.c
+ *
+ *  Driver for AMBA serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright 1999 ARM Limited
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: amba.c,v 1.41 2002/07/28 10:03:27 rmk Exp $
+ *
+ * This is a generic driver for ARM AMBA-type serial ports.  They
+ * have a lot of 16550-like features, but are not register compatible.
+ * Note that although they do have CTS, DCD and DSR inputs, they do
+ * not have an RI input, nor do they have DTR or RTS outputs.  If
+ * required, these have to be supplied via some other means (eg, GPIO)
+ * and hooked into this driver.
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/hardware/amba.h>
+#include <asm/hardware/clock.h>
+#include <asm/hardware/amba_serial.h>
+
+#define UART_NR                 14
+
+#define SERIAL_AMBA_MAJOR       204
+#define SERIAL_AMBA_MINOR       64
+#define SERIAL_AMBA_NR          UART_NR
+
+#define AMBA_ISR_PASS_LIMIT     256
+
+#define UART_DUMMY_RSR_RX       256
+
+/*
+ * We wrap our port structure around the generic uart_port.
+ */
+struct uart_amba_port {
+        struct uart_port        port;
+        struct clk              *clk;
+        unsigned int            im;     /* interrupt mask */
+        unsigned int            old_status;
+};
+
+static void pl011_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+
+        uap->im &= ~UART011_TXIM;
+        writew(uap->im, uap->port.membase + UART011_IMSC);
+}
+
+static void pl011_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+
+        uap->im |= UART011_TXIM;
+        writew(uap->im, uap->port.membase + UART011_IMSC);
+}
+
+static void pl011_stop_rx(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+
+        uap->im &= ~(UART011_RXIM|UART011_RTIM|UART011_FEIM|
+                     UART011_PEIM|UART011_BEIM|UART011_OEIM);
+        writew(uap->im, uap->port.membase + UART011_IMSC);
+}
+
+static void pl011_enable_ms(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+
+        uap->im |= UART011_RIMIM|UART011_CTSMIM|UART011_DCDMIM|UART011_DSRMIM;
+        writew(uap->im, uap->port.membase + UART011_IMSC);
+}
+
+static void
+#ifdef SUPPORT_SYSRQ
+pl011_rx_chars(struct uart_amba_port *uap, struct pt_regs *regs)
+#else
+pl011_rx_chars(struct uart_amba_port *uap)
+#endif
+{
+        struct tty_struct *tty = uap->port.info->tty;
+        unsigned int status, ch, flag, rsr, max_count = 256;
+
+        status = readw(uap->port.membase + UART01x_FR);
+        while ((status & UART01x_FR_RXFE) == 0 && max_count--) {
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /*
+                         * If this failed then we will throw away the
+                         * bytes but must do so to clear interrupts
+                         */
+                }
+
+                ch = readw(uap->port.membase + UART01x_DR);
+                flag = TTY_NORMAL;
+                uap->port.icount.rx++;
+
+                /*
+                 * Note that the error handling code is
+                 * out of the main execution path
+                 */
+                rsr = readw(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
+                if (rsr & UART01x_RSR_ANY) {
+                        if (rsr & UART01x_RSR_BE) {
+                                rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
+                                uap->port.icount.brk++;
+                                if (uart_handle_break(&uap->port))
+                                        goto ignore_char;
+                        } else if (rsr & UART01x_RSR_PE)
+                                uap->port.icount.parity++;
+                        else if (rsr & UART01x_RSR_FE)
+                                uap->port.icount.frame++;
+                        if (rsr & UART01x_RSR_OE)
+                                uap->port.icount.overrun++;
+
+                        rsr &= uap->port.read_status_mask;
+
+                        if (rsr & UART01x_RSR_BE)
+                                flag = TTY_BREAK;
+                        else if (rsr & UART01x_RSR_PE)
+                                flag = TTY_PARITY;
+                        else if (rsr & UART01x_RSR_FE)
+                                flag = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char(&uap->port, ch, regs))
+                        goto ignore_char;
+
+                if ((rsr & uap->port.ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+                if ((rsr & UART01x_RSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+        ignore_char:
+                status = readw(uap->port.membase + UART01x_FR);
+        }
+        tty_flip_buffer_push(tty);
+        return;
+}
+
+static void pl011_tx_chars(struct uart_amba_port *uap)
+{
+        struct circ_buf *xmit = &uap->port.info->xmit;
+        int count;
+
+        if (uap->port.x_char) {
+                writew(uap->port.x_char, uap->port.membase + UART01x_DR);
+                uap->port.icount.tx++;
+                uap->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&uap->port)) {
+                pl011_stop_tx(&uap->port, 0);
+                return;
+        }
+
+        count = uap->port.fifosize >> 1;
+        do {
+                writew(xmit->buf[xmit->tail], uap->port.membase + UART01x_DR);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                uap->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&uap->port);
+
+        if (uart_circ_empty(xmit))
+                pl011_stop_tx(&uap->port, 0);
+}
+
+static void pl011_modem_status(struct uart_amba_port *uap)
+{
+        unsigned int status, delta;
+
+        status = readw(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
+
+        delta = status ^ uap->old_status;
+        uap->old_status = status;
+
+        if (!delta)
+                return;
+
+        if (delta & UART01x_FR_DCD)
+                uart_handle_dcd_change(&uap->port, status & UART01x_FR_DCD);
+
+        if (delta & UART01x_FR_DSR)
+                uap->port.icount.dsr++;
+
+        if (delta & UART01x_FR_CTS)
+                uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
+
+        wake_up_interruptible(&uap->port.info->delta_msr_wait);
+}
+
+static irqreturn_t pl011_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_amba_port *uap = dev_id;
+        unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;
+        int handled = 0;
+
+        spin_lock(&uap->port.lock);
+
+        status = readw(uap->port.membase + UART011_MIS);
+        if (status) {
+                do {
+                        writew(status & ~(UART011_TXIS|UART011_RTIS|
+                                          UART011_RXIS),
+                               uap->port.membase + UART011_ICR);
+
+                        if (status & (UART011_RTIS|UART011_RXIS))
+#ifdef SUPPORT_SYSRQ
+                                pl011_rx_chars(uap, regs);
+#else
+                                pl011_rx_chars(uap);
+#endif
+                        if (status & (UART011_DSRMIS|UART011_DCDMIS|
+                                      UART011_CTSMIS|UART011_RIMIS))
+                                pl011_modem_status(uap);
+                        if (status & UART011_TXIS)
+                                pl011_tx_chars(uap);
+
+                        if (pass_counter-- == 0)
+                                break;
+
+                        status = readw(uap->port.membase + UART011_MIS);
+                } while (status != 0);
+                handled = 1;
+        }
+
+        spin_unlock(&uap->port.lock);
+
+        return IRQ_RETVAL(handled);
+}
+
+static unsigned int pl01x_tx_empty(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int status = readw(uap->port.membase + UART01x_FR);
+        return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ? 0 : TIOCSER_TEMT;
+}
+
+static unsigned int pl01x_get_mctrl(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int result = 0;
+        unsigned int status = readw(uap->port.membase + UART01x_FR);
+
+#define BIT(uartbit, tiocmbit)          \
+        if (status & uartbit)           \
+                result |= tiocmbit
+
+        BIT(UART01x_FR_DCD, TIOCM_CAR);
+        BIT(UART01x_FR_DSR, TIOCM_DSR);
+        BIT(UART01x_FR_CTS, TIOCM_CTS);
+        BIT(UART011_FR_RI, TIOCM_RNG);
+#undef BIT
+        return result;
+}
+
+static void pl011_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int cr;
+
+        cr = readw(uap->port.membase + UART011_CR);
+
+#define BIT(tiocmbit, uartbit)          \
+        if (mctrl & tiocmbit)           \
+                cr |= uartbit;          \
+        else                            \
+                cr &= ~uartbit
+
+        BIT(TIOCM_RTS, UART011_CR_RTS);
+        BIT(TIOCM_DTR, UART011_CR_DTR);
+        BIT(TIOCM_OUT1, UART011_CR_OUT1);
+        BIT(TIOCM_OUT2, UART011_CR_OUT2);
+        BIT(TIOCM_LOOP, UART011_CR_LBE);
+#undef BIT
+
+        writew(cr, uap->port.membase + UART011_CR);
+}
+
+static void pl011_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned long flags;
+        unsigned int lcr_h;
+
+        spin_lock_irqsave(&uap->port.lock, flags);
+        lcr_h = readw(uap->port.membase + UART011_LCRH);
+        if (break_state == -1)
+                lcr_h |= UART01x_LCRH_BRK;
+        else
+                lcr_h &= ~UART01x_LCRH_BRK;
+        writew(lcr_h, uap->port.membase + UART011_LCRH);
+        spin_unlock_irqrestore(&uap->port.lock, flags);
+}
+
+static int pl011_startup(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int cr;
+        int retval;
+
+        /*
+         * Try to enable the clock producer.
+         */
+        retval = clk_enable(uap->clk);
+        if (retval)
+                goto out;
+
+        uap->port.uartclk = clk_get_rate(uap->clk);
+
+        /*
+         * Allocate the IRQ
+         */
+        retval = request_irq(uap->port.irq, pl011_int, 0, "uart-pl011", uap);
+        if (retval)
+                goto clk_dis;
+
+        writew(UART011_IFLS_RX4_8|UART011_IFLS_TX4_8,
+               uap->port.membase + UART011_IFLS);
+
+        /*
+         * Provoke TX FIFO interrupt into asserting.
+         */
+        cr = UART01x_CR_UARTEN | UART011_CR_TXE | UART011_CR_LBE;
+        writew(cr, uap->port.membase + UART011_CR);
+        writew(0, uap->port.membase + UART011_FBRD);
+        writew(1, uap->port.membase + UART011_IBRD);
+        writew(0, uap->port.membase + UART011_LCRH);
+        writew(0, uap->port.membase + UART01x_DR);
+        while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
+                barrier();
+
+        cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
+        writew(cr, uap->port.membase + UART011_CR);
+
+        /*
+         * initialise the old status of the modem signals
+         */
+        uap->old_status = readw(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
+
+        /*
+         * Finally, enable interrupts
+         */
+        spin_lock_irq(&uap->port.lock);
+        uap->im = UART011_RXIM | UART011_RTIM;
+        writew(uap->im, uap->port.membase + UART011_IMSC);
+        spin_unlock_irq(&uap->port.lock);
+
+        return 0;
+
+ clk_dis:
+        clk_disable(uap->clk);
+ out:
+        return retval;
+}
+
+static void pl011_shutdown(struct uart_port *port)
+{
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned long val;
+
+        /*
+         * disable all interrupts
+         */
+        spin_lock_irq(&uap->port.lock);
+        uap->im = 0;
+        writew(uap->im, uap->port.membase + UART011_IMSC);
+        writew(0xffff, uap->port.membase + UART011_ICR);
+        spin_unlock_irq(&uap->port.lock);
+
+        /*
+         * Free the interrupt
+         */
+        free_irq(uap->port.irq, uap);
+
+        /*
+         * disable the port
+         */
+        writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
+
+        /*
+         * disable break condition and fifos
+         */
+        val = readw(uap->port.membase + UART011_LCRH);
+        val &= ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN);
+        writew(val, uap->port.membase + UART011_LCRH);
+
+        /*
+         * Shut down the clock producer
+         */
+        clk_disable(uap->clk);
+}
+
+static void
+pl011_set_termios(struct uart_port *port, struct termios *termios,
+                     struct termios *old)
+{
+        unsigned int lcr_h, old_cr;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        quot = port->uartclk * 4 / baud;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                lcr_h = UART01x_LCRH_WLEN_5;
+                break;
+        case CS6:
+                lcr_h = UART01x_LCRH_WLEN_6;
+                break;
+        case CS7:
+                lcr_h = UART01x_LCRH_WLEN_7;
+                break;
+        default: // CS8
+                lcr_h = UART01x_LCRH_WLEN_8;
+                break;
+        }
+        if (termios->c_cflag & CSTOPB)
+                lcr_h |= UART01x_LCRH_STP2;
+        if (termios->c_cflag & PARENB) {
+                lcr_h |= UART01x_LCRH_PEN;
+                if (!(termios->c_cflag & PARODD))
+                        lcr_h |= UART01x_LCRH_EPS;
+        }
+        if (port->fifosize > 1)
+                lcr_h |= UART01x_LCRH_FEN;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        port->read_status_mask = UART01x_RSR_OE;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= UART01x_RSR_BE;
+
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= UART01x_RSR_BE;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= UART01x_RSR_OE;
+        }
+
+        /*
+         * Ignore all characters if CREAD is not set.
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= UART_DUMMY_RSR_RX;
+
+        if (UART_ENABLE_MS(port, termios->c_cflag))
+                pl011_enable_ms(port);
+
+        /* first, disable everything */
+        old_cr = readw(port->membase + UART011_CR);
+        writew(0, port->membase + UART011_CR);
+
+        /* Set baud rate */
+        writew(quot & 0x3f, port->membase + UART011_FBRD);
+        writew(quot >> 6, port->membase + UART011_IBRD);
+
+        /*
+         * ----------v----------v----------v----------v-----
+         * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
+         * ----------^----------^----------^----------^-----
+         */
+        writew(lcr_h, port->membase + UART011_LCRH);
+        writew(old_cr, port->membase + UART011_CR);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *pl011_type(struct uart_port *port)
+{
+        return port->type == PORT_AMBA ? "AMBA/PL011" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'
+ */
+static void pl010_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, SZ_4K);
+}
+
+/*
+ * Request the memory region(s) being used by 'port'
+ */
+static int pl010_request_port(struct uart_port *port)
+{
+        return request_mem_region(port->mapbase, SZ_4K, "uart-pl011")
+                        != NULL ? 0 : -EBUSY;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void pl010_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = PORT_AMBA;
+                pl010_request_port(port);
+        }
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int pl010_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        int ret = 0;
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_AMBA)
+                ret = -EINVAL;
+        if (ser->irq < 0 || ser->irq >= NR_IRQS)
+                ret = -EINVAL;
+        if (ser->baud_base < 9600)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops amba_pl011_pops = {
+        .tx_empty       = pl01x_tx_empty,
+        .set_mctrl      = pl011_set_mctrl,
+        .get_mctrl      = pl01x_get_mctrl,
+        .stop_tx        = pl011_stop_tx,
+        .start_tx       = pl011_start_tx,
+        .stop_rx        = pl011_stop_rx,
+        .enable_ms      = pl011_enable_ms,
+        .break_ctl      = pl011_break_ctl,
+        .startup        = pl011_startup,
+        .shutdown       = pl011_shutdown,
+        .set_termios    = pl011_set_termios,
+        .type           = pl011_type,
+        .release_port   = pl010_release_port,
+        .request_port   = pl010_request_port,
+        .config_port    = pl010_config_port,
+        .verify_port    = pl010_verify_port,
+};
+
+static struct uart_amba_port *amba_ports[UART_NR];
+
+#ifdef CONFIG_SERIAL_AMBA_PL011_CONSOLE
+
+static inline void
+pl011_console_write_char(struct uart_amba_port *uap, char ch)
+{
+        unsigned int status;
+
+        do {
+                status = readw(uap->port.membase + UART01x_FR);
+        } while (status & UART01x_FR_TXFF);
+        writew(ch, uap->port.membase + UART01x_DR);
+}
+
+static void
+pl011_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_amba_port *uap = amba_ports[co->index];
+        unsigned int status, old_cr, new_cr;
+        int i;
+
+        clk_enable(uap->clk);
+
+        /*
+         *      First save the CR then disable the interrupts
+         */
+        old_cr = readw(uap->port.membase + UART011_CR);
+        new_cr = old_cr & ~UART011_CR_CTSEN;
+        new_cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
+        writew(new_cr, uap->port.membase + UART011_CR);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++) {
+                pl011_console_write_char(uap, s[i]);
+                if (s[i] == '\n')
+                        pl011_console_write_char(uap, '\r');
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the TCR
+         */
+        do {
+                status = readw(uap->port.membase + UART01x_FR);
+        } while (status & UART01x_FR_BUSY);
+        writew(old_cr, uap->port.membase + UART011_CR);
+
+        clk_disable(uap->clk);
+}
+
+static void __init
+pl011_console_get_options(struct uart_amba_port *uap, int *baud,
+                             int *parity, int *bits)
+{
+        if (readw(uap->port.membase + UART011_CR) & UART01x_CR_UARTEN) {
+                unsigned int lcr_h, ibrd, fbrd;
+
+                lcr_h = readw(uap->port.membase + UART011_LCRH);
+
+                *parity = 'n';
+                if (lcr_h & UART01x_LCRH_PEN) {
+                        if (lcr_h & UART01x_LCRH_EPS)
+                                *parity = 'e';
+                        else
+                                *parity = 'o';
+                }
+
+                if ((lcr_h & 0x60) == UART01x_LCRH_WLEN_7)
+                        *bits = 7;
+                else
+                        *bits = 8;
+
+                ibrd = readw(uap->port.membase + UART011_IBRD);
+                fbrd = readw(uap->port.membase + UART011_FBRD);
+
+                *baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
+        }
+}
+
+static int __init pl011_console_setup(struct console *co, char *options)
+{
+        struct uart_amba_port *uap;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        uap = amba_ports[co->index];
+
+        uap->port.uartclk = clk_get_rate(uap->clk);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                pl011_console_get_options(uap, &baud, &parity, &bits);
+
+        return uart_set_options(&uap->port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver amba_reg;
+static struct console amba_console = {
+        .name           = "ttyAMA",
+        .write          = pl011_console_write,
+        .device         = uart_console_device,
+        .setup          = pl011_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &amba_reg,
+};
+
+#define AMBA_CONSOLE    (&amba_console)
+#else
+#define AMBA_CONSOLE    NULL
+#endif
+
+static struct uart_driver amba_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "ttyAMA",
+        .dev_name               = "ttyAMA",
+        .major                  = SERIAL_AMBA_MAJOR,
+        .minor                  = SERIAL_AMBA_MINOR,
+        .nr                     = UART_NR,
+        .cons                   = AMBA_CONSOLE,
+};
+
+static int pl011_probe(struct amba_device *dev, void *id)
+{
+        struct uart_amba_port *uap;
+        void __iomem *base;
+        int i, ret;
+
+        for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
+                if (amba_ports[i] == NULL)
+                        break;
+
+        if (i == ARRAY_SIZE(amba_ports)) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        uap = kmalloc(sizeof(struct uart_amba_port), GFP_KERNEL);
+        if (uap == NULL) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        base = ioremap(dev->res.start, PAGE_SIZE);
+        if (!base) {
+                ret = -ENOMEM;
+                goto free;
+        }
+
+        memset(uap, 0, sizeof(struct uart_amba_port));
+        uap->clk = clk_get(&dev->dev, "UARTCLK");
+        if (IS_ERR(uap->clk)) {
+                ret = PTR_ERR(uap->clk);
+                goto unmap;
+        }
+
+        ret = clk_use(uap->clk);
+        if (ret)
+                goto putclk;
+
+        uap->port.dev = &dev->dev;
+        uap->port.mapbase = dev->res.start;
+        uap->port.membase = base;
+        uap->port.iotype = UPIO_MEM;
+        uap->port.irq = dev->irq[0];
+        uap->port.fifosize = 16;
+        uap->port.ops = &amba_pl011_pops;
+        uap->port.flags = UPF_BOOT_AUTOCONF;
+        uap->port.line = i;
+
+        amba_ports[i] = uap;
+
+        amba_set_drvdata(dev, uap);
+        ret = uart_add_one_port(&amba_reg, &uap->port);
+        if (ret) {
+                amba_set_drvdata(dev, NULL);
+                amba_ports[i] = NULL;
+                clk_unuse(uap->clk);
+ putclk:
+                clk_put(uap->clk);
+ unmap:
+                iounmap(base);
+ free:
+                kfree(uap);
+        }
+ out:
+        return ret;
+}
+
+static int pl011_remove(struct amba_device *dev)
+{
+        struct uart_amba_port *uap = amba_get_drvdata(dev);
+        int i;
+
+        amba_set_drvdata(dev, NULL);
+
+        uart_remove_one_port(&amba_reg, &uap->port);
+
+        for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
+                if (amba_ports[i] == uap)
+                        amba_ports[i] = NULL;
+
+        iounmap(uap->port.membase);
+        clk_unuse(uap->clk);
+        clk_put(uap->clk);
+        kfree(uap);
+        return 0;
+}
+
+static struct amba_id pl011_ids[] __initdata = {
+        {
+                .id     = 0x00041011,
+                .mask   = 0x000fffff,
+        },
+        { 0, 0 },
+};
+
+static struct amba_driver pl011_driver = {
+        .drv = {
+                .name   = "uart-pl011",
+        },
+        .id_table       = pl011_ids,
+        .probe          = pl011_probe,
+        .remove         = pl011_remove,
+};
+
+static int __init pl011_init(void)
+{
+        int ret;
+        printk(KERN_INFO "Serial: AMBA PL011 UART driver\n");
+
+        ret = uart_register_driver(&amba_reg);
+        if (ret == 0) {
+                ret = amba_driver_register(&pl011_driver);
+                if (ret)
+                        uart_unregister_driver(&amba_reg);
+        }
+        return ret;
+}
+
+static void __exit pl011_exit(void)
+{
+        amba_driver_unregister(&pl011_driver);
+        uart_unregister_driver(&amba_reg);
+}
+
+module_init(pl011_init);
+module_exit(pl011_exit);
+
+MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd");
+MODULE_DESCRIPTION("ARM AMBA serial port driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
new file mode 100644
index 000000000000..b6d3d5034940
--- /dev/null
+++ b/drivers/serial/au1x00_uart.c
@@ -0,0 +1,1312 @@
+/*
+ *  Driver for 8250/16550-type serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright (C) 2001 Russell King.
+ *
+ * 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.
+ *
+ * A note about mapbase / membase
+ *
+ *  mapbase is the physical address of the IO port.  Currently, we don't
+ *  support this very well, and it may well be dropped from this driver
+ *  in future.  As such, mapbase should be NULL.
+ *
+ *  membase is an 'ioremapped' cookie.  This is compatible with the old
+ *  serial.c driver, and is currently the preferred form.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/serial.h>
+#include <linux/serialP.h>
+#include <linux/delay.h>
+
+#include <asm/serial.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-au1x00/au1000.h>
+
+#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+#include "8250.h"
+
+/*
+ * Debugging.
+ */
+#if 0
+#define DEBUG_AUTOCONF(fmt...)  printk(fmt)
+#else
+#define DEBUG_AUTOCONF(fmt...)  do { } while (0)
+#endif
+
+#if 0
+#define DEBUG_INTR(fmt...)      printk(fmt)
+#else
+#define DEBUG_INTR(fmt...)      do { } while (0)
+#endif
+
+#define PASS_LIMIT      256
+
+/*
+ * We default to IRQ0 for the "no irq" hack.   Some
+ * machine types want others as well - they're free
+ * to redefine this in their header file.
+ */
+#define is_real_interrupt(irq)  ((irq) != 0)
+
+static struct old_serial_port old_serial_port[] = {
+        {       .baud_base = 0,
+                .iomem_base = (u8 *)UART0_ADDR,
+                .irq = AU1000_UART0_INT,
+                .flags = STD_COM_FLAGS,
+                .iomem_reg_shift = 2,
+        }, {
+                .baud_base = 0,
+                .iomem_base = (u8 *)UART1_ADDR,
+                .irq = AU1000_UART1_INT,
+                .flags = STD_COM_FLAGS,
+                .iomem_reg_shift = 2
+        }, {
+                .baud_base = 0,
+                .iomem_base = (u8 *)UART2_ADDR,
+                .irq = AU1000_UART2_INT,
+                .flags = STD_COM_FLAGS,
+                .iomem_reg_shift = 2
+        }, {
+                .baud_base = 0,
+                .iomem_base = (u8 *)UART3_ADDR,
+                .irq = AU1000_UART3_INT,
+                .flags = STD_COM_FLAGS,
+                .iomem_reg_shift = 2
+        }
+};
+
+#define UART_NR ARRAY_SIZE(old_serial_port)
+
+struct uart_8250_port {
+        struct uart_port        port;
+        struct timer_list       timer;          /* "no irq" timer */
+        struct list_head        list;           /* ports on this IRQ */
+        unsigned short          rev;
+        unsigned char           acr;
+        unsigned char           ier;
+        unsigned char           lcr;
+        unsigned char           mcr_mask;       /* mask of user bits */
+        unsigned char           mcr_force;      /* mask of forced bits */
+        unsigned char           lsr_break_flag;
+
+        /*
+         * We provide a per-port pm hook.
+         */
+        void                    (*pm)(struct uart_port *port,
+                                      unsigned int state, unsigned int old);
+};
+
+struct irq_info {
+        spinlock_t              lock;
+        struct list_head        *head;
+};
+
+static struct irq_info irq_lists[NR_IRQS];
+
+/*
+ * Here we define the default xmit fifo size used for each type of UART.
+ */
+static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = {
+        { "unknown",    1,      0 },
+        { "8250",       1,      0 },
+        { "16450",      1,      0 },
+        { "16550",      1,      0 },
+        /* PORT_16550A */
+        { "AU1X00_UART",16,     UART_CLEAR_FIFO | UART_USE_FIFO },
+};
+
+static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
+{
+        return au_readl((unsigned long)up->port.membase + offset);
+}
+
+static _INLINE_ void
+serial_out(struct uart_8250_port *up, int offset, int value)
+{
+        au_writel(value, (unsigned long)up->port.membase + offset);
+}
+
+#define serial_inp(up, offset)          serial_in(up, offset)
+#define serial_outp(up, offset, value)  serial_out(up, offset, value)
+
+/*
+ * This routine is called by rs_init() to initialize a specific serial
+ * port.  It determines what type of UART chip this serial port is
+ * using: 8250, 16450, 16550, 16550A.  The important question is
+ * whether or not this UART is a 16550A or not, since this will
+ * determine whether or not we can use its FIFO features or not.
+ */
+static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
+{
+        unsigned char save_lcr, save_mcr;
+        unsigned long flags;
+
+        if (!up->port.iobase && !up->port.mapbase && !up->port.membase)
+                return;
+
+        DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%08lx): ",
+                        up->port.line, up->port.iobase, up->port.membase);
+
+        /*
+         * We really do need global IRQs disabled here - we're going to
+         * be frobbing the chips IRQ enable register to see if it exists.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+//      save_flags(flags); cli();
+
+        save_mcr = serial_in(up, UART_MCR);
+        save_lcr = serial_in(up, UART_LCR);
+
+        up->port.type = PORT_16550A;
+        serial_outp(up, UART_LCR, save_lcr);
+
+        up->port.fifosize = uart_config[up->port.type].dfl_xmit_fifo_size;
+
+        if (up->port.type == PORT_UNKNOWN)
+                goto out;
+
+        /*
+         * Reset the UART.
+         */
+        serial_outp(up, UART_MCR, save_mcr);
+        serial_outp(up, UART_FCR, (UART_FCR_ENABLE_FIFO |
+                                     UART_FCR_CLEAR_RCVR |
+                                     UART_FCR_CLEAR_XMIT));
+        serial_outp(up, UART_FCR, 0);
+        (void)serial_in(up, UART_RX);
+        serial_outp(up, UART_IER, 0);
+
+ out:   
+        spin_unlock_irqrestore(&up->port.lock, flags);
+//      restore_flags(flags);
+        DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
+}
+
+static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        if (up->ier & UART_IER_THRI) {
+                up->ier &= ~UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+}
+
+static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        if (!(up->ier & UART_IER_THRI)) {
+                up->ier |= UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+}
+
+static void serial8250_stop_rx(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        up->ier &= ~UART_IER_RLSI;
+        up->port.read_status_mask &= ~UART_LSR_DR;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static void serial8250_enable_ms(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        up->ier |= UART_IER_MSI;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static _INLINE_ void
+receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;
+        unsigned char ch;
+        int max_count = 256;
+
+        do {
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        tty->flip.work.func((void *)tty);
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                return; // if TTY_DONT_FLIP is set
+                }
+                ch = serial_inp(up, UART_RX);
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
+                                       UART_LSR_FE | UART_LSR_OE))) {
+                        /*
+                         * For statistics only
+                         */
+                        if (*status & UART_LSR_BI) {
+                                *status &= ~(UART_LSR_FE | UART_LSR_PE);
+                                up->port.icount.brk++;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        goto ignore_char;
+                        } else if (*status & UART_LSR_PE)
+                                up->port.icount.parity++;
+                        else if (*status & UART_LSR_FE)
+                                up->port.icount.frame++;
+                        if (*status & UART_LSR_OE)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ingored.
+                         */
+                        *status &= up->port.read_status_mask;
+
+#ifdef CONFIG_SERIAL_AU1X00_CONSOLE
+                        if (up->port.line == up->port.cons->index) {
+                                /* Recover the break flag from console xmit */
+                                *status |= up->lsr_break_flag;
+                                up->lsr_break_flag = 0;
+                        }
+#endif
+                        if (*status & UART_LSR_BI) {
+                                DEBUG_INTR("handling break....");
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        } else if (*status & UART_LSR_PE)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (*status & UART_LSR_FE)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto ignore_char;
+                if ((*status & up->port.ignore_status_mask) == 0) {
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((*status & UART_LSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        ignore_char:
+                *status = serial_inp(up, UART_LSR);
+        } while ((*status & UART_LSR_DR) && (max_count-- > 0));
+        spin_unlock(&up->port.lock);
+        tty_flip_buffer_push(tty);
+        spin_lock(&up->port.lock);
+}
+
+static _INLINE_ void transmit_chars(struct uart_8250_port *up)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int count;
+
+        if (up->port.x_char) {
+                serial_outp(up, UART_TX, up->port.x_char);
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                serial8250_stop_tx(&up->port, 0);
+                return;
+        }
+
+        count = up->port.fifosize;
+        do {
+                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        DEBUG_INTR("THRE...");
+
+        if (uart_circ_empty(xmit))
+                serial8250_stop_tx(&up->port, 0);
+}
+
+static _INLINE_ void check_modem_status(struct uart_8250_port *up)
+{
+        int status;
+
+        status = serial_in(up, UART_MSR);
+
+        if ((status & UART_MSR_ANY_DELTA) == 0)
+                return;
+
+        if (status & UART_MSR_TERI)
+                up->port.icount.rng++;
+        if (status & UART_MSR_DDSR)
+                up->port.icount.dsr++;
+        if (status & UART_MSR_DDCD)
+                uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
+        if (status & UART_MSR_DCTS)
+                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+
+        wake_up_interruptible(&up->port.info->delta_msr_wait);
+}
+
+/*
+ * This handles the interrupt from one port.
+ */
+static inline void
+serial8250_handle_port(struct uart_8250_port *up, struct pt_regs *regs)
+{
+        unsigned int status = serial_inp(up, UART_LSR);
+
+        DEBUG_INTR("status = %x...", status);
+
+        if (status & UART_LSR_DR)
+                receive_chars(up, &status, regs);
+        check_modem_status(up);
+        if (status & UART_LSR_THRE)
+                transmit_chars(up);
+}
+
+/*
+ * This is the serial driver's interrupt routine.
+ *
+ * Arjan thinks the old way was overly complex, so it got simplified.
+ * Alan disagrees, saying that need the complexity to handle the weird
+ * nature of ISA shared interrupts.  (This is a special exception.)
+ *
+ * In order to handle ISA shared interrupts properly, we need to check
+ * that all ports have been serviced, and therefore the ISA interrupt
+ * line has been de-asserted.
+ *
+ * This means we need to loop through all ports. checking that they
+ * don't have an interrupt pending.
+ */
+static irqreturn_t serial8250_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct irq_info *i = dev_id;
+        struct list_head *l, *end = NULL;
+        int pass_counter = 0;
+
+        DEBUG_INTR("serial8250_interrupt(%d)...", irq);
+
+        spin_lock(&i->lock);
+
+        l = i->head;
+        do {
+                struct uart_8250_port *up;
+                unsigned int iir;
+
+                up = list_entry(l, struct uart_8250_port, list);
+
+                iir = serial_in(up, UART_IIR);
+                if (!(iir & UART_IIR_NO_INT)) {
+                        spin_lock(&up->port.lock);
+                        serial8250_handle_port(up, regs);
+                        spin_unlock(&up->port.lock);
+
+                        end = NULL;
+                } else if (end == NULL)
+                        end = l;
+
+                l = l->next;
+
+                if (l == i->head && pass_counter++ > PASS_LIMIT) {
+                        /* If we hit this, we're dead. */
+                        printk(KERN_ERR "serial8250: too much work for "
+                                "irq%d\n", irq);
+                        break;
+                }
+        } while (l != end);
+
+        spin_unlock(&i->lock);
+
+        DEBUG_INTR("end.\n");
+        /* FIXME! Was it really ours? */
+        return IRQ_HANDLED;
+}
+
+/*
+ * To support ISA shared interrupts, we need to have one interrupt
+ * handler that ensures that the IRQ line has been deasserted
+ * before returning.  Failing to do this will result in the IRQ
+ * line being stuck active, and, since ISA irqs are edge triggered,
+ * no more IRQs will be seen.
+ */
+static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)
+{
+        spin_lock_irq(&i->lock);
+
+        if (!list_empty(i->head)) {
+                if (i->head == &up->list)
+                        i->head = i->head->next;
+                list_del(&up->list);
+        } else {
+                BUG_ON(i->head != &up->list);
+                i->head = NULL;
+        }
+
+        spin_unlock_irq(&i->lock);
+}
+
+static int serial_link_irq_chain(struct uart_8250_port *up)
+{
+        struct irq_info *i = irq_lists + up->port.irq;
+        int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0;
+
+        spin_lock_irq(&i->lock);
+
+        if (i->head) {
+                list_add(&up->list, i->head);
+                spin_unlock_irq(&i->lock);
+
+                ret = 0;
+        } else {
+                INIT_LIST_HEAD(&up->list);
+                i->head = &up->list;
+                spin_unlock_irq(&i->lock);
+
+                ret = request_irq(up->port.irq, serial8250_interrupt,
+                                  irq_flags, "serial", i);
+                if (ret < 0)
+                        serial_do_unlink(i, up);
+        }
+
+        return ret;
+}
+
+static void serial_unlink_irq_chain(struct uart_8250_port *up)
+{
+        struct irq_info *i = irq_lists + up->port.irq;
+
+        BUG_ON(i->head == NULL);
+
+        if (list_empty(i->head))
+                free_irq(up->port.irq, i);
+
+        serial_do_unlink(i, up);
+}
+
+/*
+ * This function is used to handle ports that do not have an
+ * interrupt.  This doesn't work very well for 16450's, but gives
+ * barely passable results for a 16550A.  (Although at the expense
+ * of much CPU overhead).
+ */
+static void serial8250_timeout(unsigned long data)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)data;
+        unsigned int timeout;
+        unsigned int iir;
+
+        iir = serial_in(up, UART_IIR);
+        if (!(iir & UART_IIR_NO_INT)) {
+                spin_lock(&up->port.lock);
+                serial8250_handle_port(up, NULL);
+                spin_unlock(&up->port.lock);
+        }
+
+        timeout = up->port.timeout;
+        timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
+        mod_timer(&up->timer, jiffies + timeout);
+}
+
+static unsigned int serial8250_tx_empty(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static unsigned int serial8250_get_mctrl(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+        unsigned char status;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        status = serial_in(up, UART_MSR);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        ret = 0;
+        if (status & UART_MSR_DCD)
+                ret |= TIOCM_CAR;
+        if (status & UART_MSR_RI)
+                ret |= TIOCM_RNG;
+        if (status & UART_MSR_DSR)
+                ret |= TIOCM_DSR;
+        if (status & UART_MSR_CTS)
+                ret |= TIOCM_CTS;
+        return ret;
+}
+
+static void serial8250_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned char mcr = 0;
+
+        if (mctrl & TIOCM_RTS)
+                mcr |= UART_MCR_RTS;
+        if (mctrl & TIOCM_DTR)
+                mcr |= UART_MCR_DTR;
+        if (mctrl & TIOCM_OUT1)
+                mcr |= UART_MCR_OUT1;
+        if (mctrl & TIOCM_OUT2)
+                mcr |= UART_MCR_OUT2;
+        if (mctrl & TIOCM_LOOP)
+                mcr |= UART_MCR_LOOP;
+
+        mcr = (mcr & up->mcr_mask) | up->mcr_force;
+
+        serial_out(up, UART_MCR, mcr);
+}
+
+static void serial8250_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (break_state == -1)
+                up->lcr |= UART_LCR_SBC;
+        else
+                up->lcr &= ~UART_LCR_SBC;
+        serial_out(up, UART_LCR, up->lcr);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int serial8250_startup(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+        int retval;
+
+        /*
+         * Clear the FIFO buffers and disable them.
+         * (they will be reeanbled in set_termios())
+         */
+        if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
+                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                                UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+                serial_outp(up, UART_FCR, 0);
+        }
+
+        /*
+         * Clear the interrupt registers.
+         */
+        (void) serial_inp(up, UART_LSR);
+        (void) serial_inp(up, UART_RX);
+        (void) serial_inp(up, UART_IIR);
+        (void) serial_inp(up, UART_MSR);
+
+        /*
+         * At this point, there's no way the LSR could still be 0xff;
+         * if it is, then bail out, because there's likely no UART
+         * here.
+         */
+        if (!(up->port.flags & UPF_BUGGY_UART) &&
+            (serial_inp(up, UART_LSR) == 0xff)) {
+                printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
+                return -ENODEV;
+        }
+
+        retval = serial_link_irq_chain(up);
+                if (retval)
+                        return retval;
+
+        /*
+         * Now, initialize the UART
+         */
+        serial_outp(up, UART_LCR, UART_LCR_WLEN8);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (up->port.flags & UPF_FOURPORT) {
+                if (!is_real_interrupt(up->port.irq))
+                        up->port.mctrl |= TIOCM_OUT1;
+        } else
+                /*
+                 * Most PC uarts need OUT2 raised to enable interrupts.
+                 */
+                if (is_real_interrupt(up->port.irq))
+                        up->port.mctrl |= TIOCM_OUT2;
+
+        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Finally, enable interrupts.  Note: Modem status interrupts
+         * are set via set_termios(), which will be occurring imminently
+         * anyway, so we don't enable them here.
+         */
+        up->ier = UART_IER_RLSI | UART_IER_RDI;
+        serial_outp(up, UART_IER, up->ier);
+
+        if (up->port.flags & UPF_FOURPORT) {
+                unsigned int icp;
+                /*
+                 * Enable interrupts on the AST Fourport board
+                 */
+                icp = (up->port.iobase & 0xfe0) | 0x01f;
+                outb_p(0x80, icp);
+                (void) inb_p(icp);
+        }
+
+        /*
+         * And clear the interrupt registers again for luck.
+         */
+        (void) serial_inp(up, UART_LSR);
+        (void) serial_inp(up, UART_RX);
+        (void) serial_inp(up, UART_IIR);
+        (void) serial_inp(up, UART_MSR);
+
+        return 0;
+}
+
+static void serial8250_shutdown(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long flags;
+
+        /*
+         * Disable interrupts from this port
+         */
+        up->ier = 0;
+        serial_outp(up, UART_IER, 0);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (up->port.flags & UPF_FOURPORT) {
+                /* reset interrupts on the AST Fourport board */
+                inb((up->port.iobase & 0xfe0) | 0x1f);
+                up->port.mctrl |= TIOCM_OUT1;
+        } else
+                up->port.mctrl &= ~TIOCM_OUT2;
+
+        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Disable break condition and FIFOs
+         */
+        serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC);
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                                  UART_FCR_CLEAR_RCVR |
+                                  UART_FCR_CLEAR_XMIT);
+        serial_outp(up, UART_FCR, 0);
+
+        /*
+         * Read data port to reset things, and then unlink from
+         * the IRQ chain.
+         */
+        (void) serial_in(up, UART_RX);
+
+        if (!is_real_interrupt(up->port.irq))
+                del_timer_sync(&up->timer);
+        else
+                serial_unlink_irq_chain(up);
+}
+
+static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud)
+{
+        unsigned int quot;
+
+        /*
+         * Handle magic divisors for baud rates above baud_base on
+         * SMSC SuperIO chips.
+         */
+        if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
+            baud == (port->uartclk/4))
+                quot = 0x8001;
+        else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
+                 baud == (port->uartclk/8))
+                quot = 0x8002;
+        else
+                quot = uart_get_divisor(port, baud);
+
+        return quot;
+}
+
+static void
+serial8250_set_termios(struct uart_port *port, struct termios *termios,
+                       struct termios *old)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned char cval, fcr = 0;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                cval = 0x00;
+                break;
+        case CS6:
+                cval = 0x01;
+                break;
+        case CS7:
+                cval = 0x02;
+                break;
+        default:
+        case CS8:
+                cval = 0x03;
+                break;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                cval |= 0x04;
+        if (termios->c_cflag & PARENB)
+                cval |= UART_LCR_PARITY;
+        if (!(termios->c_cflag & PARODD))
+                cval |= UART_LCR_EPAR;
+#ifdef CMSPAR
+        if (termios->c_cflag & CMSPAR)
+                cval |= UART_LCR_SPAR;
+#endif
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = serial8250_get_divisor(port, baud);
+        quot = 0x35; /* FIXME */
+
+        /*
+         * Work around a bug in the Oxford Semiconductor 952 rev B
+         * chip which causes it to seriously miscalculate baud rates
+         * when DLL is 0.
+         */
+        if ((quot & 0xff) == 0 && up->port.type == PORT_16C950 &&
+            up->rev == 0x5201)
+                quot ++;
+
+        if (uart_config[up->port.type].flags & UART_USE_FIFO) {
+                if (baud < 2400)
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIGGER_1;
+                else
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIGGER_8;
+        }
+
+        /*
+         * Ok, we're now changing the port state.  Do it with
+         * interrupts disabled.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
+        if (termios->c_iflag & INPCK)
+                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= UART_LSR_BI;
+
+        /*
+         * Characteres to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
+        if (termios->c_iflag & IGNBRK) {
+                up->port.ignore_status_mask |= UART_LSR_BI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        up->port.ignore_status_mask |= UART_LSR_OE;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= UART_LSR_DR;
+
+        /*
+         * CTS flow control flag and modem status interrupts
+         */
+        up->ier &= ~UART_IER_MSI;
+        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+                up->ier |= UART_IER_MSI;
+
+        serial_out(up, UART_IER, up->ier);
+        serial_outp(up, 0x28, quot & 0xffff);
+        up->lcr = cval;                                 /* Save LCR */
+        if (up->port.type != PORT_16750) {
+                if (fcr & UART_FCR_ENABLE_FIFO) {
+                        /* emulated UARTs (Lucent Venus 167x) need two steps */
+                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                }
+                serial_outp(up, UART_FCR, fcr);         /* set fcr */
+        }
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void
+serial8250_pm(struct uart_port *port, unsigned int state,
+              unsigned int oldstate)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        if (state) {
+                /* sleep */
+                if (up->pm)
+                        up->pm(port, state, oldstate);
+        } else {
+                /* wake */
+                if (up->pm)
+                        up->pm(port, state, oldstate);
+        }
+}
+
+/*
+ * Resource handling.  This is complicated by the fact that resources
+ * depend on the port type.  Maybe we should be claiming the standard
+ * 8250 ports, and then trying to get other resources as necessary?
+ */
+static int
+serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res)
+{
+        unsigned int size = 8 << up->port.regshift;
+        int ret = 0;
+
+        switch (up->port.iotype) {
+        case SERIAL_IO_MEM:
+                if (up->port.mapbase) {
+                        *res = request_mem_region(up->port.mapbase, size, "serial");
+                        if (!*res)
+                                ret = -EBUSY;
+                }
+                break;
+
+        case SERIAL_IO_HUB6:
+        case SERIAL_IO_PORT:
+                *res = request_region(up->port.iobase, size, "serial");
+                if (!*res)
+                        ret = -EBUSY;
+                break;
+        }
+        return ret;
+}
+
+
+static void serial8250_release_port(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        unsigned long start, offset = 0, size = 0;
+
+        size <<= up->port.regshift;
+
+        switch (up->port.iotype) {
+        case SERIAL_IO_MEM:
+                if (up->port.mapbase) {
+                        /*
+                         * Unmap the area.
+                         */
+                        iounmap(up->port.membase);
+                        up->port.membase = NULL;
+
+                        start = up->port.mapbase;
+
+                        if (size)
+                                release_mem_region(start + offset, size);
+                        release_mem_region(start, 8 << up->port.regshift);
+                }
+                break;
+
+        case SERIAL_IO_HUB6:
+        case SERIAL_IO_PORT:
+                start = up->port.iobase;
+
+                if (size)
+                        release_region(start + offset, size);
+                release_region(start + offset, 8 << up->port.regshift);
+                break;
+
+        default:
+                break;
+        }
+}
+
+static int serial8250_request_port(struct uart_port *port)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        struct resource *res = NULL, *res_rsa = NULL;
+        int ret = 0;
+
+        ret = serial8250_request_std_resource(up, &res);
+
+        /*
+         * If we have a mapbase, then request that as well.
+         */
+        if (ret == 0 && up->port.flags & UPF_IOREMAP) {
+                int size = res->end - res->start + 1;
+
+                up->port.membase = ioremap(up->port.mapbase, size);
+                if (!up->port.membase)
+                        ret = -ENOMEM;
+        }
+
+        if (ret < 0) {
+                if (res_rsa)
+                        release_resource(res_rsa);
+                if (res)
+                        release_resource(res);
+        }
+        return ret;
+}
+
+static void serial8250_config_port(struct uart_port *port, int flags)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+        struct resource *res_std = NULL, *res_rsa = NULL;
+        int probeflags = PROBE_ANY;
+
+        probeflags &= ~PROBE_RSA;
+
+        if (flags & UART_CONFIG_TYPE)
+                autoconfig(up, probeflags);
+
+        /*
+         * If the port wasn't an RSA port, release the resource.
+         */
+        if (up->port.type != PORT_RSA && res_rsa)
+                release_resource(res_rsa);
+
+        if (up->port.type == PORT_UNKNOWN && res_std)
+                release_resource(res_std);
+}
+
+static int
+serial8250_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        if (ser->irq >= NR_IRQS || ser->irq < 0 ||
+            ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
+            ser->type > PORT_MAX_8250 || ser->type == PORT_CIRRUS ||
+            ser->type == PORT_STARTECH)
+                return -EINVAL;
+        return 0;
+}
+
+static const char *
+serial8250_type(struct uart_port *port)
+{
+        int type = port->type;
+
+        if (type >= ARRAY_SIZE(uart_config))
+                type = 0;
+        return uart_config[type].name;
+}
+
+static struct uart_ops serial8250_pops = {
+        .tx_empty       = serial8250_tx_empty,
+        .set_mctrl      = serial8250_set_mctrl,
+        .get_mctrl      = serial8250_get_mctrl,
+        .stop_tx        = serial8250_stop_tx,
+        .start_tx       = serial8250_start_tx,
+        .stop_rx        = serial8250_stop_rx,
+        .enable_ms      = serial8250_enable_ms,
+        .break_ctl      = serial8250_break_ctl,
+        .startup        = serial8250_startup,
+        .shutdown       = serial8250_shutdown,
+        .set_termios    = serial8250_set_termios,
+        .pm             = serial8250_pm,
+        .type           = serial8250_type,
+        .release_port   = serial8250_release_port,
+        .request_port   = serial8250_request_port,
+        .config_port    = serial8250_config_port,
+        .verify_port    = serial8250_verify_port,
+};
+
+static struct uart_8250_port serial8250_ports[UART_NR];
+
+static void __init serial8250_isa_init_ports(void)
+{
+        struct uart_8250_port *up;
+        static int first = 1;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        for (i = 0, up = serial8250_ports; i < ARRAY_SIZE(old_serial_port);
+             i++, up++) {
+                up->port.iobase   = old_serial_port[i].port;
+                up->port.irq      = old_serial_port[i].irq;
+                up->port.uartclk  = get_au1x00_uart_baud_base();
+                up->port.flags    = old_serial_port[i].flags;
+                up->port.hub6     = old_serial_port[i].hub6;
+                up->port.membase  = old_serial_port[i].iomem_base;
+                up->port.iotype   = old_serial_port[i].io_type;
+                up->port.regshift = old_serial_port[i].iomem_reg_shift;
+                up->port.ops      = &serial8250_pops;
+        }
+}
+
+static void __init serial8250_register_ports(struct uart_driver *drv)
+{
+        int i;
+
+        serial8250_isa_init_ports();
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_8250_port *up = &serial8250_ports[i];
+
+                up->port.line = i;
+                up->port.ops = &serial8250_pops;
+                init_timer(&up->timer);
+                up->timer.function = serial8250_timeout;
+
+                /*
+                 * ALPHA_KLUDGE_MCR needs to be killed.
+                 */
+                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
+                up->mcr_force = ALPHA_KLUDGE_MCR;
+
+                uart_add_one_port(drv, &up->port);
+        }
+}
+
+#ifdef CONFIG_SERIAL_AU1X00_CONSOLE
+
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static inline void wait_for_xmitr(struct uart_8250_port *up)
+{
+        unsigned int status, tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        do {
+                status = serial_in(up, UART_LSR);
+
+                if (status & UART_LSR_BI)
+                        up->lsr_break_flag = UART_LSR_BI;
+
+                if (--tmout == 0)
+                        break;
+                udelay(1);
+        } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & UPF_CONS_FLOW) {
+                tmout = 1000000;
+                while (--tmout &&
+                       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
+                        udelay(1);
+        }
+}
+
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ */
+static void
+serial8250_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_8250_port *up = &serial8250_ports[co->index];
+        unsigned int ier;
+        int i;
+
+        /*
+         *      First save the UER then disable the interrupts
+         */
+        ier = serial_in(up, UART_IER);
+        serial_out(up, UART_IER, 0);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++, s++) {
+                wait_for_xmitr(up);
+
+                /*
+                 *      Send the character out.
+                 *      If a LF, also do CR...
+                 */
+                serial_out(up, UART_TX, *s);
+                if (*s == 10) {
+                        wait_for_xmitr(up);
+                        serial_out(up, UART_TX, 13);
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(up);
+        serial_out(up, UART_IER, ier);
+}
+
+static int __init serial8250_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        port = &serial8250_ports[co->index].port;
+
+        /*
+         * Temporary fix.
+         */
+        spin_lock_init(&port->lock);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver serial8250_reg;
+static struct console serial8250_console = {
+        .name           = "ttyS",
+        .write          = serial8250_console_write,
+        .device         = uart_console_device,
+        .setup          = serial8250_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &serial8250_reg,
+};
+
+static int __init serial8250_console_init(void)
+{
+        serial8250_isa_init_ports();
+        register_console(&serial8250_console);
+        return 0;
+}
+console_initcall(serial8250_console_init);
+
+#define SERIAL8250_CONSOLE      &serial8250_console
+#else
+#define SERIAL8250_CONSOLE      NULL
+#endif
+
+static struct uart_driver serial8250_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial",
+        .devfs_name             = "tts/",
+        .dev_name               = "ttyS",
+        .major                  = TTY_MAJOR,
+        .minor                  = 64,
+        .nr                     = UART_NR,
+        .cons                   = SERIAL8250_CONSOLE,
+};
+
+int __init early_serial_setup(struct uart_port *port)
+{
+        serial8250_isa_init_ports();
+        serial8250_ports[port->line].port       = *port;
+        serial8250_ports[port->line].port.ops   = &serial8250_pops;
+        return 0;
+}
+
+/**
+ *      serial8250_suspend_port - suspend one serial port
+ *      @line:  serial line number
+ *      @level: the level of port suspension, as per uart_suspend_port
+ *
+ *      Suspend one serial port.
+ */
+void serial8250_suspend_port(int line)
+{
+        uart_suspend_port(&serial8250_reg, &serial8250_ports[line].port);
+}
+
+/**
+ *      serial8250_resume_port - resume one serial port
+ *      @line:  serial line number
+ *      @level: the level of port resumption, as per uart_resume_port
+ *
+ *      Resume one serial port.
+ */
+void serial8250_resume_port(int line)
+{
+        uart_resume_port(&serial8250_reg, &serial8250_ports[line].port);
+}
+
+static int __init serial8250_init(void)
+{
+        int ret, i;
+
+        printk(KERN_INFO "Serial: Au1x00 driver\n");
+
+        for (i = 0; i < NR_IRQS; i++)
+                spin_lock_init(&irq_lists[i].lock);
+
+        ret = uart_register_driver(&serial8250_reg);
+        if (ret >= 0)
+                serial8250_register_ports(&serial8250_reg);
+
+        return ret;
+}
+
+static void __exit serial8250_exit(void)
+{
+        int i;
+
+        for (i = 0; i < UART_NR; i++)
+                uart_remove_one_port(&serial8250_reg, &serial8250_ports[i].port);
+
+        uart_unregister_driver(&serial8250_reg);
+}
+
+module_init(serial8250_init);
+module_exit(serial8250_exit);
+
+EXPORT_SYMBOL(serial8250_suspend_port);
+EXPORT_SYMBOL(serial8250_resume_port);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Au1x00 serial driver\n");
diff --git a/drivers/serial/bast_sio.c b/drivers/serial/bast_sio.c
new file mode 100644
index 000000000000..2b48fab6f0c6
--- /dev/null
+++ b/drivers/serial/bast_sio.c
@@ -0,0 +1,80 @@
+/* linux/drivers/serial/bast_sio.c
+ *
+ * Copyright (c) 2004 Simtec Electronics
+ *   Ben Dooks <ben@simtec.co.uk>
+ *
+ * http://www.simtec.co.uk/products/EB2410ITX/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Modifications:
+ *      23-Sep-2004  BJD  Added copyright header
+ *      23-Sep-2004  BJD  Added serial port remove code
+*/
+
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/types.h>
+
+#include <asm/io.h>
+#include <asm/serial.h>
+#include <asm/mach-types.h>
+
+#include <asm/arch/map.h>
+#include <asm/arch/irqs.h>
+#include <asm/arch/bast-map.h>
+#include <asm/arch/bast-irq.h>
+
+static int __init serial_bast_register(unsigned long port, unsigned int irq)
+{
+        struct serial_struct serial_req;
+
+        serial_req.flags      = UPF_AUTOPROBE | UPF_SHARE_IRQ;
+        serial_req.baud_base  = BASE_BAUD;
+        serial_req.irq        = irq;
+        serial_req.io_type    = UPIO_MEM;
+        serial_req.iomap_base = port;
+        serial_req.iomem_base = ioremap(port, 0x10);
+        serial_req.iomem_reg_shift = 0;
+
+        return register_serial(&serial_req);
+}
+
+#define SERIAL_BASE (S3C2410_CS2 + BAST_PA_SUPERIO)
+
+static int port[2] = { -1, -1 };
+
+static int __init serial_bast_init(void)
+{
+        if (machine_is_bast()) {
+                port[0] = serial_bast_register(SERIAL_BASE + 0x2f8, IRQ_PCSERIAL1);
+                port[1] = serial_bast_register(SERIAL_BASE + 0x3f8, IRQ_PCSERIAL2);
+        }
+
+        return 0;
+}
+
+static void __exit serial_bast_exit(void)
+{
+        if (port[0] != -1)
+                unregister_serial(port[0]);
+        if (port[1] != -1)
+                unregister_serial(port[1]);
+}
+
+
+module_init(serial_bast_init);
+module_exit(serial_bast_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ben Dooks, ben@simtec.co.uk");
+MODULE_DESCRIPTION("BAST Onboard Serial setup");
+
+
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
new file mode 100644
index 000000000000..16592fae47f3
--- /dev/null
+++ b/drivers/serial/clps711x.c
@@ -0,0 +1,609 @@
+/*
+ *  linux/drivers/char/clps711x.c
+ *
+ *  Driver for CLPS711x serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright 1999 ARM Limited
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
+ *
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/hardware/clps7111.h>
+
+#define UART_NR         2
+
+#define SERIAL_CLPS711X_MAJOR   204
+#define SERIAL_CLPS711X_MINOR   40
+#define SERIAL_CLPS711X_NR      UART_NR
+
+/*
+ * We use the relevant SYSCON register as a base address for these ports.
+ */
+#define UBRLCR(port)            ((port)->iobase + UBRLCR1 - SYSCON1)
+#define UARTDR(port)            ((port)->iobase + UARTDR1 - SYSCON1)
+#define SYSFLG(port)            ((port)->iobase + SYSFLG1 - SYSCON1)
+#define SYSCON(port)            ((port)->iobase + SYSCON1 - SYSCON1)
+
+#define TX_IRQ(port)            ((port)->irq)
+#define RX_IRQ(port)            ((port)->irq + 1)
+
+#define UART_ANY_ERR            (UARTDR_FRMERR | UARTDR_PARERR | UARTDR_OVERR)
+
+#define tx_enabled(port)        ((port)->unused[0])
+
+static void
+clps711xuart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        if (tx_enabled(port)) {
+                disable_irq(TX_IRQ(port));
+                tx_enabled(port) = 0;
+        }
+}
+
+static void
+clps711xuart_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        if (!tx_enabled(port)) {
+                enable_irq(TX_IRQ(port));
+                tx_enabled(port) = 1;
+        }
+}
+
+static void clps711xuart_stop_rx(struct uart_port *port)
+{
+        disable_irq(RX_IRQ(port));
+}
+
+static void clps711xuart_enable_ms(struct uart_port *port)
+{
+}
+
+static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = dev_id;
+        struct tty_struct *tty = port->info->tty;
+        unsigned int status, ch, flg, ignored = 0;
+
+        status = clps_readl(SYSFLG(port));
+        while (!(status & SYSFLG_URXFE)) {
+                ch = clps_readl(UARTDR(port));
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        goto ignore_char;
+                port->icount.rx++;
+
+                flg = TTY_NORMAL;
+
+                /*
+                 * Note that the error handling code is
+                 * out of the main execution path
+                 */
+                if (ch & UART_ANY_ERR)
+                        goto handle_error;
+
+                if (uart_handle_sysrq_char(port, ch, regs))
+                        goto ignore_char;
+
+        error_return:
+                tty_insert_flip_char(tty, ch, flg);
+        ignore_char:
+                status = clps_readl(SYSFLG(port));
+        }
+ out:
+        tty_flip_buffer_push(tty);
+        return IRQ_HANDLED;
+
+ handle_error:
+        if (ch & UARTDR_PARERR)
+                port->icount.parity++;
+        else if (ch & UARTDR_FRMERR)
+                port->icount.frame++;
+        if (ch & UARTDR_OVERR)
+                port->icount.overrun++;
+
+        if (ch & port->ignore_status_mask) {
+                if (++ignored > 100)
+                        goto out;
+                goto ignore_char;
+        }
+        ch &= port->read_status_mask;
+
+        if (ch & UARTDR_PARERR)
+                flg = TTY_PARITY;
+        else if (ch & UARTDR_FRMERR)
+                flg = TTY_FRAME;
+
+        if (ch & UARTDR_OVERR) {
+                /*
+                 * CHECK: does overrun affect the current character?
+                 * ASSUMPTION: it does not.
+                 */
+                tty_insert_flip_char(tty, ch, flg);
+                ch = 0;
+                flg = TTY_OVERRUN;
+        }
+#ifdef SUPPORT_SYSRQ
+        port->sysrq = 0;
+#endif
+        goto error_return;
+}
+
+static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = dev_id;
+        struct circ_buf *xmit = &port->info->xmit;
+        int count;
+
+        if (port->x_char) {
+                clps_writel(port->x_char, UARTDR(port));
+                port->icount.tx++;
+                port->x_char = 0;
+                return IRQ_HANDLED;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                clps711xuart_stop_tx(port, 0);
+                return IRQ_HANDLED;
+        }
+
+        count = port->fifosize >> 1;
+        do {
+                clps_writel(xmit->buf[xmit->tail], UARTDR(port));
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                clps711xuart_stop_tx(port, 0);
+
+        return IRQ_HANDLED;
+}
+
+static unsigned int clps711xuart_tx_empty(struct uart_port *port)
+{
+        unsigned int status = clps_readl(SYSFLG(port));
+        return status & SYSFLG_UBUSY ? 0 : TIOCSER_TEMT;
+}
+
+static unsigned int clps711xuart_get_mctrl(struct uart_port *port)
+{
+        unsigned int port_addr;
+        unsigned int result = 0;
+        unsigned int status;
+
+        port_addr = SYSFLG(port);
+        if (port_addr == SYSFLG1) {
+                status = clps_readl(SYSFLG1);
+                if (status & SYSFLG1_DCD)
+                        result |= TIOCM_CAR;
+                if (status & SYSFLG1_DSR)
+                        result |= TIOCM_DSR;
+                if (status & SYSFLG1_CTS)
+                        result |= TIOCM_CTS;
+        }
+
+        return result;
+}
+
+static void
+clps711xuart_set_mctrl_null(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+static void clps711xuart_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long flags;
+        unsigned int ubrlcr;
+
+        spin_lock_irqsave(&port->lock, flags);
+        ubrlcr = clps_readl(UBRLCR(port));
+        if (break_state == -1)
+                ubrlcr |= UBRLCR_BREAK;
+        else
+                ubrlcr &= ~UBRLCR_BREAK;
+        clps_writel(ubrlcr, UBRLCR(port));
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int clps711xuart_startup(struct uart_port *port)
+{
+        unsigned int syscon;
+        int retval;
+
+        tx_enabled(port) = 1;
+
+        /*
+         * Allocate the IRQs
+         */
+        retval = request_irq(TX_IRQ(port), clps711xuart_int_tx, 0,
+                             "clps711xuart_tx", port);
+        if (retval)
+                return retval;
+
+        retval = request_irq(RX_IRQ(port), clps711xuart_int_rx, 0,
+                             "clps711xuart_rx", port);
+        if (retval) {
+                free_irq(TX_IRQ(port), port);
+                return retval;
+        }
+
+        /*
+         * enable the port
+         */
+        syscon = clps_readl(SYSCON(port));
+        syscon |= SYSCON_UARTEN;
+        clps_writel(syscon, SYSCON(port));
+
+        return 0;
+}
+
+static void clps711xuart_shutdown(struct uart_port *port)
+{
+        unsigned int ubrlcr, syscon;
+
+        /*
+         * Free the interrupt
+         */
+        free_irq(TX_IRQ(port), port);   /* TX interrupt */
+        free_irq(RX_IRQ(port), port);   /* RX interrupt */
+
+        /*
+         * disable the port
+         */
+        syscon = clps_readl(SYSCON(port));
+        syscon &= ~SYSCON_UARTEN;
+        clps_writel(syscon, SYSCON(port));
+
+        /*
+         * disable break condition and fifos
+         */
+        ubrlcr = clps_readl(UBRLCR(port));
+        ubrlcr &= ~(UBRLCR_FIFOEN | UBRLCR_BREAK);
+        clps_writel(ubrlcr, UBRLCR(port));
+}
+
+static void
+clps711xuart_set_termios(struct uart_port *port, struct termios *termios,
+                         struct termios *old)
+{
+        unsigned int ubrlcr, baud, quot;
+        unsigned long flags;
+
+        /*
+         * We don't implement CREAD.
+         */
+        termios->c_cflag |= CREAD;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = uart_get_divisor(port, baud);
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                ubrlcr = UBRLCR_WRDLEN5;
+                break;
+        case CS6:
+                ubrlcr = UBRLCR_WRDLEN6;
+                break;
+        case CS7:
+                ubrlcr = UBRLCR_WRDLEN7;
+                break;
+        default: // CS8
+                ubrlcr = UBRLCR_WRDLEN8;
+                break;
+        }
+        if (termios->c_cflag & CSTOPB)
+                ubrlcr |= UBRLCR_XSTOP;
+        if (termios->c_cflag & PARENB) {
+                ubrlcr |= UBRLCR_PRTEN;
+                if (!(termios->c_cflag & PARODD))
+                        ubrlcr |= UBRLCR_EVENPRT;
+        }
+        if (port->fifosize > 1)
+                ubrlcr |= UBRLCR_FIFOEN;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        port->read_status_mask = UARTDR_OVERR;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= UARTDR_PARERR | UARTDR_FRMERR;
+
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= UARTDR_FRMERR | UARTDR_PARERR;
+        if (termios->c_iflag & IGNBRK) {
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns to (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= UARTDR_OVERR;
+        }
+
+        quot -= 1;
+
+        clps_writel(ubrlcr | quot, UBRLCR(port));
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *clps711xuart_type(struct uart_port *port)
+{
+        return port->type == PORT_CLPS711X ? "CLPS711x" : NULL;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void clps711xuart_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE)
+                port->type = PORT_CLPS711X;
+}
+
+static void clps711xuart_release_port(struct uart_port *port)
+{
+}
+
+static int clps711xuart_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static struct uart_ops clps711x_pops = {
+        .tx_empty       = clps711xuart_tx_empty,
+        .set_mctrl      = clps711xuart_set_mctrl_null,
+        .get_mctrl      = clps711xuart_get_mctrl,
+        .stop_tx        = clps711xuart_stop_tx,
+        .start_tx       = clps711xuart_start_tx,
+        .stop_rx        = clps711xuart_stop_rx,
+        .enable_ms      = clps711xuart_enable_ms,
+        .break_ctl      = clps711xuart_break_ctl,
+        .startup        = clps711xuart_startup,
+        .shutdown       = clps711xuart_shutdown,
+        .set_termios    = clps711xuart_set_termios,
+        .type           = clps711xuart_type,
+        .config_port    = clps711xuart_config_port,
+        .release_port   = clps711xuart_release_port,
+        .request_port   = clps711xuart_request_port,
+};
+
+static struct uart_port clps711x_ports[UART_NR] = {
+        {
+                .iobase         = SYSCON1,
+                .irq            = IRQ_UTXINT1, /* IRQ_URXINT1, IRQ_UMSINT */
+                .uartclk        = 3686400,
+                .fifosize       = 16,
+                .ops            = &clps711x_pops,
+                .line           = 0,
+                .flags          = ASYNC_BOOT_AUTOCONF,
+        },
+        {
+                .iobase         = SYSCON2,
+                .irq            = IRQ_UTXINT2, /* IRQ_URXINT2 */
+                .uartclk        = 3686400,
+                .fifosize       = 16,
+                .ops            = &clps711x_pops,
+                .line           = 1,
+                .flags          = ASYNC_BOOT_AUTOCONF,
+        }
+};
+
+#ifdef CONFIG_SERIAL_CLPS711X_CONSOLE
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ *
+ *      Note that this is called with interrupts already disabled
+ */
+static void
+clps711xuart_console_write(struct console *co, const char *s,
+                           unsigned int count)
+{
+        struct uart_port *port = clps711x_ports + co->index;
+        unsigned int status, syscon;
+        int i;
+
+        /*
+         *      Ensure that the port is enabled.
+         */
+        syscon = clps_readl(SYSCON(port));
+        clps_writel(syscon | SYSCON_UARTEN, SYSCON(port));
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++) {
+                do {
+                        status = clps_readl(SYSFLG(port));
+                } while (status & SYSFLG_UTXFF);
+                clps_writel(s[i], UARTDR(port));
+                if (s[i] == '\n') {
+                        do {
+                                status = clps_readl(SYSFLG(port));
+                        } while (status & SYSFLG_UTXFF);
+                        clps_writel('\r', UARTDR(port));
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the uart state.
+         */
+        do {
+                status = clps_readl(SYSFLG(port));
+        } while (status & SYSFLG_UBUSY);
+
+        clps_writel(syscon, SYSCON(port));
+}
+
+static void __init
+clps711xuart_console_get_options(struct uart_port *port, int *baud,
+                                 int *parity, int *bits)
+{
+        if (clps_readl(SYSCON(port)) & SYSCON_UARTEN) {
+                unsigned int ubrlcr, quot;
+
+                ubrlcr = clps_readl(UBRLCR(port));
+
+                *parity = 'n';
+                if (ubrlcr & UBRLCR_PRTEN) {
+                        if (ubrlcr & UBRLCR_EVENPRT)
+                                *parity = 'e';
+                        else
+                                *parity = 'o';
+                }
+
+                if ((ubrlcr & UBRLCR_WRDLEN_MASK) == UBRLCR_WRDLEN7)
+                        *bits = 7;
+                else
+                        *bits = 8;
+
+                quot = ubrlcr & UBRLCR_BAUD_MASK;
+                *baud = port->uartclk / (16 * (quot + 1));
+        }
+}
+
+static int __init clps711xuart_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        port = uart_get_console(clps711x_ports, UART_NR, co);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                clps711xuart_console_get_options(port, &baud, &parity, &bits);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver clps711x_reg;
+static struct console clps711x_console = {
+        .name           = "ttyCL",
+        .write          = clps711xuart_console_write,
+        .device         = uart_console_device,
+        .setup          = clps711xuart_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &clps711x_reg,
+};
+
+static int __init clps711xuart_console_init(void)
+{
+        register_console(&clps711x_console);
+        return 0;
+}
+console_initcall(clps711xuart_console_init);
+
+#define CLPS711X_CONSOLE        &clps711x_console
+#else
+#define CLPS711X_CONSOLE        NULL
+#endif
+
+static struct uart_driver clps711x_reg = {
+        .driver_name            = "ttyCL",
+        .dev_name               = "ttyCL",
+        .major                  = SERIAL_CLPS711X_MAJOR,
+        .minor                  = SERIAL_CLPS711X_MINOR,
+        .nr                     = UART_NR,
+
+        .cons                   = CLPS711X_CONSOLE,
+};
+
+static int __init clps711xuart_init(void)
+{
+        int ret, i;
+
+        printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.42 $\n");
+
+        ret = uart_register_driver(&clps711x_reg);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < UART_NR; i++)
+                uart_add_one_port(&clps711x_reg, &clps711x_ports[i]);
+
+        return 0;
+}
+
+static void __exit clps711xuart_exit(void)
+{
+        int i;
+
+        for (i = 0; i < UART_NR; i++)
+                uart_remove_one_port(&clps711x_reg, &clps711x_ports[i]);
+
+        uart_unregister_driver(&clps711x_reg);
+}
+
+module_init(clps711xuart_init);
+module_exit(clps711xuart_exit);
+
+MODULE_AUTHOR("Deep Blue Solutions Ltd");
+MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.42 $");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV(SERIAL_CLPS711X_MAJOR, SERIAL_CLPS711X_MINOR);
diff --git a/drivers/serial/cpm_uart/Makefile b/drivers/serial/cpm_uart/Makefile
new file mode 100644
index 000000000000..e072724ea754
--- /dev/null
+++ b/drivers/serial/cpm_uart/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the Motorola 8xx FEC ethernet controller
+#
+
+obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o
+
+# Select the correct platform objects.
+cpm_uart-objs-$(CONFIG_CPM2)    += cpm_uart_cpm2.o
+cpm_uart-objs-$(CONFIG_8xx)     += cpm_uart_cpm1.o
+
+cpm_uart-objs   := cpm_uart_core.o $(cpm_uart-objs-y)
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
new file mode 100644
index 000000000000..5f6187baad86
--- /dev/null
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -0,0 +1,89 @@
+/*
+ *  linux/drivers/serial/cpm_uart.h
+ *
+ *  Driver for CPM (SCC/SMC) serial ports
+ *
+ *  Copyright (C) 2004 Freescale Semiconductor, Inc.
+ *
+ */
+#ifndef CPM_UART_H
+#define CPM_UART_H
+
+#include <linux/config.h>
+
+#if defined(CONFIG_CPM2)
+#include "cpm_uart_cpm2.h"
+#elif defined(CONFIG_8xx)
+#include "cpm_uart_cpm1.h"
+#endif
+
+#define SERIAL_CPM_MAJOR        204
+#define SERIAL_CPM_MINOR        46
+
+#define IS_SMC(pinfo)           (pinfo->flags & FLAG_SMC)
+#define IS_DISCARDING(pinfo)    (pinfo->flags & FLAG_DISCARDING)
+#define FLAG_DISCARDING 0x00000004      /* when set, don't discard */
+#define FLAG_SMC        0x00000002
+#define FLAG_CONSOLE    0x00000001
+
+#define UART_SMC1       0
+#define UART_SMC2       1
+#define UART_SCC1       2
+#define UART_SCC2       3
+#define UART_SCC3       4
+#define UART_SCC4       5
+
+#define UART_NR 6
+
+#define RX_NUM_FIFO     4
+#define RX_BUF_SIZE     32
+#define TX_NUM_FIFO     4
+#define TX_BUF_SIZE     32
+
+struct uart_cpm_port {
+        struct uart_port        port;
+        u16                     rx_nrfifos;     
+        u16                     rx_fifosize;
+        u16                     tx_nrfifos;     
+        u16                     tx_fifosize;
+        smc_t                   *smcp;  
+        smc_uart_t              *smcup;
+        scc_t                   *sccp;
+        scc_uart_t              *sccup;
+        volatile cbd_t          *rx_bd_base;
+        volatile cbd_t          *rx_cur;
+        volatile cbd_t          *tx_bd_base;
+        volatile cbd_t          *tx_cur;
+        unsigned char           *tx_buf;
+        unsigned char           *rx_buf;
+        u32                     flags;
+        void                    (*set_lineif)(struct uart_cpm_port *);
+        u8                      brg;
+        uint                     dp_addr;
+        void                    *mem_addr;
+        dma_addr_t               dma_addr;
+        /* helpers */
+        int                      baud;
+        int                      bits;
+        /* Keep track of 'odd' SMC2 wirings */
+        int                     is_portb;
+};
+
+extern int cpm_uart_port_map[UART_NR];
+extern int cpm_uart_nr;
+extern struct uart_cpm_port cpm_uart_ports[UART_NR];
+
+/* these are located in their respective files */
+void cpm_line_cr_cmd(int line, int cmd);
+int cpm_uart_init_portdesc(void);
+int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
+void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
+
+void smc1_lineif(struct uart_cpm_port *pinfo);
+void smc2_lineif(struct uart_cpm_port *pinfo);
+void scc1_lineif(struct uart_cpm_port *pinfo);
+void scc2_lineif(struct uart_cpm_port *pinfo);
+void scc3_lineif(struct uart_cpm_port *pinfo);
+void scc4_lineif(struct uart_cpm_port *pinfo);
+
+#endif /* CPM_UART_H */
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
new file mode 100644
index 000000000000..29db677d4284
--- /dev/null
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -0,0 +1,1177 @@
+/*
+ *  linux/drivers/serial/cpm_uart.c
+ *
+ *  Driver for CPM (SCC/SMC) serial ports; core driver
+ *
+ *  Based on arch/ppc/cpm2_io/uart.c by Dan Malek
+ *  Based on ppc8xx.c by Thomas Gleixner
+ *  Based on drivers/serial/amba.c by Russell King
+ *
+ *  Maintainer: Kumar Gala (kumar.gala@freescale.com) (CPM2)
+ *              Pantelis Antoniou (panto@intracom.gr) (CPM1)
+ * 
+ *  Copyright (C) 2004 Freescale Semiconductor, Inc.
+ *            (C) 2004 Intracom, S.A.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/bootmem.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/delay.h>
+
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+#include <linux/kernel.h>
+
+#include "cpm_uart.h"
+
+/***********************************************************************/
+
+/* Track which ports are configured as uarts */
+int cpm_uart_port_map[UART_NR];
+/* How many ports did we config as uarts */
+int cpm_uart_nr;
+
+/**************************************************************/
+
+static int  cpm_uart_tx_pump(struct uart_port *port);
+static void cpm_uart_init_smc(struct uart_cpm_port *pinfo);
+static void cpm_uart_init_scc(struct uart_cpm_port *pinfo);
+static void cpm_uart_initbd(struct uart_cpm_port *pinfo);
+
+/**************************************************************/
+
+/*
+ * Check, if transmit buffers are processed             
+*/
+static unsigned int cpm_uart_tx_empty(struct uart_port *port)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile cbd_t *bdp = pinfo->tx_bd_base;
+        int ret = 0;
+
+        while (1) {
+                if (bdp->cbd_sc & BD_SC_READY)
+                        break;
+
+                if (bdp->cbd_sc & BD_SC_WRAP) {
+                        ret = TIOCSER_TEMT;
+                        break;
+                }
+                bdp++;
+        }
+
+        pr_debug("CPM uart[%d]:tx_empty: %d\n", port->line, ret);
+
+        return ret;
+}
+
+static void cpm_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        /* Whee. Do nothing. */
+}
+
+static unsigned int cpm_uart_get_mctrl(struct uart_port *port)
+{
+        /* Whee. Do nothing. */
+        return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+}
+
+/*
+ * Stop transmitter
+ */
+static void cpm_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile smc_t *smcp = pinfo->smcp;
+        volatile scc_t *sccp = pinfo->sccp;
+
+        pr_debug("CPM uart[%d]:stop tx\n", port->line);
+
+        if (IS_SMC(pinfo))
+                smcp->smc_smcm &= ~SMCM_TX;
+        else
+                sccp->scc_sccm &= ~UART_SCCM_TX;
+}
+
+/*
+ * Start transmitter
+ */
+static void cpm_uart_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile smc_t *smcp = pinfo->smcp;
+        volatile scc_t *sccp = pinfo->sccp;
+
+        pr_debug("CPM uart[%d]:start tx\n", port->line);
+
+        if (IS_SMC(pinfo)) {
+                if (smcp->smc_smcm & SMCM_TX)
+                        return;
+        } else {
+                if (sccp->scc_sccm & UART_SCCM_TX)
+                        return;
+        }
+
+        if (cpm_uart_tx_pump(port) != 0) {
+                if (IS_SMC(pinfo))
+                        smcp->smc_smcm |= SMCM_TX;
+                else
+                        sccp->scc_sccm |= UART_SCCM_TX;
+        }
+}
+
+/*
+ * Stop receiver 
+ */
+static void cpm_uart_stop_rx(struct uart_port *port)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile smc_t *smcp = pinfo->smcp;
+        volatile scc_t *sccp = pinfo->sccp;
+
+        pr_debug("CPM uart[%d]:stop rx\n", port->line);
+
+        if (IS_SMC(pinfo))
+                smcp->smc_smcm &= ~SMCM_RX;
+        else
+                sccp->scc_sccm &= ~UART_SCCM_RX;
+}
+
+/*
+ * Enable Modem status interrupts
+ */
+static void cpm_uart_enable_ms(struct uart_port *port)
+{
+        pr_debug("CPM uart[%d]:enable ms\n", port->line);
+}
+
+/*
+ * Generate a break. 
+ */
+static void cpm_uart_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        int line = pinfo - cpm_uart_ports;
+
+        pr_debug("CPM uart[%d]:break ctrl, break_state: %d\n", port->line,
+                break_state);
+
+        if (break_state)
+                cpm_line_cr_cmd(line, CPM_CR_STOP_TX);
+        else
+                cpm_line_cr_cmd(line, CPM_CR_RESTART_TX);
+}
+
+/*
+ * Transmit characters, refill buffer descriptor, if possible
+ */
+static void cpm_uart_int_tx(struct uart_port *port, struct pt_regs *regs)
+{
+        pr_debug("CPM uart[%d]:TX INT\n", port->line);
+
+        cpm_uart_tx_pump(port);
+}
+
+/*
+ * Receive characters
+ */
+static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs)
+{
+        int i;
+        unsigned char ch, *cp;
+        struct tty_struct *tty = port->info->tty;
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile cbd_t *bdp;
+        u16 status;
+        unsigned int flg;
+
+        pr_debug("CPM uart[%d]:RX INT\n", port->line);
+
+        /* Just loop through the closed BDs and copy the characters into
+         * the buffer.
+         */
+        bdp = pinfo->rx_cur;
+        for (;;) {
+                /* get status */
+                status = bdp->cbd_sc;
+                /* If this one is empty, return happy */
+                if (status & BD_SC_EMPTY)
+                        break;
+
+                /* get number of characters, and check spce in flip-buffer */
+                i = bdp->cbd_datlen;
+
+                /* If we have not enough room in tty flip buffer, then we try 
+                 * later, which will be the next rx-interrupt or a timeout
+                 */
+                if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) {
+                        tty->flip.work.func((void *)tty);
+                        if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) {
+                                printk(KERN_WARNING "TTY_DONT_FLIP set\n");
+                                return;
+                        }
+                }
+
+                /* get pointer */
+                cp = (unsigned char *)bus_to_virt(bdp->cbd_bufaddr);
+
+                /* loop through the buffer */
+                while (i-- > 0) {
+                        ch = *cp++;
+                        port->icount.rx++;
+                        flg = TTY_NORMAL;
+
+                        if (status &
+                            (BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV))
+                                goto handle_error;
+                        if (uart_handle_sysrq_char(port, ch, regs))
+                                continue;
+
+                      error_return:
+                        *tty->flip.char_buf_ptr++ = ch;
+                        *tty->flip.flag_buf_ptr++ = flg;
+                        tty->flip.count++;
+
+                }               /* End while (i--) */
+
+                /* This BD is ready to be used again. Clear status. get next */
+                bdp->cbd_sc &= ~(BD_SC_BR | BD_SC_FR | BD_SC_PR | BD_SC_OV);
+                bdp->cbd_sc |= BD_SC_EMPTY;
+
+                if (bdp->cbd_sc & BD_SC_WRAP)
+                        bdp = pinfo->rx_bd_base;
+                else
+                        bdp++;
+        } /* End for (;;) */
+
+        /* Write back buffer pointer */
+        pinfo->rx_cur = (volatile cbd_t *) bdp;
+
+        /* activate BH processing */
+        tty_flip_buffer_push(tty);
+
+        return;
+
+        /* Error processing */
+
+      handle_error:
+        /* Statistics */
+        if (status & BD_SC_BR)
+                port->icount.brk++;
+        if (status & BD_SC_PR)
+                port->icount.parity++;
+        if (status & BD_SC_FR)
+                port->icount.frame++;
+        if (status & BD_SC_OV)
+                port->icount.overrun++;
+
+        /* Mask out ignored conditions */
+        status &= port->read_status_mask;
+
+        /* Handle the remaining ones */
+        if (status & BD_SC_BR)
+                flg = TTY_BREAK;
+        else if (status & BD_SC_PR)
+                flg = TTY_PARITY;
+        else if (status & BD_SC_FR)
+                flg = TTY_FRAME;
+
+        /* overrun does not affect the current character ! */
+        if (status & BD_SC_OV) {
+                ch = 0;
+                flg = TTY_OVERRUN;
+                /* We skip this buffer */
+                /* CHECK: Is really nothing senseful there */
+                /* ASSUMPTION: it contains nothing valid */
+                i = 0;
+        }
+#ifdef SUPPORT_SYSRQ
+        port->sysrq = 0;
+#endif
+        goto error_return;
+}
+
+/*
+ * Asynchron mode interrupt handler
+ */
+static irqreturn_t cpm_uart_int(int irq, void *data, struct pt_regs *regs)
+{
+        u8 events;
+        struct uart_port *port = (struct uart_port *)data;
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile smc_t *smcp = pinfo->smcp;
+        volatile scc_t *sccp = pinfo->sccp;
+
+        pr_debug("CPM uart[%d]:IRQ\n", port->line);
+
+        if (IS_SMC(pinfo)) {
+                events = smcp->smc_smce;
+                if (events & SMCM_BRKE)
+                        uart_handle_break(port);
+                if (events & SMCM_RX)
+                        cpm_uart_int_rx(port, regs);
+                if (events & SMCM_TX)
+                        cpm_uart_int_tx(port, regs);
+                smcp->smc_smce = events;
+        } else {
+                events = sccp->scc_scce;
+                if (events & UART_SCCM_BRKE)
+                        uart_handle_break(port);
+                if (events & UART_SCCM_RX)
+                        cpm_uart_int_rx(port, regs);
+                if (events & UART_SCCM_TX)
+                        cpm_uart_int_tx(port, regs);
+                sccp->scc_scce = events;
+        }
+        return (events) ? IRQ_HANDLED : IRQ_NONE;
+}
+
+static int cpm_uart_startup(struct uart_port *port)
+{
+        int retval;
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+
+        pr_debug("CPM uart[%d]:startup\n", port->line);
+
+        /* Install interrupt handler. */
+        retval = request_irq(port->irq, cpm_uart_int, 0, "cpm_uart", port);
+        if (retval)
+                return retval;
+
+        /* Startup rx-int */
+        if (IS_SMC(pinfo)) {
+                pinfo->smcp->smc_smcm |= SMCM_RX;
+                pinfo->smcp->smc_smcmr |= SMCMR_REN;
+        } else {
+                pinfo->sccp->scc_sccm |= UART_SCCM_RX;
+        }
+
+        return 0;
+}
+
+/*
+ * Shutdown the uart
+ */
+static void cpm_uart_shutdown(struct uart_port *port)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        int line = pinfo - cpm_uart_ports;
+
+        pr_debug("CPM uart[%d]:shutdown\n", port->line);
+
+        /* free interrupt handler */
+        free_irq(port->irq, port);
+
+        /* If the port is not the console, disable Rx and Tx. */
+        if (!(pinfo->flags & FLAG_CONSOLE)) {
+                /* Stop uarts */
+                if (IS_SMC(pinfo)) {
+                        volatile smc_t *smcp = pinfo->smcp;
+                        smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+                        smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
+                } else {
+                        volatile scc_t *sccp = pinfo->sccp;
+                        sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+                        sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
+                }
+
+                /* Shut them really down and reinit buffer descriptors */
+                cpm_line_cr_cmd(line, CPM_CR_STOP_TX);
+                cpm_uart_initbd(pinfo);
+        }
+}
+
+static void cpm_uart_set_termios(struct uart_port *port,
+                                 struct termios *termios, struct termios *old)
+{
+        int baud;
+        unsigned long flags;
+        u16 cval, scval, prev_mode;
+        int bits, sbits;
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        volatile smc_t *smcp = pinfo->smcp;
+        volatile scc_t *sccp = pinfo->sccp;
+
+        pr_debug("CPM uart[%d]:set_termios\n", port->line);
+
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
+
+        /* Character length programmed into the mode register is the
+         * sum of: 1 start bit, number of data bits, 0 or 1 parity bit,
+         * 1 or 2 stop bits, minus 1.
+         * The value 'bits' counts this for us.
+         */
+        cval = 0;
+        scval = 0;
+
+        /* byte size */
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                bits = 5;
+                break;
+        case CS6:
+                bits = 6;
+                break;
+        case CS7:
+                bits = 7;
+                break;
+        case CS8:
+                bits = 8;
+                break;
+                /* Never happens, but GCC is too dumb to figure it out */
+        default:
+                bits = 8;
+                break;
+        }
+        sbits = bits - 5;
+
+        if (termios->c_cflag & CSTOPB) {
+                cval |= SMCMR_SL;       /* Two stops */
+                scval |= SCU_PSMR_SL;
+                bits++;
+        }
+
+        if (termios->c_cflag & PARENB) {
+                cval |= SMCMR_PEN;
+                scval |= SCU_PSMR_PEN;
+                bits++;
+                if (!(termios->c_cflag & PARODD)) {
+                        cval |= SMCMR_PM_EVEN;
+                        scval |= (SCU_PSMR_REVP | SCU_PSMR_TEVP);
+                }
+        }
+
+        /*
+         * Set up parity check flag
+         */
+#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
+
+        port->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= BD_SC_FR | BD_SC_PR;
+        if ((termios->c_iflag & BRKINT) || (termios->c_iflag & PARMRK))
+                port->read_status_mask |= BD_SC_BR;
+
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= BD_SC_PR | BD_SC_FR;
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= BD_SC_BR;
+                /*
+                 * If we're ignore parity and break indicators, ignore
+                 * overruns too.  (For real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= BD_SC_OV;
+        }
+        /*
+         * !!! ignore all characters if CREAD is not set
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->read_status_mask &= ~BD_SC_EMPTY;
+        
+        spin_lock_irqsave(&port->lock, flags);
+
+        /* Start bit has not been added (so don't, because we would just
+         * subtract it later), and we need to add one for the number of
+         * stops bits (there is always at least one).
+         */
+        bits++;
+        if (IS_SMC(pinfo)) {
+                /* Set the mode register.  We want to keep a copy of the
+                 * enables, because we want to put them back if they were
+                 * present.
+                 */
+                prev_mode = smcp->smc_smcmr;
+                smcp->smc_smcmr = smcr_mk_clen(bits) | cval | SMCMR_SM_UART;
+                smcp->smc_smcmr |= (prev_mode & (SMCMR_REN | SMCMR_TEN));
+        } else {
+                sccp->scc_psmr = (sbits << 12) | scval;
+        }
+
+        cpm_set_brg(pinfo->brg - 1, baud);
+        spin_unlock_irqrestore(&port->lock, flags);
+
+}
+
+static const char *cpm_uart_type(struct uart_port *port)
+{
+        pr_debug("CPM uart[%d]:uart_type\n", port->line);
+
+        return port->type == PORT_CPM ? "CPM UART" : NULL;
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int cpm_uart_verify_port(struct uart_port *port,
+                                struct serial_struct *ser)
+{
+        int ret = 0;
+
+        pr_debug("CPM uart[%d]:verify_port\n", port->line);
+
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_CPM)
+                ret = -EINVAL;
+        if (ser->irq < 0 || ser->irq >= NR_IRQS)
+                ret = -EINVAL;
+        if (ser->baud_base < 9600)
+                ret = -EINVAL;
+        return ret;
+}
+
+/*
+ * Transmit characters, refill buffer descriptor, if possible
+ */
+static int cpm_uart_tx_pump(struct uart_port *port)
+{
+        volatile cbd_t *bdp;
+        unsigned char *p;
+        int count;
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        struct circ_buf *xmit = &port->info->xmit;
+
+        /* Handle xon/xoff */
+        if (port->x_char) {
+                /* Pick next descriptor and fill from buffer */
+                bdp = pinfo->tx_cur;
+
+                p = bus_to_virt(bdp->cbd_bufaddr);
+                *p++ = xmit->buf[xmit->tail];
+                bdp->cbd_datlen = 1;
+                bdp->cbd_sc |= BD_SC_READY;
+                /* Get next BD. */
+                if (bdp->cbd_sc & BD_SC_WRAP)
+                        bdp = pinfo->tx_bd_base;
+                else
+                        bdp++;
+                pinfo->tx_cur = bdp;
+
+                port->icount.tx++;
+                port->x_char = 0;
+                return 1;
+        }
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                cpm_uart_stop_tx(port, 0);
+                return 0;
+        }
+
+        /* Pick next descriptor and fill from buffer */
+        bdp = pinfo->tx_cur;
+
+        while (!(bdp->cbd_sc & BD_SC_READY) && (xmit->tail != xmit->head)) {
+                count = 0;
+                p = bus_to_virt(bdp->cbd_bufaddr);
+                while (count < pinfo->tx_fifosize) {
+                        *p++ = xmit->buf[xmit->tail];
+                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                        port->icount.tx++;
+                        count++;
+                        if (xmit->head == xmit->tail)
+                                break;
+                }
+                bdp->cbd_datlen = count;
+                bdp->cbd_sc |= BD_SC_READY;
+                /* Get next BD. */
+                if (bdp->cbd_sc & BD_SC_WRAP)
+                        bdp = pinfo->tx_bd_base;
+                else
+                        bdp++;
+        }
+        pinfo->tx_cur = bdp;
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit)) {
+                cpm_uart_stop_tx(port, 0);
+                return 0;
+        }
+
+        return 1;
+}
+
+/*
+ * init buffer descriptors
+ */
+static void cpm_uart_initbd(struct uart_cpm_port *pinfo)
+{
+        int i;
+        u8 *mem_addr;
+        volatile cbd_t *bdp;
+
+        pr_debug("CPM uart[%d]:initbd\n", pinfo->port.line);
+
+        /* Set the physical address of the host memory
+         * buffers in the buffer descriptors, and the
+         * virtual address for us to work with.
+         */
+        mem_addr = pinfo->mem_addr;
+        bdp = pinfo->rx_cur = pinfo->rx_bd_base;
+        for (i = 0; i < (pinfo->rx_nrfifos - 1); i++, bdp++) {
+                bdp->cbd_bufaddr = virt_to_bus(mem_addr);
+                bdp->cbd_sc = BD_SC_EMPTY | BD_SC_INTRPT;
+                mem_addr += pinfo->rx_fifosize;
+        }
+        
+        bdp->cbd_bufaddr = virt_to_bus(mem_addr);
+        bdp->cbd_sc = BD_SC_WRAP | BD_SC_EMPTY | BD_SC_INTRPT;
+
+        /* Set the physical address of the host memory
+         * buffers in the buffer descriptors, and the
+         * virtual address for us to work with.
+         */
+        mem_addr = pinfo->mem_addr + L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize);
+        bdp = pinfo->tx_cur = pinfo->tx_bd_base;
+        for (i = 0; i < (pinfo->tx_nrfifos - 1); i++, bdp++) {
+                bdp->cbd_bufaddr = virt_to_bus(mem_addr);
+                bdp->cbd_sc = BD_SC_INTRPT;
+                mem_addr += pinfo->tx_fifosize;
+        }
+        
+        bdp->cbd_bufaddr = virt_to_bus(mem_addr);
+        bdp->cbd_sc = BD_SC_WRAP | BD_SC_INTRPT;
+}
+
+static void cpm_uart_init_scc(struct uart_cpm_port *pinfo)
+{
+        int line = pinfo - cpm_uart_ports;
+        volatile scc_t *scp;
+        volatile scc_uart_t *sup;
+
+        pr_debug("CPM uart[%d]:init_scc\n", pinfo->port.line);
+
+        scp = pinfo->sccp;
+        sup = pinfo->sccup;
+
+        /* Store address */
+        pinfo->sccup->scc_genscc.scc_rbase = (unsigned char *)pinfo->rx_bd_base - DPRAM_BASE;
+        pinfo->sccup->scc_genscc.scc_tbase = (unsigned char *)pinfo->tx_bd_base - DPRAM_BASE;
+
+        /* Set up the uart parameters in the
+         * parameter ram.
+         */
+
+        cpm_set_scc_fcr(sup);
+
+        sup->scc_genscc.scc_mrblr = pinfo->rx_fifosize;
+        sup->scc_maxidl = pinfo->rx_fifosize;
+        sup->scc_brkcr = 1;
+        sup->scc_parec = 0;
+        sup->scc_frmec = 0;
+        sup->scc_nosec = 0;
+        sup->scc_brkec = 0;
+        sup->scc_uaddr1 = 0;
+        sup->scc_uaddr2 = 0;
+        sup->scc_toseq = 0;
+        sup->scc_char1 = 0x8000;
+        sup->scc_char2 = 0x8000;
+        sup->scc_char3 = 0x8000;
+        sup->scc_char4 = 0x8000;
+        sup->scc_char5 = 0x8000;
+        sup->scc_char6 = 0x8000;
+        sup->scc_char7 = 0x8000;
+        sup->scc_char8 = 0x8000;
+        sup->scc_rccm = 0xc0ff;
+
+        /* Send the CPM an initialize command.
+         */
+        cpm_line_cr_cmd(line, CPM_CR_INIT_TRX);
+
+        /* Set UART mode, 8 bit, no parity, one stop.
+         * Enable receive and transmit.
+         */
+        scp->scc_gsmrh = 0;
+        scp->scc_gsmrl =
+            (SCC_GSMRL_MODE_UART | SCC_GSMRL_TDCR_16 | SCC_GSMRL_RDCR_16);
+
+        /* Enable rx interrupts  and clear all pending events.  */
+        scp->scc_sccm = 0;
+        scp->scc_scce = 0xffff;
+        scp->scc_dsr = 0x7e7e;
+        scp->scc_psmr = 0x3000;
+
+        scp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+}
+
+static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
+{
+        int line = pinfo - cpm_uart_ports;
+        volatile smc_t *sp;
+        volatile smc_uart_t *up;
+
+        pr_debug("CPM uart[%d]:init_smc\n", pinfo->port.line);
+
+        sp = pinfo->smcp;
+        up = pinfo->smcup;
+
+        /* Store address */
+        pinfo->smcup->smc_rbase = (u_char *)pinfo->rx_bd_base - DPRAM_BASE;
+        pinfo->smcup->smc_tbase = (u_char *)pinfo->tx_bd_base - DPRAM_BASE;
+
+/*
+ *  In case SMC1 is being relocated...
+ */
+#if defined (CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
+        up->smc_rbptr = pinfo->smcup->smc_rbase;
+        up->smc_tbptr = pinfo->smcup->smc_tbase;
+        up->smc_rstate = 0;
+        up->smc_tstate = 0;
+        up->smc_brkcr = 1;              /* number of break chars */
+        up->smc_brkec = 0;
+#endif
+
+        /* Set up the uart parameters in the
+         * parameter ram.
+         */
+        cpm_set_smc_fcr(up);
+
+        /* Using idle charater time requires some additional tuning.  */
+        up->smc_mrblr = pinfo->rx_fifosize;
+        up->smc_maxidl = pinfo->rx_fifosize;
+        up->smc_brkcr = 1;
+
+        cpm_line_cr_cmd(line, CPM_CR_INIT_TRX);
+
+        /* Set UART mode, 8 bit, no parity, one stop.
+         * Enable receive and transmit.
+         */
+        sp->smc_smcmr = smcr_mk_clen(9) | SMCMR_SM_UART;
+
+        /* Enable only rx interrupts clear all pending events. */
+        sp->smc_smcm = 0;
+        sp->smc_smce = 0xff;
+
+        sp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
+}
+
+/*
+ * Initialize port. This is called from early_console stuff
+ * so we have to be careful here !
+ */
+static int cpm_uart_request_port(struct uart_port *port)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+        int ret;
+
+        pr_debug("CPM uart[%d]:request port\n", port->line);
+
+        if (pinfo->flags & FLAG_CONSOLE)
+                return 0;
+
+        /*
+         * Setup any port IO, connect any baud rate generators,
+         * etc.  This is expected to be handled by board
+         * dependant code 
+         */
+        if (pinfo->set_lineif)
+                pinfo->set_lineif(pinfo);
+
+        if (IS_SMC(pinfo)) {
+                pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
+                pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        } else {
+                pinfo->sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
+                pinfo->sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        }
+
+        ret = cpm_uart_allocbuf(pinfo, 0);
+
+        if (ret)
+                return ret;
+
+        cpm_uart_initbd(pinfo);
+
+        return 0;
+}
+
+static void cpm_uart_release_port(struct uart_port *port)
+{
+        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
+
+        if (!(pinfo->flags & FLAG_CONSOLE))
+                cpm_uart_freebuf(pinfo);
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void cpm_uart_config_port(struct uart_port *port, int flags)
+{
+        pr_debug("CPM uart[%d]:config_port\n", port->line);
+
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = PORT_CPM;
+                cpm_uart_request_port(port);
+        }
+}
+static struct uart_ops cpm_uart_pops = {
+        .tx_empty       = cpm_uart_tx_empty,
+        .set_mctrl      = cpm_uart_set_mctrl,
+        .get_mctrl      = cpm_uart_get_mctrl,
+        .stop_tx        = cpm_uart_stop_tx,
+        .start_tx       = cpm_uart_start_tx,
+        .stop_rx        = cpm_uart_stop_rx,
+        .enable_ms      = cpm_uart_enable_ms,
+        .break_ctl      = cpm_uart_break_ctl,
+        .startup        = cpm_uart_startup,
+        .shutdown       = cpm_uart_shutdown,
+        .set_termios    = cpm_uart_set_termios,
+        .type           = cpm_uart_type,
+        .release_port   = cpm_uart_release_port,
+        .request_port   = cpm_uart_request_port,
+        .config_port    = cpm_uart_config_port,
+        .verify_port    = cpm_uart_verify_port,
+};
+
+struct uart_cpm_port cpm_uart_ports[UART_NR] = {
+        [UART_SMC1] = {
+                .port = {
+                        .irq            = SMC1_IRQ,
+                        .ops            = &cpm_uart_pops,
+                        .iotype         = SERIAL_IO_MEM,
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                },
+                .flags = FLAG_SMC,
+                .tx_nrfifos = TX_NUM_FIFO,
+                .tx_fifosize = TX_BUF_SIZE,
+                .rx_nrfifos = RX_NUM_FIFO, 
+                .rx_fifosize = RX_BUF_SIZE,
+                .set_lineif = smc1_lineif,
+        },
+        [UART_SMC2] = {
+                .port = {
+                        .irq            = SMC2_IRQ,
+                        .ops            = &cpm_uart_pops,
+                        .iotype         = SERIAL_IO_MEM,
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                },
+                .flags = FLAG_SMC,
+                .tx_nrfifos = TX_NUM_FIFO,
+                .tx_fifosize = TX_BUF_SIZE,
+                .rx_nrfifos = RX_NUM_FIFO, 
+                .rx_fifosize = RX_BUF_SIZE,
+                .set_lineif = smc2_lineif,
+#ifdef CONFIG_SERIAL_CPM_ALT_SMC2
+                .is_portb = 1,
+#endif
+        },
+        [UART_SCC1] = {
+                .port = {
+                        .irq            = SCC1_IRQ,
+                        .ops            = &cpm_uart_pops,
+                        .iotype         = SERIAL_IO_MEM,
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                },
+                .tx_nrfifos = TX_NUM_FIFO,
+                .tx_fifosize = TX_BUF_SIZE,
+                .rx_nrfifos = RX_NUM_FIFO, 
+                .rx_fifosize = RX_BUF_SIZE,
+                .set_lineif = scc1_lineif,
+        },
+        [UART_SCC2] = {
+                .port = {
+                        .irq            = SCC2_IRQ,
+                        .ops            = &cpm_uart_pops,
+                        .iotype         = SERIAL_IO_MEM,
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                },
+                .tx_nrfifos = TX_NUM_FIFO,
+                .tx_fifosize = TX_BUF_SIZE,
+                .rx_nrfifos = RX_NUM_FIFO, 
+                .rx_fifosize = RX_BUF_SIZE,
+                .set_lineif = scc2_lineif,
+        },
+        [UART_SCC3] = {
+                .port = {
+                        .irq            = SCC3_IRQ,
+                        .ops            = &cpm_uart_pops,
+                        .iotype         = SERIAL_IO_MEM,
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                },
+                .tx_nrfifos = TX_NUM_FIFO,
+                .tx_fifosize = TX_BUF_SIZE,
+                .rx_nrfifos = RX_NUM_FIFO, 
+                .rx_fifosize = RX_BUF_SIZE,
+                .set_lineif = scc3_lineif,
+        },
+        [UART_SCC4] = {
+                .port = {
+                        .irq            = SCC4_IRQ,
+                        .ops            = &cpm_uart_pops,
+                        .iotype         = SERIAL_IO_MEM,
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                },
+                .tx_nrfifos = TX_NUM_FIFO,
+                .tx_fifosize = TX_BUF_SIZE,
+                .rx_nrfifos = RX_NUM_FIFO, 
+                .rx_fifosize = RX_BUF_SIZE,
+                .set_lineif = scc4_lineif,
+        },
+};
+
+#ifdef CONFIG_SERIAL_CPM_CONSOLE
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      Note that this is called with interrupts already disabled
+ */
+static void cpm_uart_console_write(struct console *co, const char *s,
+                                   u_int count)
+{
+        struct uart_cpm_port *pinfo =
+            &cpm_uart_ports[cpm_uart_port_map[co->index]];
+        unsigned int i;
+        volatile cbd_t *bdp, *bdbase;
+        volatile unsigned char *cp;
+
+        /* Get the address of the host memory buffer.
+         */
+        bdp = pinfo->tx_cur;
+        bdbase = pinfo->tx_bd_base;
+
+        /*
+         * Now, do each character.  This is not as bad as it looks
+         * since this is a holding FIFO and not a transmitting FIFO.
+         * We could add the complexity of filling the entire transmit
+         * buffer, but we would just wait longer between accesses......
+         */
+        for (i = 0; i < count; i++, s++) {
+                /* Wait for transmitter fifo to empty.
+                 * Ready indicates output is ready, and xmt is doing
+                 * that, not that it is ready for us to send.
+                 */
+                while ((bdp->cbd_sc & BD_SC_READY) != 0)
+                        ;
+
+                /* Send the character out.
+                 * If the buffer address is in the CPM DPRAM, don't
+                 * convert it.
+                 */
+                if ((uint) (bdp->cbd_bufaddr) > (uint) CPM_ADDR)
+                        cp = (unsigned char *) (bdp->cbd_bufaddr);
+                else
+                        cp = bus_to_virt(bdp->cbd_bufaddr);
+                
+                *cp = *s;
+
+                bdp->cbd_datlen = 1;
+                bdp->cbd_sc |= BD_SC_READY;
+
+                if (bdp->cbd_sc & BD_SC_WRAP)
+                        bdp = bdbase;
+                else
+                        bdp++;
+
+                /* if a LF, also do CR... */
+                if (*s == 10) {
+                        while ((bdp->cbd_sc & BD_SC_READY) != 0)
+                                ;
+
+                        if ((uint) (bdp->cbd_bufaddr) > (uint) CPM_ADDR)
+                                cp = (unsigned char *) (bdp->cbd_bufaddr);
+                        else
+                                cp = bus_to_virt(bdp->cbd_bufaddr);
+
+                        *cp = 13;
+                        bdp->cbd_datlen = 1;
+                        bdp->cbd_sc |= BD_SC_READY;
+
+                        if (bdp->cbd_sc & BD_SC_WRAP)
+                                bdp = bdbase;
+                        else
+                                bdp++;
+                }
+        }
+
+        /*
+         * Finally, Wait for transmitter & holding register to empty
+         *  and restore the IER
+         */
+        while ((bdp->cbd_sc & BD_SC_READY) != 0)
+                ;
+
+        pinfo->tx_cur = (volatile cbd_t *) bdp;
+}
+
+/*
+ * Setup console. Be careful is called early !
+ */
+static int __init cpm_uart_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        struct uart_cpm_port *pinfo;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+        int ret;
+
+        port =
+            (struct uart_port *)&cpm_uart_ports[cpm_uart_port_map[co->index]];
+        pinfo = (struct uart_cpm_port *)port;
+        
+        pinfo->flags |= FLAG_CONSOLE;
+
+        if (options) {
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        } else {
+                bd_t *bd = (bd_t *) __res;
+
+                if (bd->bi_baudrate)
+                        baud = bd->bi_baudrate;
+                else
+                        baud = 9600;
+        }
+
+        /*
+         * Setup any port IO, connect any baud rate generators,
+         * etc.  This is expected to be handled by board
+         * dependant code 
+         */
+        if (pinfo->set_lineif)
+                pinfo->set_lineif(pinfo);
+
+        if (IS_SMC(pinfo)) {
+                pinfo->smcp->smc_smcm &= ~(SMCM_RX | SMCM_TX);
+                pinfo->smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        } else {
+                pinfo->sccp->scc_sccm &= ~(UART_SCCM_TX | UART_SCCM_RX);
+                pinfo->sccp->scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        }
+
+        ret = cpm_uart_allocbuf(pinfo, 1);
+
+        if (ret)
+                return ret;
+
+        cpm_uart_initbd(pinfo);
+
+        if (IS_SMC(pinfo))
+                cpm_uart_init_smc(pinfo);
+        else
+                cpm_uart_init_scc(pinfo);
+
+        uart_set_options(port, co, baud, parity, bits, flow);
+
+        return 0;
+}
+
+extern struct uart_driver cpm_reg;
+static struct console cpm_scc_uart_console = {
+        .name           "ttyCPM",
+        .write          cpm_uart_console_write,
+        .device         uart_console_device,
+        .setup          cpm_uart_console_setup,
+        .flags          CON_PRINTBUFFER,
+        .index          -1,
+        .data           = &cpm_reg,
+};
+
+int __init cpm_uart_console_init(void)
+{
+        int ret = cpm_uart_init_portdesc();
+
+        if (!ret)
+                register_console(&cpm_scc_uart_console);
+        return ret;
+}
+
+console_initcall(cpm_uart_console_init);
+
+#define CPM_UART_CONSOLE        &cpm_scc_uart_console
+#else
+#define CPM_UART_CONSOLE        NULL
+#endif
+
+static struct uart_driver cpm_reg = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "ttyCPM",
+        .dev_name       = "ttyCPM",
+        .major          = SERIAL_CPM_MAJOR,
+        .minor          = SERIAL_CPM_MINOR,
+        .cons           = CPM_UART_CONSOLE,
+};
+
+static int __init cpm_uart_init(void)
+{
+        int ret, i;
+
+        printk(KERN_INFO "Serial: CPM driver $Revision: 0.01 $\n");
+
+#ifndef CONFIG_SERIAL_CPM_CONSOLE
+        ret = cpm_uart_init_portdesc();
+        if (ret)
+                return ret;
+#endif
+
+        cpm_reg.nr = cpm_uart_nr;
+        ret = uart_register_driver(&cpm_reg);
+
+        if (ret)
+                return ret;
+
+        for (i = 0; i < cpm_uart_nr; i++) {
+                int con = cpm_uart_port_map[i];
+                cpm_uart_ports[con].port.line = i;
+                cpm_uart_ports[con].port.flags = UPF_BOOT_AUTOCONF;
+                uart_add_one_port(&cpm_reg, &cpm_uart_ports[con].port);
+        }
+
+        return ret;
+}
+
+static void __exit cpm_uart_exit(void)
+{
+        int i;
+
+        for (i = 0; i < cpm_uart_nr; i++) {
+                int con = cpm_uart_port_map[i];
+                uart_remove_one_port(&cpm_reg, &cpm_uart_ports[con].port);
+        }
+
+        uart_unregister_driver(&cpm_reg);
+}
+
+module_init(cpm_uart_init);
+module_exit(cpm_uart_exit);
+
+MODULE_AUTHOR("Kumar Gala/Antoniou Pantelis");
+MODULE_DESCRIPTION("CPM SCC/SMC port driver $Revision: 0.01 $");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV(SERIAL_CPM_MAJOR, SERIAL_CPM_MINOR);
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
new file mode 100644
index 000000000000..de26cf7b003c
--- /dev/null
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -0,0 +1,290 @@
+/*
+ *  linux/drivers/serial/cpm_uart.c
+ *
+ *  Driver for CPM (SCC/SMC) serial ports; CPM1 definitions
+ *
+ *  Maintainer: Kumar Gala (kumar.gala@freescale.com) (CPM2)
+ *              Pantelis Antoniou (panto@intracom.gr) (CPM1)
+ * 
+ *  Copyright (C) 2004 Freescale Semiconductor, Inc.
+ *            (C) 2004 Intracom, S.A.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/bootmem.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include <linux/serial_core.h>
+#include <linux/kernel.h>
+
+#include "cpm_uart.h"
+
+/**************************************************************/
+
+void cpm_line_cr_cmd(int line, int cmd)
+{
+        ushort val;
+        volatile cpm8xx_t *cp = cpmp;
+
+        switch (line) {
+        case UART_SMC1:
+                val = mk_cr_cmd(CPM_CR_CH_SMC1, cmd) | CPM_CR_FLG;
+                break;
+        case UART_SMC2:
+                val = mk_cr_cmd(CPM_CR_CH_SMC2, cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC1:
+                val = mk_cr_cmd(CPM_CR_CH_SCC1, cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC2:
+                val = mk_cr_cmd(CPM_CR_CH_SCC2, cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC3:
+                val = mk_cr_cmd(CPM_CR_CH_SCC3, cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC4:
+                val = mk_cr_cmd(CPM_CR_CH_SCC4, cmd) | CPM_CR_FLG;
+                break;
+        default:
+                return;
+
+        }
+        cp->cp_cpcr = val;
+        while (cp->cp_cpcr & CPM_CR_FLG) ;
+}
+
+void smc1_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile cpm8xx_t *cp = cpmp;
+        unsigned int iobits = 0x000000c0;
+
+        if (!pinfo->is_portb) {
+                cp->cp_pbpar |= iobits;
+                cp->cp_pbdir &= ~iobits;
+                cp->cp_pbodr &= ~iobits;
+        } else {
+                ((immap_t *)IMAP_ADDR)->im_ioport.iop_papar |= iobits;
+                ((immap_t *)IMAP_ADDR)->im_ioport.iop_padir &= ~iobits;
+                ((immap_t *)IMAP_ADDR)->im_ioport.iop_paodr &= ~iobits;
+        }
+
+        pinfo->brg = 1;
+}
+
+void smc2_lineif(struct uart_cpm_port *pinfo)
+{
+        /* XXX SMC2: insert port configuration here */
+        pinfo->brg = 2;
+}
+
+void scc1_lineif(struct uart_cpm_port *pinfo)
+{
+        /* XXX SCC1: insert port configuration here */
+        pinfo->brg = 1;
+}
+
+void scc2_lineif(struct uart_cpm_port *pinfo)
+{
+        /* XXX SCC2: insert port configuration here */
+        pinfo->brg = 2;
+}
+
+void scc3_lineif(struct uart_cpm_port *pinfo)
+{
+        /* XXX SCC3: insert port configuration here */
+        pinfo->brg = 3;
+}
+
+void scc4_lineif(struct uart_cpm_port *pinfo)
+{
+        /* XXX SCC4: insert port configuration here */
+        pinfo->brg = 4;
+}
+
+/*
+ * Allocate DP-Ram and memory buffers. We need to allocate a transmit and 
+ * receive buffer descriptors from dual port ram, and a character
+ * buffer area from host mem. If we are allocating for the console we need
+ * to do it from bootmem
+ */
+int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
+{
+        int dpmemsz, memsz;
+        u8 *dp_mem;
+        uint dp_offset;
+        u8 *mem_addr;
+        dma_addr_t dma_addr = 0;
+
+        pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);
+
+        dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
+        dp_offset = cpm_dpalloc(dpmemsz, 8);
+        if (IS_DPERR(dp_offset)) {
+                printk(KERN_ERR
+                       "cpm_uart_cpm1.c: could not allocate buffer descriptors\n");
+                return -ENOMEM;
+        }
+        dp_mem = cpm_dpram_addr(dp_offset);
+
+        memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
+            L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
+        if (is_con) {
+                mem_addr = (u8 *) m8xx_cpm_hostalloc(memsz);
+                dma_addr = 0;
+        } else
+                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                                              GFP_KERNEL);
+
+        if (mem_addr == NULL) {
+                cpm_dpfree(dp_offset);
+                printk(KERN_ERR
+                       "cpm_uart_cpm1.c: could not allocate coherent memory\n");
+                return -ENOMEM;
+        }
+
+        pinfo->dp_addr = dp_offset;
+        pinfo->mem_addr = mem_addr;
+        pinfo->dma_addr = dma_addr;
+
+        pinfo->rx_buf = mem_addr;
+        pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos
+                                                       * pinfo->rx_fifosize);
+
+        pinfo->rx_bd_base = (volatile cbd_t *)dp_mem;
+        pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;
+
+        return 0;
+}
+
+void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
+{
+        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                               pinfo->rx_fifosize) +
+                          L1_CACHE_ALIGN(pinfo->tx_nrfifos *
+                                         pinfo->tx_fifosize), pinfo->mem_addr,
+                          pinfo->dma_addr);
+
+        cpm_dpfree(pinfo->dp_addr);
+}
+
+/* Setup any dynamic params in the uart desc */
+int cpm_uart_init_portdesc(void)
+{
+        pr_debug("CPM uart[-]:init portdesc\n");
+
+        cpm_uart_nr = 0;
+#ifdef CONFIG_SERIAL_CPM_SMC1
+        cpm_uart_ports[UART_SMC1].smcp = &cpmp->cp_smc[0];
+/*
+ *  Is SMC1 being relocated?
+ */
+# ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH
+        cpm_uart_ports[UART_SMC1].smcup =
+            (smc_uart_t *) & cpmp->cp_dparam[0x3C0];
+# else
+        cpm_uart_ports[UART_SMC1].smcup =
+            (smc_uart_t *) & cpmp->cp_dparam[PROFF_SMC1];
+# endif
+        cpm_uart_ports[UART_SMC1].port.mapbase =
+            (unsigned long)&cpmp->cp_smc[0];
+        cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
+        cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SMC2
+        cpm_uart_ports[UART_SMC2].smcp = &cpmp->cp_smc[1];
+        cpm_uart_ports[UART_SMC2].smcup =
+            (smc_uart_t *) & cpmp->cp_dparam[PROFF_SMC2];
+        cpm_uart_ports[UART_SMC2].port.mapbase =
+            (unsigned long)&cpmp->cp_smc[1];
+        cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
+        cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC1
+        cpm_uart_ports[UART_SCC1].sccp = &cpmp->cp_scc[0];
+        cpm_uart_ports[UART_SCC1].sccup =
+            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC1];
+        cpm_uart_ports[UART_SCC1].port.mapbase =
+            (unsigned long)&cpmp->cp_scc[0];
+        cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC2
+        cpm_uart_ports[UART_SCC2].sccp = &cpmp->cp_scc[1];
+        cpm_uart_ports[UART_SCC2].sccup =
+            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC2];
+        cpm_uart_ports[UART_SCC2].port.mapbase =
+            (unsigned long)&cpmp->cp_scc[1];
+        cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC3
+        cpm_uart_ports[UART_SCC3].sccp = &cpmp->cp_scc[2];
+        cpm_uart_ports[UART_SCC3].sccup =
+            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC3];
+        cpm_uart_ports[UART_SCC3].port.mapbase =
+            (unsigned long)&cpmp->cp_scc[2];
+        cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC4
+        cpm_uart_ports[UART_SCC4].sccp = &cpmp->cp_scc[3];
+        cpm_uart_ports[UART_SCC4].sccup =
+            (scc_uart_t *) & cpmp->cp_dparam[PROFF_SCC4];
+        cpm_uart_ports[UART_SCC4].port.mapbase =
+            (unsigned long)&cpmp->cp_scc[3];
+        cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
+#endif
+        return 0;
+}
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
new file mode 100644
index 000000000000..5d867ab581b7
--- /dev/null
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -0,0 +1,45 @@
+/*
+ * linux/drivers/serial/cpm_uart_cpm1.h
+ *
+ * Driver for CPM (SCC/SMC) serial ports
+ * 
+ * definitions for cpm1
+ *
+ */
+
+#ifndef CPM_UART_CPM1_H
+#define CPM_UART_CPM1_H
+
+#include <asm/commproc.h>
+
+/* defines for IRQs */
+#define SMC1_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SMC1)
+#define SMC2_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SMC2)
+#define SCC1_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SCC1)
+#define SCC2_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SCC2)
+#define SCC3_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SCC3)
+#define SCC4_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SCC4)
+
+/* the CPM address */
+#define CPM_ADDR        IMAP_ADDR
+
+static inline void cpm_set_brg(int brg, int baud)
+{
+        cpm_setbrg(brg, baud);
+}
+
+static inline void cpm_set_scc_fcr(volatile scc_uart_t * sup)
+{
+        sup->scc_genscc.scc_rfcr = SMC_EB;
+        sup->scc_genscc.scc_tfcr = SMC_EB;
+}
+
+static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
+{
+        up->smc_rfcr = SMC_EB;
+        up->smc_tfcr = SMC_EB;
+}
+
+#define DPRAM_BASE      ((unsigned char *)&cpmp->cp_dpmem[0])
+
+#endif
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
new file mode 100644
index 000000000000..b422c3abfba6
--- /dev/null
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -0,0 +1,328 @@
+/*
+ *  linux/drivers/serial/cpm_uart_cpm2.c
+ *
+ *  Driver for CPM (SCC/SMC) serial ports; CPM2 definitions
+ *
+ *  Maintainer: Kumar Gala (kumar.gala@freescale.com) (CPM2)
+ *              Pantelis Antoniou (panto@intracom.gr) (CPM1)
+ * 
+ *  Copyright (C) 2004 Freescale Semiconductor, Inc.
+ *            (C) 2004 Intracom, S.A.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/bootmem.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include <linux/serial_core.h>
+#include <linux/kernel.h>
+
+#include "cpm_uart.h"
+
+/**************************************************************/
+
+void cpm_line_cr_cmd(int line, int cmd)
+{
+        volatile cpm_cpm2_t *cp = cpmp;
+        ulong val;
+
+        switch (line) {
+        case UART_SMC1:
+                val = mk_cr_cmd(CPM_CR_SMC1_PAGE, CPM_CR_SMC1_SBLOCK, 0,
+                                cmd) | CPM_CR_FLG;
+                break;
+        case UART_SMC2:
+                val = mk_cr_cmd(CPM_CR_SMC2_PAGE, CPM_CR_SMC2_SBLOCK, 0,
+                                cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC1:
+                val = mk_cr_cmd(CPM_CR_SCC1_PAGE, CPM_CR_SCC1_SBLOCK, 0,
+                                cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC2:
+                val = mk_cr_cmd(CPM_CR_SCC2_PAGE, CPM_CR_SCC2_SBLOCK, 0,
+                                cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC3:
+                val = mk_cr_cmd(CPM_CR_SCC3_PAGE, CPM_CR_SCC3_SBLOCK, 0,
+                                cmd) | CPM_CR_FLG;
+                break;
+        case UART_SCC4:
+                val = mk_cr_cmd(CPM_CR_SCC4_PAGE, CPM_CR_SCC4_SBLOCK, 0,
+                                cmd) | CPM_CR_FLG;
+                break;
+        default:
+                return;
+
+        }
+        cp->cp_cpcr = val;
+        while (cp->cp_cpcr & CPM_CR_FLG) ;
+}
+
+void smc1_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+
+        /* SMC1 is only on port D */
+        io->iop_ppard |= 0x00c00000;
+        io->iop_pdird |= 0x00400000;
+        io->iop_pdird &= ~0x00800000;
+        io->iop_psord &= ~0x00c00000;
+
+        /* Wire BRG1 to SMC1 */
+        cpm2_immr->im_cpmux.cmx_smr &= 0x0f;
+        pinfo->brg = 1;
+}
+
+void smc2_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+
+        /* SMC2 is only on port A */
+        io->iop_ppara |= 0x00c00000;
+        io->iop_pdira |= 0x00400000;
+        io->iop_pdira &= ~0x00800000;
+        io->iop_psora &= ~0x00c00000;
+
+        /* Wire BRG2 to SMC2 */
+        cpm2_immr->im_cpmux.cmx_smr &= 0xf0;
+        pinfo->brg = 2;
+}
+
+void scc1_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+
+        /* Use Port D for SCC1 instead of other functions.  */
+        io->iop_ppard |= 0x00000003;
+        io->iop_psord &= ~0x00000001;   /* Rx */
+        io->iop_psord |= 0x00000002;    /* Tx */
+        io->iop_pdird &= ~0x00000001;   /* Rx */
+        io->iop_pdird |= 0x00000002;    /* Tx */
+
+        /* Wire BRG1 to SCC1 */
+        cpm2_immr->im_cpmux.cmx_scr &= 0x00ffffff;
+        cpm2_immr->im_cpmux.cmx_scr |= 0x00000000;
+        pinfo->brg = 1;
+}
+
+void scc2_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        io->iop_pparb |= 0x008b0000;
+        io->iop_pdirb |= 0x00880000;
+        io->iop_psorb |= 0x00880000;
+        io->iop_pdirb &= ~0x00030000;
+        io->iop_psorb &= ~0x00030000;
+        cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
+        cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
+        pinfo->brg = 2;
+}
+
+void scc3_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        io->iop_pparb |= 0x008b0000;
+        io->iop_pdirb |= 0x00880000;
+        io->iop_psorb |= 0x00880000;
+        io->iop_pdirb &= ~0x00030000;
+        io->iop_psorb &= ~0x00030000;
+        cpm2_immr->im_cpmux.cmx_scr &= 0xffff00ff;
+        cpm2_immr->im_cpmux.cmx_scr |= 0x00001200;
+        pinfo->brg = 3;
+}
+
+void scc4_lineif(struct uart_cpm_port *pinfo)
+{
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+
+        io->iop_ppard |= 0x00000600;
+        io->iop_psord &= ~0x00000600;   /* Tx/Rx */
+        io->iop_pdird &= ~0x00000200;   /* Rx */
+        io->iop_pdird |= 0x00000400;    /* Tx */
+
+        cpm2_immr->im_cpmux.cmx_scr &= 0xffffff00;
+        cpm2_immr->im_cpmux.cmx_scr |= 0x0000001b;
+        pinfo->brg = 4;
+}
+
+/*
+ * Allocate DP-Ram and memory buffers. We need to allocate a transmit and 
+ * receive buffer descriptors from dual port ram, and a character
+ * buffer area from host mem. If we are allocating for the console we need
+ * to do it from bootmem
+ */
+int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
+{
+        int dpmemsz, memsz;
+        u8 *dp_mem;
+        uint dp_offset;
+        u8 *mem_addr;
+        dma_addr_t dma_addr = 0;
+
+        pr_debug("CPM uart[%d]:allocbuf\n", pinfo->port.line);
+
+        dpmemsz = sizeof(cbd_t) * (pinfo->rx_nrfifos + pinfo->tx_nrfifos);
+        dp_offset = cpm_dpalloc(dpmemsz, 8);
+        if (IS_DPERR(dp_offset)) {
+                printk(KERN_ERR
+                       "cpm_uart_cpm.c: could not allocate buffer descriptors\n");
+                return -ENOMEM;
+        }
+
+        dp_mem = cpm_dpram_addr(dp_offset);
+
+        memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
+            L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
+        if (is_con)
+                mem_addr = alloc_bootmem(memsz);
+        else
+                mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
+                                              GFP_KERNEL);
+
+        if (mem_addr == NULL) {
+                cpm_dpfree(dp_offset);
+                printk(KERN_ERR
+                       "cpm_uart_cpm.c: could not allocate coherent memory\n");
+                return -ENOMEM;
+        }
+
+        pinfo->dp_addr = dp_offset;
+        pinfo->mem_addr = mem_addr;
+        pinfo->dma_addr = dma_addr;
+
+        pinfo->rx_buf = mem_addr;
+        pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos
+                                                       * pinfo->rx_fifosize);
+
+        pinfo->rx_bd_base = (volatile cbd_t *)dp_mem;
+        pinfo->tx_bd_base = pinfo->rx_bd_base + pinfo->rx_nrfifos;
+
+        return 0;
+}
+
+void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
+{
+        dma_free_coherent(NULL, L1_CACHE_ALIGN(pinfo->rx_nrfifos *
+                                               pinfo->rx_fifosize) +
+                          L1_CACHE_ALIGN(pinfo->tx_nrfifos *
+                                         pinfo->tx_fifosize), pinfo->mem_addr,
+                          pinfo->dma_addr);
+
+        cpm_dpfree(pinfo->dp_addr);
+}
+
+/* Setup any dynamic params in the uart desc */
+int cpm_uart_init_portdesc(void)
+{
+        pr_debug("CPM uart[-]:init portdesc\n");
+
+        cpm_uart_nr = 0;
+#ifdef CONFIG_SERIAL_CPM_SMC1
+        cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];
+        cpm_uart_ports[UART_SMC1].smcup =
+            (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];
+        cpm_uart_ports[UART_SMC1].port.mapbase =
+            (unsigned long)&cpm2_immr->im_smc[0];
+        cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
+        cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SMC2
+        cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];
+        cpm_uart_ports[UART_SMC2].smcup =
+            (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];
+        cpm_uart_ports[UART_SMC2].port.mapbase =
+            (unsigned long)&cpm2_immr->im_smc[1];
+        cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
+        cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
+        cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC1
+        cpm_uart_ports[UART_SCC1].sccp = (scc_t *) & cpm2_immr->im_scc[0];
+        cpm_uart_ports[UART_SCC1].sccup =
+            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC1];
+        cpm_uart_ports[UART_SCC1].port.mapbase =
+            (unsigned long)&cpm2_immr->im_scc[0];
+        cpm_uart_ports[UART_SCC1].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC2
+        cpm_uart_ports[UART_SCC2].sccp = (scc_t *) & cpm2_immr->im_scc[1];
+        cpm_uart_ports[UART_SCC2].sccup =
+            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC2];
+        cpm_uart_ports[UART_SCC2].port.mapbase =
+            (unsigned long)&cpm2_immr->im_scc[1];
+        cpm_uart_ports[UART_SCC2].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC3
+        cpm_uart_ports[UART_SCC3].sccp = (scc_t *) & cpm2_immr->im_scc[2];
+        cpm_uart_ports[UART_SCC3].sccup =
+            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC3];
+        cpm_uart_ports[UART_SCC3].port.mapbase =
+            (unsigned long)&cpm2_immr->im_scc[2];
+        cpm_uart_ports[UART_SCC3].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SCC4
+        cpm_uart_ports[UART_SCC4].sccp = (scc_t *) & cpm2_immr->im_scc[3];
+        cpm_uart_ports[UART_SCC4].sccup =
+            (scc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SCC4];
+        cpm_uart_ports[UART_SCC4].port.mapbase =
+            (unsigned long)&cpm2_immr->im_scc[3];
+        cpm_uart_ports[UART_SCC4].sccp->scc_sccm &=
+            ~(UART_SCCM_TX | UART_SCCM_RX);
+        cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
+            ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+        cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
+#endif
+
+        return 0;
+}
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
new file mode 100644
index 000000000000..4793fecf8ece
--- /dev/null
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -0,0 +1,45 @@
+/*
+ * linux/drivers/serial/cpm_uart_cpm2.h
+ *
+ * Driver for CPM (SCC/SMC) serial ports
+ * 
+ * definitions for cpm2
+ *
+ */
+
+#ifndef CPM_UART_CPM2_H
+#define CPM_UART_CPM2_H
+
+#include <asm/cpm2.h>
+
+/* defines for IRQs */
+#define SMC1_IRQ        SIU_INT_SMC1
+#define SMC2_IRQ        SIU_INT_SMC2
+#define SCC1_IRQ        SIU_INT_SCC1
+#define SCC2_IRQ        SIU_INT_SCC2
+#define SCC3_IRQ        SIU_INT_SCC3
+#define SCC4_IRQ        SIU_INT_SCC4
+
+/* the CPM address */
+#define CPM_ADDR        CPM_MAP_ADDR
+
+static inline void cpm_set_brg(int brg, int baud)
+{
+        cpm_setbrg(brg, baud);
+}
+
+static inline void cpm_set_scc_fcr(volatile scc_uart_t * sup)
+{
+        sup->scc_genscc.scc_rfcr = CPMFCR_GBL | CPMFCR_EB;
+        sup->scc_genscc.scc_tfcr = CPMFCR_GBL | CPMFCR_EB;
+}
+
+static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
+{
+        up->smc_rfcr = CPMFCR_GBL | CPMFCR_EB;
+        up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
+}
+
+#define DPRAM_BASE      ((unsigned char *)&cpm2_immr->im_dprambase[0])
+
+#endif
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
new file mode 100644
index 000000000000..3da5494953af
--- /dev/null
+++ b/drivers/serial/crisv10.c
@@ -0,0 +1,5059 @@
+/* $Id: serial.c,v 1.25 2004/09/29 10:33:49 starvik Exp $
+ *
+ * Serial port driver for the ETRAX 100LX chip
+ *
+ *    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Axis Communications AB
+ *
+ *    Many, many authors. Based once upon a time on serial.c for 16x50.
+ *
+ * $Log: serial.c,v $
+ * Revision 1.25  2004/09/29 10:33:49  starvik
+ * Resolved a dealock when printing debug from kernel.
+ *
+ * Revision 1.24  2004/08/27 23:25:59  johana
+ * rs_set_termios() must call change_speed() if c_iflag has changed or
+ * automatic XOFF handling will be enabled and transmitter will stop
+ * if 0x13 is received.
+ *
+ * Revision 1.23  2004/08/24 06:57:13  starvik
+ * More whitespace cleanup
+ *
+ * Revision 1.22  2004/08/24 06:12:20  starvik
+ * Whitespace cleanup
+ *
+ * Revision 1.20  2004/05/24 12:00:20  starvik
+ * Big merge of stuff from Linux 2.4 (e.g. manual mode for the serial port).
+ *
+ * Revision 1.19  2004/05/17 13:12:15  starvik
+ * Kernel console hook
+ * Big merge from Linux 2.4 still pending.
+ *
+ * Revision 1.18  2003/10/28 07:18:30  starvik
+ * Compiles with debug info
+ *
+ * Revision 1.17  2003/07/04 08:27:37  starvik
+ * Merge of Linux 2.5.74
+ *
+ * Revision 1.16  2003/06/13 10:05:19  johana
+ * Help the user to avoid trouble by:
+ * Forcing mixed mode for status/control lines if not all pins are used.
+ *
+ * Revision 1.15  2003/06/13 09:43:01  johana
+ * Merged in the following changes from os/linux/arch/cris/drivers/serial.c
+ * + some minor changes to reduce diff.
+ *
+ * Revision 1.49  2003/05/30 11:31:54  johana
+ * Merged in change-branch--serial9bit that adds CMSPAR support for sticky
+ * parity (mark/space)
+ *
+ * Revision 1.48  2003/05/30 11:03:57  johana
+ * Implemented rs_send_xchar() by disabling the DMA and writing manually.
+ * Added e100_disable_txdma_channel() and e100_enable_txdma_channel().
+ * Fixed rs_throttle() and rs_unthrottle() to properly call rs_send_xchar
+ * instead of setting info->x_char and check the CRTSCTS flag before
+ * controlling the rts pin.
+ *
+ * Revision 1.14  2003/04/09 08:12:44  pkj
+ * Corrected typo changes made upstream.
+ *
+ * Revision 1.13  2003/04/09 05:20:47  starvik
+ * Merge of Linux 2.5.67
+ *
+ * Revision 1.11  2003/01/22 06:48:37  starvik
+ * Fixed warnings issued by GCC 3.2.1
+ *
+ * Revision 1.9  2002/12/13 09:07:47  starvik
+ * Alert user that RX_TIMEOUT_TICKS==0 doesn't work
+ *
+ * Revision 1.8  2002/12/11 13:13:57  starvik
+ * Added arch/ to v10 specific includes
+ * Added fix from Linux 2.4 in serial.c (flush_to_flip_buffer)
+ *
+ * Revision 1.7  2002/12/06 07:13:57  starvik
+ * Corrected work queue stuff
+ * Removed CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST
+ *
+ * Revision 1.6  2002/11/21 07:17:46  starvik
+ * Change static inline to extern inline where otherwise outlined with gcc-3.2
+ *
+ * Revision 1.5  2002/11/14 15:59:49  starvik
+ * Linux 2.5 port of the latest serial driver from 2.4. The work queue stuff
+ * probably doesn't work yet.
+ *
+ * Revision 1.42  2002/11/05 09:08:47  johana
+ * Better implementation of rs_stop() and rs_start() that uses the XOFF
+ * register to start/stop transmission.
+ * change_speed() also initilises XOFF register correctly so that
+ * auto_xoff is enabled when IXON flag is set by user.
+ * This gives fast XOFF response times.
+ *
+ * Revision 1.41  2002/11/04 18:40:57  johana
+ * Implemented rs_stop() and rs_start().
+ * Simple tests using hwtestserial indicates that this should be enough
+ * to make it work.
+ *
+ * Revision 1.40  2002/10/14 05:33:18  starvik
+ * RS-485 uses fast timers even if SERIAL_FAST_TIMER is disabled
+ *
+ * Revision 1.39  2002/09/30 21:00:57  johana
+ * Support for CONFIG_ETRAX_SERx_DTR_RI_DSR_CD_MIXED where the status and
+ * control pins can be mixed between PA and PB.
+ * If no serial port uses MIXED old solution is used
+ * (saves a few bytes and cycles).
+ * control_pins struct uses masks instead of bit numbers.
+ * Corrected dummy values and polarity in line_info() so
+ * /proc/tty/driver/serial is now correct.
+ * (the E100_xxx_GET() macros is really active low - perhaps not obvious)
+ *
+ * Revision 1.38  2002/08/23 11:01:36  starvik
+ * Check that serial port is enabled in all interrupt handlers to avoid
+ * restarts of DMA channels not assigned to serial ports
+ *
+ * Revision 1.37  2002/08/13 13:02:37  bjornw
+ * Removed some warnings because of unused code
+ *
+ * Revision 1.36  2002/08/08 12:50:01  starvik
+ * Serial interrupt is shared with synchronous serial port driver
+ *
+ * Revision 1.35  2002/06/03 10:40:49  starvik
+ * Increased RS-485 RTS toggle timer to 2 characters
+ *
+ * Revision 1.34  2002/05/28 18:59:36  johana
+ * Whitespace and comment fixing to be more like etrax100ser.c 1.71.
+ *
+ * Revision 1.33  2002/05/28 17:55:43  johana
+ * RS-485 uses FAST_TIMER if enabled, and starts a short (one char time)
+ * timer from tranismit_chars (interrupt context).
+ * The timer toggles RTS in interrupt context when expired giving minimum
+ * latencies.
+ *
+ * Revision 1.32  2002/05/22 13:58:00  johana
+ * Renamed rs_write() to raw_write() and made it inline.
+ * New rs_write() handles RS-485 if configured and enabled
+ * (moved code from e100_write_rs485()).
+ * RS-485 ioctl's uses copy_from_user() instead of verify_area().
+ *
+ * Revision 1.31  2002/04/22 11:20:03  johana
+ * Updated copyright years.
+ *
+ * Revision 1.30  2002/04/22 09:39:12  johana
+ * RS-485 support compiles.
+ *
+ * Revision 1.29  2002/01/14 16:10:01  pkj
+ * Allocate the receive buffers dynamically. The static 4kB buffer was
+ * too small for the peaks. This means that we can get rid of the extra
+ * buffer and the copying to it. It also means we require less memory
+ * under normal operations, but can use more when needed (there is a
+ * cap at 64kB for safety reasons). If there is no memory available
+ * we panic(), and die a horrible death...
+ *
+ * Revision 1.28  2001/12/18 15:04:53  johana
+ * Cleaned up write_rs485() - now it works correctly without padding extra
+ * char.
+ * Added sane default initialisation of rs485.
+ * Added #ifdef around dummy variables.
+ *
+ * Revision 1.27  2001/11/29 17:00:41  pkj
+ * 2kB seems to be too small a buffer when using 921600 bps,
+ * so increase it to 4kB (this was already done for the elinux
+ * version of the serial driver).
+ *
+ * Revision 1.26  2001/11/19 14:20:41  pkj
+ * Minor changes to comments and unused code.
+ *
+ * Revision 1.25  2001/11/12 20:03:43  pkj
+ * Fixed compiler warnings.
+ *
+ * Revision 1.24  2001/11/12 15:10:05  pkj
+ * Total redesign of the receiving part of the serial driver.
+ * Uses eight chained descriptors to write to a 4kB buffer.
+ * This data is then serialised into a 2kB buffer. From there it
+ * is copied into the TTY's flip buffers when they become available.
+ * A lot of copying, and the sizes of the buffers might need to be
+ * tweaked, but all in all it should work better than the previous
+ * version, without the need to modify the TTY code in any way.
+ * Also note that erroneous bytes are now correctly marked in the
+ * flag buffers (instead of always marking the first byte).
+ *
+ * Revision 1.23  2001/10/30 17:53:26  pkj
+ * * Set info->uses_dma to 0 when a port is closed.
+ * * Mark the timer1 interrupt as a fast one (SA_INTERRUPT).
+ * * Call start_flush_timer() in start_receive() if
+ *   CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is defined.
+ *
+ * Revision 1.22  2001/10/30 17:44:03  pkj
+ * Use %lu for received and transmitted counters in line_info().
+ *
+ * Revision 1.21  2001/10/30 17:40:34  pkj
+ * Clean-up. The only change to functionality is that
+ * CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS(=5) is used instead of
+ * MAX_FLUSH_TIME(=8).
+ *
+ * Revision 1.20  2001/10/30 15:24:49  johana
+ * Added char_time stuff from 2.0 driver.
+ *
+ * Revision 1.19  2001/10/30 15:23:03  johana
+ * Merged with 1.13.2 branch + fixed indentation
+ * and changed CONFIG_ETRAX100_XYS to CONFIG_ETRAX_XYZ
+ *
+ * Revision 1.18  2001/09/24 09:27:22  pkj
+ * Completed ext_baud_table[] in cflag_to_baud() and cflag_to_etrax_baud().
+ *
+ * Revision 1.17  2001/08/24 11:32:49  ronny
+ * More fixes for the CONFIG_ETRAX_SERIAL_PORT0 define.
+ *
+ * Revision 1.16  2001/08/24 07:56:22  ronny
+ * Added config ifdefs around ser0 irq requests.
+ *
+ * Revision 1.15  2001/08/16 09:10:31  bjarne
+ * serial.c - corrected the initialization of rs_table, the wrong defines
+ *            where used.
+ *            Corrected a test in timed_flush_handler.
+ *            Changed configured to enabled.
+ * serial.h - Changed configured to enabled.
+ *
+ * Revision 1.14  2001/08/15 07:31:23  bjarne
+ * Introduced two new members to the e100_serial struct.
+ * configured - Will be set to 1 if the port has been configured in .config
+ * uses_dma   - Should be set to 1 if the port uses DMA. Currently it is set
+ *              to 1
+ *              when a port is opened. This is used to limit the DMA interrupt
+ *              routines to only manipulate DMA channels actually used by the
+ *              serial driver.
+ *
+ * Revision 1.13.2.2  2001/10/17 13:57:13  starvik
+ * Receiver was broken by the break fixes
+ *
+ * Revision 1.13.2.1  2001/07/20 13:57:39  ronny
+ * Merge with new stuff from etrax100ser.c. Works but haven't checked stuff
+ * like break handling.
+ *
+ * Revision 1.13  2001/05/09 12:40:31  johana
+ * Use DMA_NBR and IRQ_NBR defines from dma.h and irq.h
+ *
+ * Revision 1.12  2001/04/19 12:23:07  bjornw
+ * CONFIG_RS485 -> CONFIG_ETRAX_RS485
+ *
+ * Revision 1.11  2001/04/05 14:29:48  markusl
+ * Updated according to review remarks i.e.
+ * -Use correct types in port structure to avoid compiler warnings
+ * -Try to use IO_* macros whenever possible
+ * -Open should never return -EBUSY
+ *
+ * Revision 1.10  2001/03/05 13:14:07  bjornw
+ * Another spelling fix
+ *
+ * Revision 1.9  2001/02/23 13:46:38  bjornw
+ * Spellling check
+ *
+ * Revision 1.8  2001/01/23 14:56:35  markusl
+ * Made use of ser1 optional
+ * Needed by USB
+ *
+ * Revision 1.7  2001/01/19 16:14:48  perf
+ * Added kernel options for serial ports 234.
+ * Changed option names from CONFIG_ETRAX100_XYZ to CONFIG_ETRAX_XYZ.
+ *
+ * Revision 1.6  2000/11/22 16:36:09  bjornw
+ * Please marketing by using the correct case when spelling Etrax.
+ *
+ * Revision 1.5  2000/11/21 16:43:37  bjornw
+ * Fixed so it compiles under CONFIG_SVINTO_SIM
+ *
+ * Revision 1.4  2000/11/15 17:34:12  bjornw
+ * Added a timeout timer for flushing input channels. The interrupt-based
+ * fast flush system should be easy to merge with this later (works the same
+ * way, only with an irq instead of a system timer_list)
+ *
+ * Revision 1.3  2000/11/13 17:19:57  bjornw
+ * * Incredibly, this almost complete rewrite of serial.c worked (at least
+ *   for output) the first time.
+ *
+ *   Items worth noticing:
+ *
+ *      No Etrax100 port 1 workarounds (does only compile on 2.4 anyway now)
+ *      RS485 is not ported (why can't it be done in userspace as on x86 ?)
+ *      Statistics done through async_icount - if any more stats are needed,
+ *      that's the place to put them or in an arch-dep version of it.
+ *      timeout_interrupt and the other fast timeout stuff not ported yet
+ *      There be dragons in this 3k+ line driver
+ *
+ * Revision 1.2  2000/11/10 16:50:28  bjornw
+ * First shot at a 2.4 port, does not compile totally yet
+ *
+ * Revision 1.1  2000/11/10 16:47:32  bjornw
+ * Added verbatim copy of rev 1.49 etrax100ser.c from elinux
+ *
+ * Revision 1.49  2000/10/30 15:47:14  tobiasa
+ * Changed version number.
+ *
+ * Revision 1.48  2000/10/25 11:02:43  johana
+ * Changed %ul to %lu in printf's
+ *
+ * Revision 1.47  2000/10/18 15:06:53  pkj
+ * Compile correctly with CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST and
+ * CONFIG_ETRAX_SERIAL_PROC_ENTRY together.
+ * Some clean-up of the /proc/serial file.
+ *
+ * Revision 1.46  2000/10/16 12:59:40  johana
+ * Added CONFIG_ETRAX_SERIAL_PROC_ENTRY for statistics and debug info.
+ *
+ * Revision 1.45  2000/10/13 17:10:59  pkj
+ * Do not flush DMAs while flipping TTY buffers.
+ *
+ * Revision 1.44  2000/10/13 16:34:29  pkj
+ * Added a delay in ser_interrupt() for 2.3ms when an error is detected.
+ * We do not know why this delay is required yet, but without it the
+ * irmaflash program does not work (this was the program that needed
+ * the ser_interrupt() to be needed in the first place). This should not
+ * affect normal use of the serial ports.
+ *
+ * Revision 1.43  2000/10/13 16:30:44  pkj
+ * New version of the fast flush of serial buffers code. This time
+ * it is localized to the serial driver and uses a fast timer to
+ * do the work.
+ *
+ * Revision 1.42  2000/10/13 14:54:26  bennyo
+ * Fix for switching RTS when using rs485
+ *
+ * Revision 1.41  2000/10/12 11:43:44  pkj
+ * Cleaned up a number of comments.
+ *
+ * Revision 1.40  2000/10/10 11:58:39  johana
+ * Made RS485 support generic for all ports.
+ * Toggle rts in interrupt if no delay wanted.
+ * WARNING: No true transmitter empty check??
+ * Set d_wait bit when sending data so interrupt is delayed until
+ * fifo flushed. (Fix tcdrain() problem)
+ *
+ * Revision 1.39  2000/10/04 16:08:02  bjornw
+ * * Use virt_to_phys etc. for DMA addresses
+ * * Removed CONFIG_FLUSH_DMA_FAST hacks
+ * * Indentation fix
+ *
+ * Revision 1.38  2000/10/02 12:27:10  mattias
+ * * added variable used when using fast flush on serial dma.
+ *   (CONFIG_FLUSH_DMA_FAST)
+ *
+ * Revision 1.37  2000/09/27 09:44:24  pkj
+ * Uncomment definition of SERIAL_HANDLE_EARLY_ERRORS.
+ *
+ * Revision 1.36  2000/09/20 13:12:52  johana
+ * Support for CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS:
+ *   Number of timer ticks between flush of receive fifo (1 tick = 10ms).
+ *   Try 0-3 for low latency applications. Approx 5 for high load
+ *   applications (e.g. PPP). Maybe this should be more adaptive some day...
+ *
+ * Revision 1.35  2000/09/20 10:36:08  johana
+ * Typo in get_lsr_info()
+ *
+ * Revision 1.34  2000/09/20 10:29:59  johana
+ * Let rs_chars_in_buffer() check fifo content as well.
+ * get_lsr_info() might work now (not tested).
+ * Easier to change the port to debug.
+ *
+ * Revision 1.33  2000/09/13 07:52:11  torbjore
+ * Support RS485
+ *
+ * Revision 1.32  2000/08/31 14:45:37  bjornw
+ * After sending a break we need to reset the transmit DMA channel
+ *
+ * Revision 1.31  2000/06/21 12:13:29  johana
+ * Fixed wait for all chars sent when closing port.
+ * (Used to always take 1 second!)
+ * Added shadows for directions of status/ctrl signals.
+ *
+ * Revision 1.30  2000/05/29 16:27:55  bjornw
+ * Simulator ifdef moved a bit
+ *
+ * Revision 1.29  2000/05/09 09:40:30  mattias
+ * * Added description of dma registers used in timeout_interrupt
+ * * Removed old code
+ *
+ * Revision 1.28  2000/05/08 16:38:58  mattias
+ * * Bugfix for flushing fifo in timeout_interrupt
+ *   Problem occurs when bluetooth stack waits for a small number of bytes
+ *   containing an event acknowledging free buffers in bluetooth HW
+ *   As before, data was stuck in fifo until more data came on uart and
+ *   flushed it up to the stack.
+ *
+ * Revision 1.27  2000/05/02 09:52:28  jonasd
+ * Added fix for peculiar etrax behaviour when eop is forced on an empty
+ * fifo. This is used when flashing the IRMA chip. Disabled by default.
+ *
+ * Revision 1.26  2000/03/29 15:32:02  bjornw
+ * 2.0.34 updates
+ *
+ * Revision 1.25  2000/02/16 16:59:36  bjornw
+ * * Receive DMA directly into the flip-buffer, eliminating an intermediary
+ *   receive buffer and a memcpy. Will avoid some overruns.
+ * * Error message on debug port if an overrun or flip buffer overrun occurs.
+ * * Just use the first byte in the flag flip buffer for errors.
+ * * Check for timeout on the serial ports only each 5/100 s, not 1/100.
+ *
+ * Revision 1.24  2000/02/09 18:02:28  bjornw
+ * * Clear serial errors (overrun, framing, parity) correctly. Before, the
+ *   receiver would get stuck if an error occurred and we did not restart
+ *   the input DMA.
+ * * Cosmetics (indentation, some code made into inlines)
+ * * Some more debug options
+ * * Actually shut down the serial port (DMA irq, DMA reset, receiver stop)
+ *   when the last open is closed. Corresponding fixes in startup().
+ * * rs_close() "tx FIFO wait" code moved into right place, bug & -> && fixed
+ *   and make a special case out of port 1 (R_DMA_CHx_STATUS is broken for that)
+ * * e100_disable_rx/enable_rx just disables/enables the receiver, not RTS
+ *
+ * Revision 1.23  2000/01/24 17:46:19  johana
+ * Wait for flush of DMA/FIFO when closing port.
+ *
+ * Revision 1.22  2000/01/20 18:10:23  johana
+ * Added TIOCMGET ioctl to return modem status.
+ * Implemented modem status/control that works with the extra signals
+ * (DTR, DSR, RI,CD) as well.
+ * 3 different modes supported:
+ * ser0 on PB (Bundy), ser1 on PB (Lisa) and ser2 on PA (Bundy)
+ * Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when
+ * closing the last filehandle, NASTY!.
+ * Added break generation, not tested though!
+ * Use SA_SHIRQ when request_irq() for ser2 and ser3 (shared with) par0 and par1.
+ * You can't use them at the same time (yet..), but you can hopefully switch
+ * between ser2/par0, ser3/par1 with the same kernel config.
+ * Replaced some magic constants with defines
+ *
+ *
+ */
+
+static char *serial_version = "$Revision: 1.25 $";
+
+#include <linux/config.h>
+#include <linux/version.h>
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/fcntl.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <asm/uaccess.h>
+#include <linux/kernel.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/segment.h>
+#include <asm/bitops.h>
+#include <linux/delay.h>
+
+#include <asm/arch/svinto.h>
+
+/* non-arch dependent serial structures are in linux/serial.h */
+#include <linux/serial.h>
+/* while we keep our own stuff (struct e100_serial) in a local .h file */
+#include "serial.h"
+#include <asm/fasttimer.h>
+
+#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
+#ifndef CONFIG_ETRAX_FAST_TIMER
+#error "Enable FAST_TIMER to use SERIAL_FAST_TIMER"
+#endif
+#endif
+
+#if defined(CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS) && \
+           (CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS == 0)
+#error "RX_TIMEOUT_TICKS == 0 not allowed, use 1"
+#endif
+
+#if defined(CONFIG_ETRAX_RS485_ON_PA) && defined(CONFIG_ETRAX_RS485_ON_PORT_G)
+#error "Disable either CONFIG_ETRAX_RS485_ON_PA or CONFIG_ETRAX_RS485_ON_PORT_G"
+#endif
+
+/*
+ * All of the compatibilty code so we can compile serial.c against
+ * older kernels is hidden in serial_compat.h
+ */
+#if defined(LOCAL_HEADERS)
+#include "serial_compat.h"
+#endif
+
+#define _INLINE_ inline
+
+struct tty_driver *serial_driver;
+
+/* serial subtype definitions */
+#ifndef SERIAL_TYPE_NORMAL
+#define SERIAL_TYPE_NORMAL      1
+#endif
+
+/* number of characters left in xmit buffer before we ask for more */
+#define WAKEUP_CHARS 256
+
+//#define SERIAL_DEBUG_INTR
+//#define SERIAL_DEBUG_OPEN
+//#define SERIAL_DEBUG_FLOW
+//#define SERIAL_DEBUG_DATA
+//#define SERIAL_DEBUG_THROTTLE
+//#define SERIAL_DEBUG_IO  /* Debug for Extra control and status pins */
+//#define SERIAL_DEBUG_LINE 0 /* What serport we want to debug */
+
+/* Enable this to use serial interrupts to handle when you
+   expect the first received event on the serial port to
+   be an error, break or similar. Used to be able to flash IRMA
+   from eLinux */
+#define SERIAL_HANDLE_EARLY_ERRORS
+
+/* Defined and used in n_tty.c, but we need it here as well */
+#define TTY_THRESHOLD_THROTTLE 128
+
+/* Due to buffersizes and threshold values, our SERIAL_DESCR_BUF_SIZE
+ * must not be to high or flow control won't work if we leave it to the tty
+ * layer so we have our own throttling in flush_to_flip
+ * TTY_FLIPBUF_SIZE=512,
+ * TTY_THRESHOLD_THROTTLE/UNTHROTTLE=128
+ * BUF_SIZE can't be > 128
+ */
+/* Currently 16 descriptors x 128 bytes = 2048 bytes */
+#define SERIAL_DESCR_BUF_SIZE 256
+
+#define SERIAL_PRESCALE_BASE 3125000 /* 3.125MHz */
+#define DEF_BAUD_BASE SERIAL_PRESCALE_BASE
+
+/* We don't want to load the system with massive fast timer interrupt
+ * on high baudrates so limit it to 250 us (4kHz) */
+#define MIN_FLUSH_TIME_USEC 250
+
+/* Add an x here to log a lot of timer stuff */
+#define TIMERD(x)
+/* Debug details of interrupt handling */
+#define DINTR1(x)  /* irq on/off, errors */
+#define DINTR2(x)    /* tx and rx */
+/* Debug flip buffer stuff */
+#define DFLIP(x)
+/* Debug flow control and overview of data flow */
+#define DFLOW(x)
+#define DBAUD(x)
+#define DLOG_INT_TRIG(x)
+
+//#define DEBUG_LOG_INCLUDED
+#ifndef DEBUG_LOG_INCLUDED
+#define DEBUG_LOG(line, string, value)
+#else
+struct debug_log_info
+{
+        unsigned long time;
+        unsigned long timer_data;
+//  int line;
+        const char *string;
+        int value;
+};
+#define DEBUG_LOG_SIZE 4096
+
+struct debug_log_info debug_log[DEBUG_LOG_SIZE];
+int debug_log_pos = 0;
+
+#define DEBUG_LOG(_line, _string, _value) do { \
+  if ((_line) == SERIAL_DEBUG_LINE) {\
+    debug_log_func(_line, _string, _value); \
+  }\
+}while(0)
+
+void debug_log_func(int line, const char *string, int value)
+{
+        if (debug_log_pos < DEBUG_LOG_SIZE) {
+                debug_log[debug_log_pos].time = jiffies;
+                debug_log[debug_log_pos].timer_data = *R_TIMER_DATA;
+//    debug_log[debug_log_pos].line = line;
+                debug_log[debug_log_pos].string = string;
+                debug_log[debug_log_pos].value = value;
+                debug_log_pos++;
+        }
+        /*printk(string, value);*/
+}
+#endif
+
+#ifndef CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS
+/* Default number of timer ticks before flushing rx fifo
+ * When using "little data, low latency applications: use 0
+ * When using "much data applications (PPP)" use ~5
+ */
+#define CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS 5
+#endif
+
+unsigned long timer_data_to_ns(unsigned long timer_data);
+
+static void change_speed(struct e100_serial *info);
+static void rs_throttle(struct tty_struct * tty);
+static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
+static int rs_write(struct tty_struct * tty, int from_user,
+                    const unsigned char *buf, int count);
+extern _INLINE_ int rs_raw_write(struct tty_struct * tty, int from_user,
+                            const unsigned char *buf, int count);
+#ifdef CONFIG_ETRAX_RS485
+static int e100_write_rs485(struct tty_struct * tty, int from_user,
+                            const unsigned char *buf, int count);
+#endif
+static int get_lsr_info(struct e100_serial * info, unsigned int *value);
+
+
+#define DEF_BAUD 115200   /* 115.2 kbit/s */
+#define STD_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define DEF_RX 0x20  /* or SERIAL_CTRL_W >> 8 */
+/* Default value of tx_ctrl register: has txd(bit 7)=1 (idle) as default */
+#define DEF_TX 0x80  /* or SERIAL_CTRL_B */
+
+/* offsets from R_SERIALx_CTRL */
+
+#define REG_DATA 0
+#define REG_DATA_STATUS32 0 /* this is the 32 bit register R_SERIALx_READ */
+#define REG_TR_DATA 0
+#define REG_STATUS 1
+#define REG_TR_CTRL 1
+#define REG_REC_CTRL 2
+#define REG_BAUD 3
+#define REG_XOFF 4  /* this is a 32 bit register */
+
+/* The bitfields are the same for all serial ports */
+#define SER_RXD_MASK         IO_MASK(R_SERIAL0_STATUS, rxd)
+#define SER_DATA_AVAIL_MASK  IO_MASK(R_SERIAL0_STATUS, data_avail)
+#define SER_FRAMING_ERR_MASK IO_MASK(R_SERIAL0_STATUS, framing_err)
+#define SER_PAR_ERR_MASK     IO_MASK(R_SERIAL0_STATUS, par_err)
+#define SER_OVERRUN_MASK     IO_MASK(R_SERIAL0_STATUS, overrun)
+
+#define SER_ERROR_MASK (SER_OVERRUN_MASK | SER_PAR_ERR_MASK | SER_FRAMING_ERR_MASK)
+
+/* Values for info->errorcode */
+#define ERRCODE_SET_BREAK    (TTY_BREAK)
+#define ERRCODE_INSERT        0x100
+#define ERRCODE_INSERT_BREAK (ERRCODE_INSERT | TTY_BREAK)
+
+#define FORCE_EOP(info)  *R_SET_EOP = 1U << info->iseteop;
+
+/*
+ * General note regarding the use of IO_* macros in this file:
+ *
+ * We will use the bits defined for DMA channel 6 when using various
+ * IO_* macros (e.g. IO_STATE, IO_MASK, IO_EXTRACT) and _assume_ they are
+ * the same for all channels (which of course they are).
+ *
+ * We will also use the bits defined for serial port 0 when writing commands
+ * to the different ports, as these bits too are the same for all ports.
+ */
+
+
+/* Mask for the irqs possibly enabled in R_IRQ_MASK1_RD etc. */
+static const unsigned long e100_ser_int_mask = 0
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
+| IO_MASK(R_IRQ_MASK1_RD, ser0_data) | IO_MASK(R_IRQ_MASK1_RD, ser0_ready)
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
+| IO_MASK(R_IRQ_MASK1_RD, ser1_data) | IO_MASK(R_IRQ_MASK1_RD, ser1_ready)
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
+| IO_MASK(R_IRQ_MASK1_RD, ser2_data) | IO_MASK(R_IRQ_MASK1_RD, ser2_ready)
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
+| IO_MASK(R_IRQ_MASK1_RD, ser3_data) | IO_MASK(R_IRQ_MASK1_RD, ser3_ready)
+#endif
+;
+unsigned long r_alt_ser_baudrate_shadow = 0;
+
+/* this is the data for the four serial ports in the etrax100 */
+/*  DMA2(ser2), DMA4(ser3), DMA6(ser0) or DMA8(ser1) */
+/* R_DMA_CHx_CLR_INTR, R_DMA_CHx_FIRST, R_DMA_CHx_CMD */
+
+static struct e100_serial rs_table[] = {
+        { .baud        = DEF_BAUD,
+          .port        = (unsigned char *)R_SERIAL0_CTRL,
+          .irq         = 1U << 12, /* uses DMA 6 and 7 */
+          .oclrintradr = R_DMA_CH6_CLR_INTR,
+          .ofirstadr   = R_DMA_CH6_FIRST,
+          .ocmdadr     = R_DMA_CH6_CMD,
+          .ostatusadr  = R_DMA_CH6_STATUS,
+          .iclrintradr = R_DMA_CH7_CLR_INTR,
+          .ifirstadr   = R_DMA_CH7_FIRST,
+          .icmdadr     = R_DMA_CH7_CMD,
+          .idescradr   = R_DMA_CH7_DESCR,
+          .flags       = STD_FLAGS,
+          .rx_ctrl     = DEF_RX,
+          .tx_ctrl     = DEF_TX,
+          .iseteop     = 2,
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
+          .enabled  = 1,
+#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT
+          .dma_out_enabled = 1,
+#else
+          .dma_out_enabled = 0,
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN
+          .dma_in_enabled = 1,
+#else
+          .dma_in_enabled = 0
+#endif
+#else
+          .enabled  = 0,
+          .dma_out_enabled = 0,
+          .dma_in_enabled = 0
+#endif
+
+},  /* ttyS0 */
+#ifndef CONFIG_SVINTO_SIM
+        { .baud        = DEF_BAUD,
+          .port        = (unsigned char *)R_SERIAL1_CTRL,
+          .irq         = 1U << 16, /* uses DMA 8 and 9 */
+          .oclrintradr = R_DMA_CH8_CLR_INTR,
+          .ofirstadr   = R_DMA_CH8_FIRST,
+          .ocmdadr     = R_DMA_CH8_CMD,
+          .ostatusadr  = R_DMA_CH8_STATUS,
+          .iclrintradr = R_DMA_CH9_CLR_INTR,
+          .ifirstadr   = R_DMA_CH9_FIRST,
+          .icmdadr     = R_DMA_CH9_CMD,
+          .idescradr   = R_DMA_CH9_DESCR,
+          .flags       = STD_FLAGS,
+          .rx_ctrl     = DEF_RX,
+          .tx_ctrl     = DEF_TX,
+          .iseteop     = 3,
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
+          .enabled  = 1,
+#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT
+          .dma_out_enabled = 1,
+#else
+          .dma_out_enabled = 0,
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN
+          .dma_in_enabled = 1,
+#else
+          .dma_in_enabled = 0
+#endif
+#else
+          .enabled  = 0,
+          .dma_out_enabled = 0,
+          .dma_in_enabled = 0
+#endif
+},  /* ttyS1 */
+
+        { .baud        = DEF_BAUD,
+          .port        = (unsigned char *)R_SERIAL2_CTRL,
+          .irq         = 1U << 4,  /* uses DMA 2 and 3 */
+          .oclrintradr = R_DMA_CH2_CLR_INTR,
+          .ofirstadr   = R_DMA_CH2_FIRST,
+          .ocmdadr     = R_DMA_CH2_CMD,
+          .ostatusadr  = R_DMA_CH2_STATUS,
+          .iclrintradr = R_DMA_CH3_CLR_INTR,
+          .ifirstadr   = R_DMA_CH3_FIRST,
+          .icmdadr     = R_DMA_CH3_CMD,
+          .idescradr   = R_DMA_CH3_DESCR,
+          .flags       = STD_FLAGS,
+          .rx_ctrl     = DEF_RX,
+          .tx_ctrl     = DEF_TX,
+          .iseteop     = 0,
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
+          .enabled  = 1,
+#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT
+          .dma_out_enabled = 1,
+#else
+          .dma_out_enabled = 0,
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN
+          .dma_in_enabled = 1,
+#else
+          .dma_in_enabled = 0
+#endif
+#else
+          .enabled  = 0,
+          .dma_out_enabled = 0,
+          .dma_in_enabled = 0
+#endif
+ },  /* ttyS2 */
+
+        { .baud        = DEF_BAUD,
+          .port        = (unsigned char *)R_SERIAL3_CTRL,
+          .irq         = 1U << 8,  /* uses DMA 4 and 5 */
+          .oclrintradr = R_DMA_CH4_CLR_INTR,
+          .ofirstadr   = R_DMA_CH4_FIRST,
+          .ocmdadr     = R_DMA_CH4_CMD,
+          .ostatusadr  = R_DMA_CH4_STATUS,
+          .iclrintradr = R_DMA_CH5_CLR_INTR,
+          .ifirstadr   = R_DMA_CH5_FIRST,
+          .icmdadr     = R_DMA_CH5_CMD,
+          .idescradr   = R_DMA_CH5_DESCR,
+          .flags       = STD_FLAGS,
+          .rx_ctrl     = DEF_RX,
+          .tx_ctrl     = DEF_TX,
+          .iseteop     = 1,
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
+          .enabled  = 1,
+#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT
+          .dma_out_enabled = 1,
+#else
+          .dma_out_enabled = 0,
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN
+          .dma_in_enabled = 1,
+#else
+          .dma_in_enabled = 0
+#endif
+#else
+          .enabled  = 0,
+          .dma_out_enabled = 0,
+          .dma_in_enabled = 0
+#endif
+ }   /* ttyS3 */
+#endif
+};
+
+
+#define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial))
+
+static struct termios *serial_termios[NR_PORTS];
+static struct termios *serial_termios_locked[NR_PORTS];
+#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
+static struct fast_timer fast_timers[NR_PORTS];
+#endif
+
+#ifdef CONFIG_ETRAX_SERIAL_PROC_ENTRY
+#define PROCSTAT(x) x
+struct ser_statistics_type {
+        int overrun_cnt;
+        int early_errors_cnt;
+        int ser_ints_ok_cnt;
+        int errors_cnt;
+        unsigned long int processing_flip;
+        unsigned long processing_flip_still_room;
+        unsigned long int timeout_flush_cnt;
+        int rx_dma_ints;
+        int tx_dma_ints;
+        int rx_tot;
+        int tx_tot;
+};
+
+static struct ser_statistics_type ser_stat[NR_PORTS];
+
+#else
+
+#define PROCSTAT(x)
+
+#endif /* CONFIG_ETRAX_SERIAL_PROC_ENTRY */
+
+/* RS-485 */
+#if defined(CONFIG_ETRAX_RS485)
+#ifdef CONFIG_ETRAX_FAST_TIMER
+static struct fast_timer fast_timers_rs485[NR_PORTS];
+#endif
+#if defined(CONFIG_ETRAX_RS485_ON_PA)
+static int rs485_pa_bit = CONFIG_ETRAX_RS485_ON_PA_BIT;
+#endif
+#if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
+static int rs485_port_g_bit = CONFIG_ETRAX_RS485_ON_PORT_G_BIT;
+#endif
+#endif
+
+/* Info and macros needed for each ports extra control/status signals. */
+#define E100_STRUCT_PORT(line, pinname) \
+ ((CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT >= 0)? \
+                (R_PORT_PA_DATA): ( \
+ (CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT >= 0)? \
+                (R_PORT_PB_DATA):&dummy_ser[line]))
+
+#define E100_STRUCT_SHADOW(line, pinname) \
+ ((CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT >= 0)? \
+                (&port_pa_data_shadow): ( \
+ (CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT >= 0)? \
+                (&port_pb_data_shadow):&dummy_ser[line]))
+#define E100_STRUCT_MASK(line, pinname) \
+ ((CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT >= 0)? \
+                (1<<CONFIG_ETRAX_SER##line##_##pinname##_ON_PA_BIT): ( \
+ (CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT >= 0)? \
+                (1<<CONFIG_ETRAX_SER##line##_##pinname##_ON_PB_BIT):DUMMY_##pinname##_MASK))
+
+#define DUMMY_DTR_MASK 1
+#define DUMMY_RI_MASK  2
+#define DUMMY_DSR_MASK 4
+#define DUMMY_CD_MASK  8
+static unsigned char dummy_ser[NR_PORTS] = {0xFF, 0xFF, 0xFF,0xFF};
+
+/* If not all status pins are used or disabled, use mixed mode */
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
+
+#define SER0_PA_BITSUM (CONFIG_ETRAX_SER0_DTR_ON_PA_BIT+CONFIG_ETRAX_SER0_RI_ON_PA_BIT+CONFIG_ETRAX_SER0_DSR_ON_PA_BIT+CONFIG_ETRAX_SER0_CD_ON_PA_BIT)
+
+#if SER0_PA_BITSUM != -4
+#  if CONFIG_ETRAX_SER0_DTR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER0_RI_ON_PA_BIT == -1
+#   ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER0_DSR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER0_CD_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#define SER0_PB_BITSUM (CONFIG_ETRAX_SER0_DTR_ON_PB_BIT+CONFIG_ETRAX_SER0_RI_ON_PB_BIT+CONFIG_ETRAX_SER0_DSR_ON_PB_BIT+CONFIG_ETRAX_SER0_CD_ON_PB_BIT)
+
+#if SER0_PB_BITSUM != -4
+#  if CONFIG_ETRAX_SER0_DTR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER0_RI_ON_PB_BIT == -1
+#   ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER0_DSR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER0_CD_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#endif /* PORT0 */
+
+
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
+
+#define SER1_PA_BITSUM (CONFIG_ETRAX_SER1_DTR_ON_PA_BIT+CONFIG_ETRAX_SER1_RI_ON_PA_BIT+CONFIG_ETRAX_SER1_DSR_ON_PA_BIT+CONFIG_ETRAX_SER1_CD_ON_PA_BIT)
+
+#if SER1_PA_BITSUM != -4
+#  if CONFIG_ETRAX_SER1_DTR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER1_RI_ON_PA_BIT == -1
+#   ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER1_DSR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER1_CD_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#define SER1_PB_BITSUM (CONFIG_ETRAX_SER1_DTR_ON_PB_BIT+CONFIG_ETRAX_SER1_RI_ON_PB_BIT+CONFIG_ETRAX_SER1_DSR_ON_PB_BIT+CONFIG_ETRAX_SER1_CD_ON_PB_BIT)
+
+#if SER1_PB_BITSUM != -4
+#  if CONFIG_ETRAX_SER1_DTR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER1_RI_ON_PB_BIT == -1
+#   ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER1_DSR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER1_CD_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#endif /* PORT1 */
+
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
+
+#define SER2_PA_BITSUM (CONFIG_ETRAX_SER2_DTR_ON_PA_BIT+CONFIG_ETRAX_SER2_RI_ON_PA_BIT+CONFIG_ETRAX_SER2_DSR_ON_PA_BIT+CONFIG_ETRAX_SER2_CD_ON_PA_BIT)
+
+#if SER2_PA_BITSUM != -4
+#  if CONFIG_ETRAX_SER2_DTR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER2_RI_ON_PA_BIT == -1
+#   ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER2_DSR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER2_CD_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#define SER2_PB_BITSUM (CONFIG_ETRAX_SER2_DTR_ON_PB_BIT+CONFIG_ETRAX_SER2_RI_ON_PB_BIT+CONFIG_ETRAX_SER2_DSR_ON_PB_BIT+CONFIG_ETRAX_SER2_CD_ON_PB_BIT)
+
+#if SER2_PB_BITSUM != -4
+#  if CONFIG_ETRAX_SER2_DTR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER2_RI_ON_PB_BIT == -1
+#   ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER2_DSR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER2_CD_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#endif /* PORT2 */
+
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
+
+#define SER3_PA_BITSUM (CONFIG_ETRAX_SER3_DTR_ON_PA_BIT+CONFIG_ETRAX_SER3_RI_ON_PA_BIT+CONFIG_ETRAX_SER3_DSR_ON_PA_BIT+CONFIG_ETRAX_SER3_CD_ON_PA_BIT)
+
+#if SER3_PA_BITSUM != -4
+#  if CONFIG_ETRAX_SER3_DTR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER3_RI_ON_PA_BIT == -1
+#   ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER3_DSR_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER3_CD_ON_PA_BIT == -1
+#    ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#define SER3_PB_BITSUM (CONFIG_ETRAX_SER3_DTR_ON_PB_BIT+CONFIG_ETRAX_SER3_RI_ON_PB_BIT+CONFIG_ETRAX_SER3_DSR_ON_PB_BIT+CONFIG_ETRAX_SER3_CD_ON_PB_BIT)
+
+#if SER3_PB_BITSUM != -4
+#  if CONFIG_ETRAX_SER3_DTR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#   endif
+# if CONFIG_ETRAX_SER3_RI_ON_PB_BIT == -1
+#   ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#     define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#   endif
+#  endif
+#  if CONFIG_ETRAX_SER3_DSR_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#  if CONFIG_ETRAX_SER3_CD_ON_PB_BIT == -1
+#    ifndef CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED
+#      define CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED 1
+#    endif
+#  endif
+#endif
+
+#endif /* PORT3 */
+
+
+#if defined(CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED) || \
+    defined(CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED) || \
+    defined(CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED) || \
+    defined(CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED)
+#define CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED
+#endif
+
+#ifdef CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED
+/* The pins can be mixed on PA and PB */
+#define CONTROL_PINS_PORT_NOT_USED(line) \
+  &dummy_ser[line], &dummy_ser[line], \
+  &dummy_ser[line], &dummy_ser[line], \
+  &dummy_ser[line], &dummy_ser[line], \
+  &dummy_ser[line], &dummy_ser[line], \
+  DUMMY_DTR_MASK, DUMMY_RI_MASK, DUMMY_DSR_MASK, DUMMY_CD_MASK
+
+
+struct control_pins
+{
+        volatile unsigned char *dtr_port;
+        unsigned char          *dtr_shadow;
+        volatile unsigned char *ri_port;
+        unsigned char          *ri_shadow;
+        volatile unsigned char *dsr_port;
+        unsigned char          *dsr_shadow;
+        volatile unsigned char *cd_port;
+        unsigned char          *cd_shadow;
+
+        unsigned char dtr_mask;
+        unsigned char ri_mask;
+        unsigned char dsr_mask;
+        unsigned char cd_mask;
+};
+
+static const struct control_pins e100_modem_pins[NR_PORTS] =
+{
+        /* Ser 0 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
+        E100_STRUCT_PORT(0,DTR), E100_STRUCT_SHADOW(0,DTR),
+        E100_STRUCT_PORT(0,RI),  E100_STRUCT_SHADOW(0,RI),
+        E100_STRUCT_PORT(0,DSR), E100_STRUCT_SHADOW(0,DSR),
+        E100_STRUCT_PORT(0,CD),  E100_STRUCT_SHADOW(0,CD),
+        E100_STRUCT_MASK(0,DTR),
+        E100_STRUCT_MASK(0,RI),
+        E100_STRUCT_MASK(0,DSR),
+        E100_STRUCT_MASK(0,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(0)
+#endif
+        },
+
+        /* Ser 1 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
+        E100_STRUCT_PORT(1,DTR), E100_STRUCT_SHADOW(1,DTR),
+        E100_STRUCT_PORT(1,RI),  E100_STRUCT_SHADOW(1,RI),
+        E100_STRUCT_PORT(1,DSR), E100_STRUCT_SHADOW(1,DSR),
+        E100_STRUCT_PORT(1,CD),  E100_STRUCT_SHADOW(1,CD),
+        E100_STRUCT_MASK(1,DTR),
+        E100_STRUCT_MASK(1,RI),
+        E100_STRUCT_MASK(1,DSR),
+        E100_STRUCT_MASK(1,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(1)
+#endif
+        },
+
+        /* Ser 2 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
+        E100_STRUCT_PORT(2,DTR), E100_STRUCT_SHADOW(2,DTR),
+        E100_STRUCT_PORT(2,RI),  E100_STRUCT_SHADOW(2,RI),
+        E100_STRUCT_PORT(2,DSR), E100_STRUCT_SHADOW(2,DSR),
+        E100_STRUCT_PORT(2,CD),  E100_STRUCT_SHADOW(2,CD),
+        E100_STRUCT_MASK(2,DTR),
+        E100_STRUCT_MASK(2,RI),
+        E100_STRUCT_MASK(2,DSR),
+        E100_STRUCT_MASK(2,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(2)
+#endif
+        },
+
+        /* Ser 3 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
+        E100_STRUCT_PORT(3,DTR), E100_STRUCT_SHADOW(3,DTR),
+        E100_STRUCT_PORT(3,RI),  E100_STRUCT_SHADOW(3,RI),
+        E100_STRUCT_PORT(3,DSR), E100_STRUCT_SHADOW(3,DSR),
+        E100_STRUCT_PORT(3,CD),  E100_STRUCT_SHADOW(3,CD),
+        E100_STRUCT_MASK(3,DTR),
+        E100_STRUCT_MASK(3,RI),
+        E100_STRUCT_MASK(3,DSR),
+        E100_STRUCT_MASK(3,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(3)
+#endif
+        }
+};
+#else  /* CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED */
+
+/* All pins are on either PA or PB for each serial port */
+#define CONTROL_PINS_PORT_NOT_USED(line) \
+  &dummy_ser[line], &dummy_ser[line], \
+  DUMMY_DTR_MASK, DUMMY_RI_MASK, DUMMY_DSR_MASK, DUMMY_CD_MASK
+
+
+struct control_pins
+{
+        volatile unsigned char *port;
+        unsigned char          *shadow;
+
+        unsigned char dtr_mask;
+        unsigned char ri_mask;
+        unsigned char dsr_mask;
+        unsigned char cd_mask;
+};
+
+#define dtr_port port
+#define dtr_shadow shadow
+#define ri_port port
+#define ri_shadow shadow
+#define dsr_port port
+#define dsr_shadow shadow
+#define cd_port port
+#define cd_shadow shadow
+
+static const struct control_pins e100_modem_pins[NR_PORTS] =
+{
+        /* Ser 0 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
+        E100_STRUCT_PORT(0,DTR), E100_STRUCT_SHADOW(0,DTR),
+        E100_STRUCT_MASK(0,DTR),
+        E100_STRUCT_MASK(0,RI),
+        E100_STRUCT_MASK(0,DSR),
+        E100_STRUCT_MASK(0,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(0)
+#endif
+        },
+
+        /* Ser 1 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
+        E100_STRUCT_PORT(1,DTR), E100_STRUCT_SHADOW(1,DTR),
+        E100_STRUCT_MASK(1,DTR),
+        E100_STRUCT_MASK(1,RI),
+        E100_STRUCT_MASK(1,DSR),
+        E100_STRUCT_MASK(1,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(1)
+#endif
+        },
+
+        /* Ser 2 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
+        E100_STRUCT_PORT(2,DTR), E100_STRUCT_SHADOW(2,DTR),
+        E100_STRUCT_MASK(2,DTR),
+        E100_STRUCT_MASK(2,RI),
+        E100_STRUCT_MASK(2,DSR),
+        E100_STRUCT_MASK(2,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(2)
+#endif
+        },
+
+        /* Ser 3 */
+        {
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
+        E100_STRUCT_PORT(3,DTR), E100_STRUCT_SHADOW(3,DTR),
+        E100_STRUCT_MASK(3,DTR),
+        E100_STRUCT_MASK(3,RI),
+        E100_STRUCT_MASK(3,DSR),
+        E100_STRUCT_MASK(3,CD)
+#else
+        CONTROL_PINS_PORT_NOT_USED(3)
+#endif
+        }
+};
+#endif /* !CONFIG_ETRAX_SERX_DTR_RI_DSR_CD_MIXED */
+
+#define E100_RTS_MASK 0x20
+#define E100_CTS_MASK 0x40
+
+/* All serial port signals are active low:
+ * active   = 0 -> 3.3V to RS-232 driver -> -12V on RS-232 level
+ * inactive = 1 -> 0V   to RS-232 driver -> +12V on RS-232 level
+ *
+ * These macros returns the pin value: 0=0V, >=1 = 3.3V on ETRAX chip
+ */
+
+/* Output */
+#define E100_RTS_GET(info) ((info)->rx_ctrl & E100_RTS_MASK)
+/* Input */
+#define E100_CTS_GET(info) ((info)->port[REG_STATUS] & E100_CTS_MASK)
+
+/* These are typically PA or PB and 0 means 0V, 1 means 3.3V */
+/* Is an output */
+#define E100_DTR_GET(info) ((*e100_modem_pins[(info)->line].dtr_shadow) & e100_modem_pins[(info)->line].dtr_mask)
+
+/* Normally inputs */
+#define E100_RI_GET(info) ((*e100_modem_pins[(info)->line].ri_port) & e100_modem_pins[(info)->line].ri_mask)
+#define E100_CD_GET(info) ((*e100_modem_pins[(info)->line].cd_port) & e100_modem_pins[(info)->line].cd_mask)
+
+/* Input */
+#define E100_DSR_GET(info) ((*e100_modem_pins[(info)->line].dsr_port) & e100_modem_pins[(info)->line].dsr_mask)
+
+
+/*
+ * tmp_buf is used as a temporary buffer by serial_write.  We need to
+ * lock it in case the memcpy_fromfs blocks while swapping in a page,
+ * and some other program tries to do a serial write at the same time.
+ * Since the lock will only come under contention when the system is
+ * swapping and available memory is low, it makes sense to share one
+ * buffer across all the serial ports, since it significantly saves
+ * memory if large numbers of serial ports are open.
+ */
+static unsigned char *tmp_buf;
+#ifdef DECLARE_MUTEX
+static DECLARE_MUTEX(tmp_buf_sem);
+#else
+static struct semaphore tmp_buf_sem = MUTEX;
+#endif
+
+/* Calculate the chartime depending on baudrate, numbor of bits etc. */
+static void update_char_time(struct e100_serial * info)
+{
+        tcflag_t cflags = info->tty->termios->c_cflag;
+        int bits;
+
+        /* calc. number of bits / data byte */
+        /* databits + startbit and 1 stopbit */
+        if ((cflags & CSIZE) == CS7)
+                bits = 9;
+        else
+                bits = 10;
+
+        if (cflags & CSTOPB)     /* 2 stopbits ? */
+                bits++;
+
+        if (cflags & PARENB)     /* parity bit ? */
+                bits++;
+
+        /* calc timeout */
+        info->char_time_usec = ((bits * 1000000) / info->baud) + 1;
+        info->flush_time_usec = 4*info->char_time_usec;
+        if (info->flush_time_usec < MIN_FLUSH_TIME_USEC)
+                info->flush_time_usec = MIN_FLUSH_TIME_USEC;
+
+}
+
+/*
+ * This function maps from the Bxxxx defines in asm/termbits.h into real
+ * baud rates.
+ */
+
+static int
+cflag_to_baud(unsigned int cflag)
+{
+        static int baud_table[] = {
+                0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400,
+                4800, 9600, 19200, 38400 };
+
+        static int ext_baud_table[] = {
+                0, 57600, 115200, 230400, 460800, 921600, 1843200, 6250000,
+                0, 0, 0, 0, 0, 0, 0, 0 };
+
+        if (cflag & CBAUDEX)
+                return ext_baud_table[(cflag & CBAUD) & ~CBAUDEX];
+        else
+                return baud_table[cflag & CBAUD];
+}
+
+/* and this maps to an etrax100 hardware baud constant */
+
+static unsigned char
+cflag_to_etrax_baud(unsigned int cflag)
+{
+        char retval;
+
+        static char baud_table[] = {
+                -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, -1, 3, 4, 5, 6, 7 };
+
+        static char ext_baud_table[] = {
+                -1, 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, -1 };
+
+        if (cflag & CBAUDEX)
+                retval = ext_baud_table[(cflag & CBAUD) & ~CBAUDEX];
+        else
+                retval = baud_table[cflag & CBAUD];
+
+        if (retval < 0) {
+                printk(KERN_WARNING "serdriver tried setting invalid baud rate, flags %x.\n", cflag);
+                retval = 5; /* choose default 9600 instead */
+        }
+
+        return retval | (retval << 4); /* choose same for both TX and RX */
+}
+
+
+/* Various static support functions */
+
+/* Functions to set or clear DTR/RTS on the requested line */
+/* It is complicated by the fact that RTS is a serial port register, while
+ * DTR might not be implemented in the HW at all, and if it is, it can be on
+ * any general port.
+ */
+
+
+static inline void
+e100_dtr(struct e100_serial *info, int set)
+{
+#ifndef CONFIG_SVINTO_SIM
+        unsigned char mask = e100_modem_pins[info->line].dtr_mask;
+
+#ifdef SERIAL_DEBUG_IO
+        printk("ser%i dtr %i mask: 0x%02X\n", info->line, set, mask);
+        printk("ser%i shadow before 0x%02X get: %i\n",
+               info->line, *e100_modem_pins[info->line].dtr_shadow,
+               E100_DTR_GET(info));
+#endif
+        /* DTR is active low */
+        {
+                unsigned long flags;
+
+                save_flags(flags);
+                cli();
+                *e100_modem_pins[info->line].dtr_shadow &= ~mask;
+                *e100_modem_pins[info->line].dtr_shadow |= (set ? 0 : mask);
+                *e100_modem_pins[info->line].dtr_port = *e100_modem_pins[info->line].dtr_shadow;
+                restore_flags(flags);
+        }
+
+#ifdef SERIAL_DEBUG_IO
+        printk("ser%i shadow after 0x%02X get: %i\n",
+               info->line, *e100_modem_pins[info->line].dtr_shadow,
+               E100_DTR_GET(info));
+#endif
+#endif
+}
+
+/* set = 0 means 3.3V on the pin, bitvalue: 0=active, 1=inactive
+ *                                          0=0V    , 1=3.3V
+ */
+static inline void
+e100_rts(struct e100_serial *info, int set)
+{
+#ifndef CONFIG_SVINTO_SIM
+        unsigned long flags;
+        save_flags(flags);
+        cli();
+        info->rx_ctrl &= ~E100_RTS_MASK;
+        info->rx_ctrl |= (set ? 0 : E100_RTS_MASK);  /* RTS is active low */
+        info->port[REG_REC_CTRL] = info->rx_ctrl;
+        restore_flags(flags);
+#ifdef SERIAL_DEBUG_IO
+        printk("ser%i rts %i\n", info->line, set);
+#endif
+#endif
+}
+
+
+/* If this behaves as a modem, RI and CD is an output */
+static inline void
+e100_ri_out(struct e100_serial *info, int set)
+{
+#ifndef CONFIG_SVINTO_SIM
+        /* RI is active low */
+        {
+                unsigned char mask = e100_modem_pins[info->line].ri_mask;
+                unsigned long flags;
+
+                save_flags(flags);
+                cli();
+                *e100_modem_pins[info->line].ri_shadow &= ~mask;
+                *e100_modem_pins[info->line].ri_shadow |= (set ? 0 : mask);
+                *e100_modem_pins[info->line].ri_port = *e100_modem_pins[info->line].ri_shadow;
+                restore_flags(flags);
+        }
+#endif
+}
+static inline void
+e100_cd_out(struct e100_serial *info, int set)
+{
+#ifndef CONFIG_SVINTO_SIM
+        /* CD is active low */
+        {
+                unsigned char mask = e100_modem_pins[info->line].cd_mask;
+                unsigned long flags;
+
+                save_flags(flags);
+                cli();
+                *e100_modem_pins[info->line].cd_shadow &= ~mask;
+                *e100_modem_pins[info->line].cd_shadow |= (set ? 0 : mask);
+                *e100_modem_pins[info->line].cd_port = *e100_modem_pins[info->line].cd_shadow;
+                restore_flags(flags);
+        }
+#endif
+}
+
+static inline void
+e100_disable_rx(struct e100_serial *info)
+{
+#ifndef CONFIG_SVINTO_SIM
+        /* disable the receiver */
+        info->port[REG_REC_CTRL] =
+                (info->rx_ctrl &= ~IO_MASK(R_SERIAL0_REC_CTRL, rec_enable));
+#endif
+}
+
+static inline void
+e100_enable_rx(struct e100_serial *info)
+{
+#ifndef CONFIG_SVINTO_SIM
+        /* enable the receiver */
+        info->port[REG_REC_CTRL] =
+                (info->rx_ctrl |= IO_MASK(R_SERIAL0_REC_CTRL, rec_enable));
+#endif
+}
+
+/* the rx DMA uses both the dma_descr and the dma_eop interrupts */
+
+static inline void
+e100_disable_rxdma_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("rxdma_irq(%d): 0\n",info->line);
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ disable_rxdma_irq %i\n", info->line));
+        *R_IRQ_MASK2_CLR = (info->irq << 2) | (info->irq << 3);
+}
+
+static inline void
+e100_enable_rxdma_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("rxdma_irq(%d): 1\n",info->line);
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ enable_rxdma_irq %i\n", info->line));
+        *R_IRQ_MASK2_SET = (info->irq << 2) | (info->irq << 3);
+}
+
+/* the tx DMA uses only dma_descr interrupt */
+
+static _INLINE_ void
+e100_disable_txdma_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("txdma_irq(%d): 0\n",info->line);
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ disable_txdma_irq %i\n", info->line));
+        *R_IRQ_MASK2_CLR = info->irq;
+}
+
+static _INLINE_ void
+e100_enable_txdma_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("txdma_irq(%d): 1\n",info->line);
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ enable_txdma_irq %i\n", info->line));
+        *R_IRQ_MASK2_SET = info->irq;
+}
+
+static _INLINE_ void
+e100_disable_txdma_channel(struct e100_serial *info)
+{
+        unsigned long flags;
+
+        /* Disable output DMA channel for the serial port in question
+         * ( set to something other then serialX)
+         */
+        save_flags(flags);
+        cli();
+        DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line));
+        if (info->line == 0) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma6)) ==
+                    IO_STATE(R_GEN_CONFIG, dma6, serial0)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma6);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma6, unused);
+                }
+        } else if (info->line == 1) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma8)) ==
+                    IO_STATE(R_GEN_CONFIG, dma8, serial1)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma8);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma8, usb);
+                }
+        } else if (info->line == 2) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma2)) ==
+                    IO_STATE(R_GEN_CONFIG, dma2, serial2)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma2);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma2, par0);
+                }
+        } else if (info->line == 3) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma4)) ==
+                    IO_STATE(R_GEN_CONFIG, dma4, serial3)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma4);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma4, par1);
+                }
+        }
+        *R_GEN_CONFIG = genconfig_shadow;
+        restore_flags(flags);
+}
+
+
+static _INLINE_ void
+e100_enable_txdma_channel(struct e100_serial *info)
+{
+        unsigned long flags;
+
+        save_flags(flags);
+        cli();
+        DFLOW(DEBUG_LOG(info->line, "enable_txdma_channel %i\n", info->line));
+        /* Enable output DMA channel for the serial port in question */
+        if (info->line == 0) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma6);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma6, serial0);
+        } else if (info->line == 1) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma8);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma8, serial1);
+        } else if (info->line == 2) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma2);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma2, serial2);
+        } else if (info->line == 3) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma4);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma4, serial3);
+        }
+        *R_GEN_CONFIG = genconfig_shadow;
+        restore_flags(flags);
+}
+
+static _INLINE_ void
+e100_disable_rxdma_channel(struct e100_serial *info)
+{
+        unsigned long flags;
+
+        /* Disable input DMA channel for the serial port in question
+         * ( set to something other then serialX)
+         */
+        save_flags(flags);
+        cli();
+        if (info->line == 0) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma7)) ==
+                    IO_STATE(R_GEN_CONFIG, dma7, serial0)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma7);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma7, unused);
+                }
+        } else if (info->line == 1) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma9)) ==
+                    IO_STATE(R_GEN_CONFIG, dma9, serial1)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma9);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma9, usb);
+                }
+        } else if (info->line == 2) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma3)) ==
+                    IO_STATE(R_GEN_CONFIG, dma3, serial2)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma3);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma3, par0);
+                }
+        } else if (info->line == 3) {
+                if ((genconfig_shadow & IO_MASK(R_GEN_CONFIG, dma5)) ==
+                    IO_STATE(R_GEN_CONFIG, dma5, serial3)) {
+                        genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma5);
+                        genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma5, par1);
+                }
+        }
+        *R_GEN_CONFIG = genconfig_shadow;
+        restore_flags(flags);
+}
+
+
+static _INLINE_ void
+e100_enable_rxdma_channel(struct e100_serial *info)
+{
+        unsigned long flags;
+
+        save_flags(flags);
+        cli();
+        /* Enable input DMA channel for the serial port in question */
+        if (info->line == 0) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma7);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma7, serial0);
+        } else if (info->line == 1) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma9);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma9, serial1);
+        } else if (info->line == 2) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma3);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma3, serial2);
+        } else if (info->line == 3) {
+                genconfig_shadow &=  ~IO_MASK(R_GEN_CONFIG, dma5);
+                genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma5, serial3);
+        }
+        *R_GEN_CONFIG = genconfig_shadow;
+        restore_flags(flags);
+}
+
+#ifdef SERIAL_HANDLE_EARLY_ERRORS
+/* in order to detect and fix errors on the first byte
+   we have to use the serial interrupts as well. */
+
+static inline void
+e100_disable_serial_data_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("ser_irq(%d): 0\n",info->line);
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ disable data_irq %i\n", info->line));
+        *R_IRQ_MASK1_CLR = (1U << (8+2*info->line));
+}
+
+static inline void
+e100_enable_serial_data_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("ser_irq(%d): 1\n",info->line);
+        printk("**** %d = %d\n",
+               (8+2*info->line),
+               (1U << (8+2*info->line)));
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ enable data_irq %i\n", info->line));
+        *R_IRQ_MASK1_SET = (1U << (8+2*info->line));
+}
+#endif
+
+static inline void
+e100_disable_serial_tx_ready_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("ser_tx_irq(%d): 0\n",info->line);
+#endif
+        DINTR1(DEBUG_LOG(info->line,"IRQ disable ready_irq %i\n", info->line));
+        *R_IRQ_MASK1_CLR = (1U << (8+1+2*info->line));
+}
+
+static inline void
+e100_enable_serial_tx_ready_irq(struct e100_serial *info)
+{
+#ifdef SERIAL_DEBUG_INTR
+        printk("ser_tx_irq(%d): 1\n",info->line);
+        printk("**** %d = %d\n",
+               (8+1+2*info->line),
+               (1U << (8+1+2*info->line)));
+#endif
+        DINTR2(DEBUG_LOG(info->line,"IRQ enable ready_irq %i\n", info->line));
+        *R_IRQ_MASK1_SET = (1U << (8+1+2*info->line));
+}
+
+static inline void e100_enable_rx_irq(struct e100_serial *info)
+{
+        if (info->uses_dma_in)
+                e100_enable_rxdma_irq(info);
+        else
+                e100_enable_serial_data_irq(info);
+}
+static inline void e100_disable_rx_irq(struct e100_serial *info)
+{
+        if (info->uses_dma_in)
+                e100_disable_rxdma_irq(info);
+        else
+                e100_disable_serial_data_irq(info);
+}
+
+#if defined(CONFIG_ETRAX_RS485)
+/* Enable RS-485 mode on selected port. This is UGLY. */
+static int
+e100_enable_rs485(struct tty_struct *tty,struct rs485_control *r)
+{
+        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
+
+#if defined(CONFIG_ETRAX_RS485_ON_PA)
+        *R_PORT_PA_DATA = port_pa_data_shadow |= (1 << rs485_pa_bit);
+#endif
+#if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
+        REG_SHADOW_SET(R_PORT_G_DATA,  port_g_data_shadow,
+                       rs485_port_g_bit, 1);
+#endif
+#if defined(CONFIG_ETRAX_RS485_LTC1387)
+        REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow,
+                       CONFIG_ETRAX_RS485_LTC1387_DXEN_PORT_G_BIT, 1);
+        REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow,
+                       CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1);
+#endif
+
+        info->rs485.rts_on_send = 0x01 & r->rts_on_send;
+        info->rs485.rts_after_sent = 0x01 & r->rts_after_sent;
+        if (r->delay_rts_before_send >= 1000)
+                info->rs485.delay_rts_before_send = 1000;
+        else
+                info->rs485.delay_rts_before_send = r->delay_rts_before_send;
+        info->rs485.enabled = r->enabled;
+/*      printk("rts: on send = %i, after = %i, enabled = %i",
+                    info->rs485.rts_on_send,
+                    info->rs485.rts_after_sent,
+                    info->rs485.enabled
+        );
+*/
+        return 0;
+}
+
+static int
+e100_write_rs485(struct tty_struct *tty, int from_user,
+                 const unsigned char *buf, int count)
+{
+        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
+        int old_enabled = info->rs485.enabled;
+
+        /* rs485 is always implicitly enabled if we're using the ioctl()
+         * but it doesn't have to be set in the rs485_control
+         * (to be backward compatible with old apps)
+         * So we store, set and restore it.
+         */
+        info->rs485.enabled = 1;
+        /* rs_write now deals with RS485 if enabled */
+        count = rs_write(tty, from_user, buf, count);
+        info->rs485.enabled = old_enabled;
+        return count;
+}
+
+#ifdef CONFIG_ETRAX_FAST_TIMER
+/* Timer function to toggle RTS when using FAST_TIMER */
+static void rs485_toggle_rts_timer_function(unsigned long data)
+{
+        struct e100_serial *info = (struct e100_serial *)data;
+
+        fast_timers_rs485[info->line].function = NULL;
+        e100_rts(info, info->rs485.rts_after_sent);
+#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
+        e100_enable_rx(info);
+        e100_enable_rx_irq(info);
+#endif
+}
+#endif
+#endif /* CONFIG_ETRAX_RS485 */
+
+/*
+ * ------------------------------------------------------------
+ * rs_stop() and rs_start()
+ *
+ * This routines are called before setting or resetting tty->stopped.
+ * They enable or disable transmitter using the XOFF registers, as necessary.
+ * ------------------------------------------------------------
+ */
+
+static void
+rs_stop(struct tty_struct *tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        if (info) {
+                unsigned long flags;
+                unsigned long xoff;
+
+                save_flags(flags); cli();
+                DFLOW(DEBUG_LOG(info->line, "XOFF rs_stop xmit %i\n",
+                                CIRC_CNT(info->xmit.head,
+                                         info->xmit.tail,SERIAL_XMIT_SIZE)));
+
+                xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->tty));
+                xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, stop);
+                if (tty->termios->c_iflag & IXON ) {
+                        xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
+                }
+
+                *((unsigned long *)&info->port[REG_XOFF]) = xoff;
+                restore_flags(flags);
+        }
+}
+
+static void
+rs_start(struct tty_struct *tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        if (info) {
+                unsigned long flags;
+                unsigned long xoff;
+
+                save_flags(flags); cli();
+                DFLOW(DEBUG_LOG(info->line, "XOFF rs_start xmit %i\n",
+                                CIRC_CNT(info->xmit.head,
+                                         info->xmit.tail,SERIAL_XMIT_SIZE)));
+                xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(tty));
+                xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable);
+                if (tty->termios->c_iflag & IXON ) {
+                        xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
+                }
+
+                *((unsigned long *)&info->port[REG_XOFF]) = xoff;
+                if (!info->uses_dma_out &&
+                    info->xmit.head != info->xmit.tail && info->xmit.buf)
+                        e100_enable_serial_tx_ready_irq(info);
+
+                restore_flags(flags);
+        }
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * Here starts the interrupt handling routines.  All of the following
+ * subroutines are declared as inline and are folded into
+ * rs_interrupt().  They were separated out for readability's sake.
+ *
+ * Note: rs_interrupt() is a "fast" interrupt, which means that it
+ * runs with interrupts turned off.  People who may want to modify
+ * rs_interrupt() should try to keep the interrupt handler as fast as
+ * possible.  After you are done making modifications, it is not a bad
+ * idea to do:
+ *
+ * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
+ *
+ * and look at the resulting assemble code in serial.s.
+ *
+ *                              - Ted Ts'o (tytso@mit.edu), 7-Mar-93
+ * -----------------------------------------------------------------------
+ */
+
+/*
+ * This routine is used by the interrupt handler to schedule
+ * processing in the software interrupt portion of the driver.
+ */
+static _INLINE_ void
+rs_sched_event(struct e100_serial *info,
+                                    int event)
+{
+        if (info->event & (1 << event))
+                return;
+        info->event |= 1 << event;
+        schedule_work(&info->work);
+}
+
+/* The output DMA channel is free - use it to send as many chars as possible
+ * NOTES:
+ *   We don't pay attention to info->x_char, which means if the TTY wants to
+ *   use XON/XOFF it will set info->x_char but we won't send any X char!
+ *
+ *   To implement this, we'd just start a DMA send of 1 byte pointing at a
+ *   buffer containing the X char, and skip updating xmit. We'd also have to
+ *   check if the last sent char was the X char when we enter this function
+ *   the next time, to avoid updating xmit with the sent X value.
+ */
+
+static void
+transmit_chars_dma(struct e100_serial *info)
+{
+        unsigned int c, sentl;
+        struct etrax_dma_descr *descr;
+
+#ifdef CONFIG_SVINTO_SIM
+        /* This will output too little if tail is not 0 always since
+         * we don't reloop to send the other part. Anyway this SHOULD be a
+         * no-op - transmit_chars_dma would never really be called during sim
+         * since rs_write does not write into the xmit buffer then.
+         */
+        if (info->xmit.tail)
+                printk("Error in serial.c:transmit_chars-dma(), tail!=0\n");
+        if (info->xmit.head != info->xmit.tail) {
+                SIMCOUT(info->xmit.buf + info->xmit.tail,
+                        CIRC_CNT(info->xmit.head,
+                                 info->xmit.tail,
+                                 SERIAL_XMIT_SIZE));
+                info->xmit.head = info->xmit.tail;  /* move back head */
+                info->tr_running = 0;
+        }
+        return;
+#endif
+        /* acknowledge both dma_descr and dma_eop irq in R_DMA_CHx_CLR_INTR */
+        *info->oclrintradr =
+                IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) |
+                IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do);
+
+#ifdef SERIAL_DEBUG_INTR
+        if (info->line == SERIAL_DEBUG_LINE)
+                printk("tc\n");
+#endif
+        if (!info->tr_running) {
+                /* weirdo... we shouldn't get here! */
+                printk(KERN_WARNING "Achtung: transmit_chars_dma with !tr_running\n");
+                return;
+        }
+
+        descr = &info->tr_descr;
+
+        /* first get the amount of bytes sent during the last DMA transfer,
+           and update xmit accordingly */
+
+        /* if the stop bit was not set, all data has been sent */
+        if (!(descr->status & d_stop)) {
+                sentl = descr->sw_len;
+        } else
+                /* otherwise we find the amount of data sent here */
+                sentl = descr->hw_len;
+
+        DFLOW(DEBUG_LOG(info->line, "TX %i done\n", sentl));
+
+        /* update stats */
+        info->icount.tx += sentl;
+
+        /* update xmit buffer */
+        info->xmit.tail = (info->xmit.tail + sentl) & (SERIAL_XMIT_SIZE - 1);
+
+        /* if there is only a few chars left in the buf, wake up the blocked
+           write if any */
+        if (CIRC_CNT(info->xmit.head,
+                     info->xmit.tail,
+                     SERIAL_XMIT_SIZE) < WAKEUP_CHARS)
+                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
+
+        /* find out the largest amount of consecutive bytes we want to send now */
+
+        c = CIRC_CNT_TO_END(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);
+
+        /* Don't send all in one DMA transfer - divide it so we wake up
+         * application before all is sent
+         */
+
+        if (c >= 4*WAKEUP_CHARS)
+                c = c/2;
+
+        if (c <= 0) {
+                /* our job here is done, don't schedule any new DMA transfer */
+                info->tr_running = 0;
+
+#if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER)
+                if (info->rs485.enabled) {
+                        /* Set a short timer to toggle RTS */
+                        start_one_shot_timer(&fast_timers_rs485[info->line],
+                                             rs485_toggle_rts_timer_function,
+                                             (unsigned long)info,
+                                             info->char_time_usec*2,
+                                             "RS-485");
+                }
+#endif /* RS485 */
+                return;
+        }
+
+        /* ok we can schedule a dma send of c chars starting at info->xmit.tail */
+        /* set up the descriptor correctly for output */
+        DFLOW(DEBUG_LOG(info->line, "TX %i\n", c));
+        descr->ctrl = d_int | d_eol | d_wait; /* Wait needed for tty_wait_until_sent() */
+        descr->sw_len = c;
+        descr->buf = virt_to_phys(info->xmit.buf + info->xmit.tail);
+        descr->status = 0;
+
+        *info->ofirstadr = virt_to_phys(descr); /* write to R_DMAx_FIRST */
+        *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, start);
+
+        /* DMA is now running (hopefully) */
+} /* transmit_chars_dma */
+
+static void
+start_transmit(struct e100_serial *info)
+{
+#if 0
+        if (info->line == SERIAL_DEBUG_LINE)
+                printk("x\n");
+#endif
+
+        info->tr_descr.sw_len = 0;
+        info->tr_descr.hw_len = 0;
+        info->tr_descr.status = 0;
+        info->tr_running = 1;
+        if (info->uses_dma_out)
+                transmit_chars_dma(info);
+        else
+                e100_enable_serial_tx_ready_irq(info);
+} /* start_transmit */
+
+#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
+static int serial_fast_timer_started = 0;
+static int serial_fast_timer_expired = 0;
+static void flush_timeout_function(unsigned long data);
+#define START_FLUSH_FAST_TIMER_TIME(info, string, usec) {\
+  unsigned long timer_flags; \
+  save_flags(timer_flags); \
+  cli(); \
+  if (fast_timers[info->line].function == NULL) { \
+    serial_fast_timer_started++; \
+    TIMERD(DEBUG_LOG(info->line, "start_timer %i ", info->line)); \
+    TIMERD(DEBUG_LOG(info->line, "num started: %i\n", serial_fast_timer_started)); \
+    start_one_shot_timer(&fast_timers[info->line], \
+                         flush_timeout_function, \
+                         (unsigned long)info, \
+                         (usec), \
+                         string); \
+  } \
+  else { \
+    TIMERD(DEBUG_LOG(info->line, "timer %i already running\n", info->line)); \
+  } \
+  restore_flags(timer_flags); \
+}
+#define START_FLUSH_FAST_TIMER(info, string) START_FLUSH_FAST_TIMER_TIME(info, string, info->flush_time_usec)
+
+#else
+#define START_FLUSH_FAST_TIMER_TIME(info, string, usec)
+#define START_FLUSH_FAST_TIMER(info, string)
+#endif
+
+static struct etrax_recv_buffer *
+alloc_recv_buffer(unsigned int size)
+{
+        struct etrax_recv_buffer *buffer;
+
+        if (!(buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC)))
+                return NULL;
+
+        buffer->next = NULL;
+        buffer->length = 0;
+        buffer->error = TTY_NORMAL;
+
+        return buffer;
+}
+
+static void
+append_recv_buffer(struct e100_serial *info, struct etrax_recv_buffer *buffer)
+{
+        unsigned long flags;
+
+        save_flags(flags);
+        cli();
+
+        if (!info->first_recv_buffer)
+                info->first_recv_buffer = buffer;
+        else
+                info->last_recv_buffer->next = buffer;
+
+        info->last_recv_buffer = buffer;
+
+        info->recv_cnt += buffer->length;
+        if (info->recv_cnt > info->max_recv_cnt)
+                info->max_recv_cnt = info->recv_cnt;
+
+        restore_flags(flags);
+}
+
+static int
+add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char flag)
+{
+        struct etrax_recv_buffer *buffer;
+        if (info->uses_dma_in) {
+                if (!(buffer = alloc_recv_buffer(4)))
+                        return 0;
+
+                buffer->length = 1;
+                buffer->error = flag;
+                buffer->buffer[0] = data;
+
+                append_recv_buffer(info, buffer);
+
+                info->icount.rx++;
+        } else {
+                struct tty_struct *tty = info->tty;
+                *tty->flip.char_buf_ptr = data;
+                *tty->flip.flag_buf_ptr = flag;
+                tty->flip.flag_buf_ptr++;
+                tty->flip.char_buf_ptr++;
+                tty->flip.count++;
+                info->icount.rx++;
+        }
+
+        return 1;
+}
+
+extern _INLINE_ unsigned int
+handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsigned int recvl)
+{
+        struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
+
+        if (info->recv_cnt + recvl > 65536) {
+                printk(KERN_CRIT
+                       "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __FUNCTION__, recvl);
+                return 0;
+        }
+
+        buffer->length = recvl;
+
+        if (info->errorcode == ERRCODE_SET_BREAK)
+                buffer->error = TTY_BREAK;
+        info->errorcode = 0;
+
+        append_recv_buffer(info, buffer);
+
+        if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE)))
+                panic("%s: Failed to allocate memory for receive buffer!\n", __FUNCTION__);
+
+        descr->buf = virt_to_phys(buffer->buffer);
+
+        return recvl;
+}
+
+static _INLINE_ unsigned int
+handle_all_descr_data(struct e100_serial *info)
+{
+        struct etrax_dma_descr *descr;
+        unsigned int recvl;
+        unsigned int ret = 0;
+
+        while (1)
+        {
+                descr = &info->rec_descr[info->cur_rec_descr];
+
+                if (descr == phys_to_virt(*info->idescradr))
+                        break;
+
+                if (++info->cur_rec_descr == SERIAL_RECV_DESCRIPTORS)
+                        info->cur_rec_descr = 0;
+
+                /* find out how many bytes were read */
+
+                /* if the eop bit was not set, all data has been received */
+                if (!(descr->status & d_eop)) {
+                        recvl = descr->sw_len;
+                } else {
+                        /* otherwise we find the amount of data received here */
+                        recvl = descr->hw_len;
+                }
+
+                /* Reset the status information */
+                descr->status = 0;
+
+                DFLOW(  DEBUG_LOG(info->line, "RX %lu\n", recvl);
+                        if (info->tty->stopped) {
+                                unsigned char *buf = phys_to_virt(descr->buf);
+                                DEBUG_LOG(info->line, "rx 0x%02X\n", buf[0]);
+                                DEBUG_LOG(info->line, "rx 0x%02X\n", buf[1]);
+                                DEBUG_LOG(info->line, "rx 0x%02X\n", buf[2]);
+                        }
+                        );
+
+                /* update stats */
+                info->icount.rx += recvl;
+
+                ret += handle_descr_data(info, descr, recvl);
+        }
+
+        return ret;
+}
+
+static _INLINE_ void
+receive_chars_dma(struct e100_serial *info)
+{
+        struct tty_struct *tty;
+        unsigned char rstat;
+
+#ifdef CONFIG_SVINTO_SIM
+        /* No receive in the simulator.  Will probably be when the rest of
+         * the serial interface works, and this piece will just be removed.
+         */
+        return;
+#endif
+
+        /* Acknowledge both dma_descr and dma_eop irq in R_DMA_CHx_CLR_INTR */
+        *info->iclrintradr =
+                IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) |
+                IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do);
+
+        tty = info->tty;
+        if (!tty) /* Something wrong... */
+                return;
+
+#ifdef SERIAL_HANDLE_EARLY_ERRORS
+        if (info->uses_dma_in)
+                e100_enable_serial_data_irq(info);
+#endif
+
+        if (info->errorcode == ERRCODE_INSERT_BREAK)
+                add_char_and_flag(info, '\0', TTY_BREAK);
+
+        handle_all_descr_data(info);
+
+        /* Read the status register to detect errors */
+        rstat = info->port[REG_STATUS];
+        if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) {
+                DFLOW(DEBUG_LOG(info->line, "XOFF detect stat %x\n", rstat));
+        }
+
+        if (rstat & SER_ERROR_MASK) {
+                /* If we got an error, we must reset it by reading the
+                 * data_in field
+                 */
+                unsigned char data = info->port[REG_DATA];
+
+                PROCSTAT(ser_stat[info->line].errors_cnt++);
+                DEBUG_LOG(info->line, "#dERR: s d 0x%04X\n",
+                          ((rstat & SER_ERROR_MASK) << 8) | data);
+
+                if (rstat & SER_PAR_ERR_MASK)
+                        add_char_and_flag(info, data, TTY_PARITY);
+                else if (rstat & SER_OVERRUN_MASK)
+                        add_char_and_flag(info, data, TTY_OVERRUN);
+                else if (rstat & SER_FRAMING_ERR_MASK)
+                        add_char_and_flag(info, data, TTY_FRAME);
+        }
+
+        START_FLUSH_FAST_TIMER(info, "receive_chars");
+
+        /* Restart the receiving DMA */
+        *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart);
+}
+
+static _INLINE_ int
+start_recv_dma(struct e100_serial *info)
+{
+        struct etrax_dma_descr *descr = info->rec_descr;
+        struct etrax_recv_buffer *buffer;
+        int i;
+
+        /* Set up the receiving descriptors */
+        for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) {
+                if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE)))
+                        panic("%s: Failed to allocate memory for receive buffer!\n", __FUNCTION__);
+
+                descr[i].ctrl = d_int;
+                descr[i].buf = virt_to_phys(buffer->buffer);
+                descr[i].sw_len = SERIAL_DESCR_BUF_SIZE;
+                descr[i].hw_len = 0;
+                descr[i].status = 0;
+                descr[i].next = virt_to_phys(&descr[i+1]);
+        }
+
+        /* Link the last descriptor to the first */
+        descr[i-1].next = virt_to_phys(&descr[0]);
+
+        /* Start with the first descriptor in the list */
+        info->cur_rec_descr = 0;
+
+        /* Start the DMA */
+        *info->ifirstadr = virt_to_phys(&descr[info->cur_rec_descr]);
+        *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, start);
+
+        /* Input DMA should be running now */
+        return 1;
+}
+
+static void
+start_receive(struct e100_serial *info)
+{
+#ifdef CONFIG_SVINTO_SIM
+        /* No receive in the simulator.  Will probably be when the rest of
+         * the serial interface works, and this piece will just be removed.
+         */
+        return;
+#endif
+        info->tty->flip.count = 0;
+        if (info->uses_dma_in) {
+                /* reset the input dma channel to be sure it works */
+
+                *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset);
+                while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->icmdadr) ==
+                       IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, reset));
+
+                start_recv_dma(info);
+        }
+}
+
+
+static _INLINE_ void
+status_handle(struct e100_serial *info, unsigned short status)
+{
+}
+
+/* the bits in the MASK2 register are laid out like this:
+   DMAI_EOP DMAI_DESCR DMAO_EOP DMAO_DESCR
+   where I is the input channel and O is the output channel for the port.
+   info->irq is the bit number for the DMAO_DESCR so to check the others we
+   shift info->irq to the left.
+*/
+
+/* dma output channel interrupt handler
+   this interrupt is called from DMA2(ser2), DMA4(ser3), DMA6(ser0) or
+   DMA8(ser1) when they have finished a descriptor with the intr flag set.
+*/
+
+static irqreturn_t
+tr_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+{
+        struct e100_serial *info;
+        unsigned long ireg;
+        int i;
+        int handled = 0;
+
+#ifdef CONFIG_SVINTO_SIM
+        /* No receive in the simulator.  Will probably be when the rest of
+         * the serial interface works, and this piece will just be removed.
+         */
+        {
+                const char *s = "What? tr_interrupt in simulator??\n";
+                SIMCOUT(s,strlen(s));
+        }
+        return IRQ_HANDLED;
+#endif
+
+        /* find out the line that caused this irq and get it from rs_table */
+
+        ireg = *R_IRQ_MASK2_RD;  /* get the active irq bits for the dma channels */
+
+        for (i = 0; i < NR_PORTS; i++) {
+                info = rs_table + i;
+                if (!info->enabled || !info->uses_dma_out)
+                        continue;
+                /* check for dma_descr (don't need to check for dma_eop in output dma for serial */
+                if (ireg & info->irq) {
+                        handled = 1;
+                        /* we can send a new dma bunch. make it so. */
+                        DINTR2(DEBUG_LOG(info->line, "tr_interrupt %i\n", i));
+                        /* Read jiffies_usec first,
+                         * we want this time to be as late as possible
+                         */
+                        PROCSTAT(ser_stat[info->line].tx_dma_ints++);
+                        info->last_tx_active_usec = GET_JIFFIES_USEC();
+                        info->last_tx_active = jiffies;
+                        transmit_chars_dma(info);
+                }
+
+                /* FIXME: here we should really check for a change in the
+                   status lines and if so call status_handle(info) */
+        }
+        return IRQ_RETVAL(handled);
+} /* tr_interrupt */
+
+/* dma input channel interrupt handler */
+
+static irqreturn_t
+rec_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+{
+        struct e100_serial *info;
+        unsigned long ireg;
+        int i;
+        int handled = 0;
+
+#ifdef CONFIG_SVINTO_SIM
+        /* No receive in the simulator.  Will probably be when the rest of
+         * the serial interface works, and this piece will just be removed.
+         */
+        {
+                const char *s = "What? rec_interrupt in simulator??\n";
+                SIMCOUT(s,strlen(s));
+        }
+        return IRQ_HANDLED;
+#endif
+
+        /* find out the line that caused this irq and get it from rs_table */
+
+        ireg = *R_IRQ_MASK2_RD;  /* get the active irq bits for the dma channels */
+
+        for (i = 0; i < NR_PORTS; i++) {
+                info = rs_table + i;
+                if (!info->enabled || !info->uses_dma_in)
+                        continue;
+                /* check for both dma_eop and dma_descr for the input dma channel */
+                if (ireg & ((info->irq << 2) | (info->irq << 3))) {
+                        handled = 1;
+                        /* we have received something */
+                        receive_chars_dma(info);
+                }
+
+                /* FIXME: here we should really check for a change in the
+                   status lines and if so call status_handle(info) */
+        }
+        return IRQ_RETVAL(handled);
+} /* rec_interrupt */
+
+static _INLINE_ int
+force_eop_if_needed(struct e100_serial *info)
+{
+        /* We check data_avail bit to determine if data has
+         * arrived since last time
+         */
+        unsigned char rstat = info->port[REG_STATUS];
+
+        /* error or datavail? */
+        if (rstat & SER_ERROR_MASK) {
+                /* Some error has occurred. If there has been valid data, an
+                 * EOP interrupt will be made automatically. If no data, the
+                 * normal ser_interrupt should be enabled and handle it.
+                 * So do nothing!
+                 */
+                DEBUG_LOG(info->line, "timeout err: rstat 0x%03X\n",
+                          rstat | (info->line << 8));
+                return 0;
+        }
+
+        if (rstat & SER_DATA_AVAIL_MASK) {
+                /* Ok data, no error, count it */
+                TIMERD(DEBUG_LOG(info->line, "timeout: rstat 0x%03X\n",
+                          rstat | (info->line << 8)));
+                /* Read data to clear status flags */
+                (void)info->port[REG_DATA];
+
+                info->forced_eop = 0;
+                START_FLUSH_FAST_TIMER(info, "magic");
+                return 0;
+        }
+
+        /* hit the timeout, force an EOP for the input
+         * dma channel if we haven't already
+         */
+        if (!info->forced_eop) {
+                info->forced_eop = 1;
+                PROCSTAT(ser_stat[info->line].timeout_flush_cnt++);
+                TIMERD(DEBUG_LOG(info->line, "timeout EOP %i\n", info->line));
+                FORCE_EOP(info);
+        }
+
+        return 1;
+}
+
+extern _INLINE_ void
+flush_to_flip_buffer(struct e100_serial *info)
+{
+        struct tty_struct *tty;
+        struct etrax_recv_buffer *buffer;
+        unsigned int length;
+        unsigned long flags;
+        int max_flip_size;
+
+        if (!info->first_recv_buffer)
+                return;
+
+        save_flags(flags);
+        cli();
+
+        if (!(tty = info->tty)) {
+                restore_flags(flags);
+                return;
+        }
+
+        length = tty->flip.count;
+        /* Don't flip more than the ldisc has room for.
+         * The return value from ldisc.receive_room(tty) - might not be up to
+         * date, the previous flip of up to TTY_FLIPBUF_SIZE might be on the
+         * processed and not accounted for yet.
+         * Since we use DMA, 1 SERIAL_DESCR_BUF_SIZE could be on the way.
+         * Lets buffer data here and let flow control take care of it.
+         * Since we normally flip large chunks, the ldisc don't react
+         * with throttle until too late if we flip to much.
+         */
+        max_flip_size = tty->ldisc.receive_room(tty);
+        if (max_flip_size < 0)
+                max_flip_size = 0;
+        if (max_flip_size <= (TTY_FLIPBUF_SIZE +         /* Maybe not accounted for */
+                              length + info->recv_cnt +  /* We have this queued */
+                              2*SERIAL_DESCR_BUF_SIZE +    /* This could be on the way */
+                              TTY_THRESHOLD_THROTTLE)) { /* Some slack */
+                /* check TTY_THROTTLED first so it indicates our state */
+                if (!test_and_set_bit(TTY_THROTTLED, &tty->flags)) {
+                        DFLOW(DEBUG_LOG(info->line,"flush_to_flip throttles room %lu\n", max_flip_size));
+                        rs_throttle(tty);
+                }
+#if 0
+                else if (max_flip_size <= (TTY_FLIPBUF_SIZE +         /* Maybe not accounted for */
+                                           length + info->recv_cnt +  /* We have this queued */
+                                           SERIAL_DESCR_BUF_SIZE +    /* This could be on the way */
+                                           TTY_THRESHOLD_THROTTLE)) { /* Some slack */
+                        DFLOW(DEBUG_LOG(info->line,"flush_to_flip throttles again! %lu\n", max_flip_size));
+                        rs_throttle(tty);
+                }
+#endif
+        }
+
+        if (max_flip_size > TTY_FLIPBUF_SIZE)
+                max_flip_size = TTY_FLIPBUF_SIZE;
+
+        while ((buffer = info->first_recv_buffer) && length < max_flip_size) {
+                unsigned int count = buffer->length;
+
+                if (length + count > max_flip_size)
+                        count = max_flip_size - length;
+
+                memcpy(tty->flip.char_buf_ptr + length, buffer->buffer, count);
+                memset(tty->flip.flag_buf_ptr + length, TTY_NORMAL, count);
+                tty->flip.flag_buf_ptr[length] = buffer->error;
+
+                length += count;
+                info->recv_cnt -= count;
+                DFLIP(DEBUG_LOG(info->line,"flip: %i\n", length));
+
+                if (count == buffer->length) {
+                        info->first_recv_buffer = buffer->next;
+                        kfree(buffer);
+                } else {
+                        buffer->length -= count;
+                        memmove(buffer->buffer, buffer->buffer + count, buffer->length);
+                        buffer->error = TTY_NORMAL;
+                }
+        }
+
+        if (!info->first_recv_buffer)
+                info->last_recv_buffer = NULL;
+
+        tty->flip.count = length;
+        DFLIP(if (tty->ldisc.chars_in_buffer(tty) > 3500) {
+                DEBUG_LOG(info->line, "ldisc %lu\n",
+                          tty->ldisc.chars_in_buffer(tty));
+                DEBUG_LOG(info->line, "flip.count %lu\n",
+                          tty->flip.count);
+              }
+              );
+        restore_flags(flags);
+
+        DFLIP(
+          if (1) {
+
+                  if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
+                          DEBUG_LOG(info->line, "*** TTY_DONT_FLIP set flip.count %i ***\n", tty->flip.count);
+                          DEBUG_LOG(info->line, "*** recv_cnt %i\n", info->recv_cnt);
+                  } else {
+                  }
+                  DEBUG_LOG(info->line, "*** rxtot %i\n", info->icount.rx);
+                  DEBUG_LOG(info->line, "ldisc %lu\n", tty->ldisc.chars_in_buffer(tty));
+                  DEBUG_LOG(info->line, "room  %lu\n", tty->ldisc.receive_room(tty));
+          }
+
+        );
+
+        /* this includes a check for low-latency */
+        tty_flip_buffer_push(tty);
+}
+
+static _INLINE_ void
+check_flush_timeout(struct e100_serial *info)
+{
+        /* Flip what we've got (if we can) */
+        flush_to_flip_buffer(info);
+
+        /* We might need to flip later, but not to fast
+         * since the system is busy processing input... */
+        if (info->first_recv_buffer)
+                START_FLUSH_FAST_TIMER_TIME(info, "flip", 2000);
+
+        /* Force eop last, since data might have come while we're processing
+         * and if we started the slow timer above, we won't start a fast
+         * below.
+         */
+        force_eop_if_needed(info);
+}
+
+#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
+static void flush_timeout_function(unsigned long data)
+{
+        struct e100_serial *info = (struct e100_serial *)data;
+
+        fast_timers[info->line].function = NULL;
+        serial_fast_timer_expired++;
+        TIMERD(DEBUG_LOG(info->line, "flush_timout %i ", info->line));
+        TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired));
+        check_flush_timeout(info);
+}
+
+#else
+
+/* dma fifo/buffer timeout handler
+   forces an end-of-packet for the dma input channel if no chars
+   have been received for CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS/100 s.
+*/
+
+static struct timer_list flush_timer;
+
+static void
+timed_flush_handler(unsigned long ptr)
+{
+        struct e100_serial *info;
+        int i;
+
+#ifdef CONFIG_SVINTO_SIM
+        return;
+#endif
+
+        for (i = 0; i < NR_PORTS; i++) {
+                info = rs_table + i;
+                if (info->uses_dma_in)
+                        check_flush_timeout(info);
+        }
+
+        /* restart flush timer */
+        mod_timer(&flush_timer, jiffies + CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS);
+}
+#endif
+
+#ifdef SERIAL_HANDLE_EARLY_ERRORS
+
+/* If there is an error (ie break) when the DMA is running and
+ * there are no bytes in the fifo the DMA is stopped and we get no
+ * eop interrupt. Thus we have to monitor the first bytes on a DMA
+ * transfer, and if it is without error we can turn the serial
+ * interrupts off.
+ */
+
+/*
+BREAK handling on ETRAX 100:
+ETRAX will generate interrupt although there is no stop bit between the
+characters.
+
+Depending on how long the break sequence is, the end of the breaksequence
+will look differently:
+| indicates start/end of a character.
+
+B= Break character (0x00) with framing error.
+E= Error byte with parity error received after B characters.
+F= "Faked" valid byte received immediately after B characters.
+V= Valid byte
+
+1.
+    B          BL         ___________________________ V
+.._|__________|__________|                           |valid data |
+
+Multiple frame errors with data == 0x00 (B),
+the timing matches up "perfectly" so no extra ending char is detected.
+The RXD pin is 1 in the last interrupt, in that case
+we set info->errorcode = ERRCODE_INSERT_BREAK, but we can't really
+know if another byte will come and this really is case 2. below
+(e.g F=0xFF or 0xFE)
+If RXD pin is 0 we can expect another character (see 2. below).
+
+
+2.
+
+    B          B          E or F__________________..__ V
+.._|__________|__________|______    |                 |valid data
+                          "valid" or
+                          parity error
+
+Multiple frame errors with data == 0x00 (B),
+but the part of the break trigs is interpreted as a start bit (and possibly
+some 0 bits followed by a number of 1 bits and a stop bit).
+Depending on parity settings etc. this last character can be either
+a fake "valid" char (F) or have a parity error (E).
+
+If the character is valid it will be put in the buffer,
+we set info->errorcode = ERRCODE_SET_BREAK so the receive interrupt
+will set the flags so the tty will handle it,
+if it's an error byte it will not be put in the buffer
+and we set info->errorcode = ERRCODE_INSERT_BREAK.
+
+To distinguish a V byte in 1. from an F byte in 2. we keep a timestamp
+of the last faulty char (B) and compares it with the current time:
+If the time elapsed time is less then 2*char_time_usec we will assume
+it's a faked F char and not a Valid char and set
+info->errorcode = ERRCODE_SET_BREAK.
+
+Flaws in the above solution:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+We use the timer to distinguish a F character from a V character,
+if a V character is to close after the break we might make the wrong decision.
+
+TODO: The break will be delayed until an F or V character is received.
+
+*/
+
+extern _INLINE_
+struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info)
+{
+        unsigned long data_read;
+        struct tty_struct *tty = info->tty;
+
+        if (!tty) {
+                printk("!NO TTY!\n");
+                return info;
+        }
+        if (tty->flip.count >= TTY_FLIPBUF_SIZE - TTY_THRESHOLD_THROTTLE) {
+                /* check TTY_THROTTLED first so it indicates our state */
+                if (!test_and_set_bit(TTY_THROTTLED, &tty->flags)) {
+                        DFLOW(DEBUG_LOG(info->line, "rs_throttle flip.count: %i\n", tty->flip.count));
+                        rs_throttle(tty);
+                }
+        }
+        if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                DEBUG_LOG(info->line, "force FLIP! %i\n", tty->flip.count);
+                tty->flip.work.func((void *) tty);
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        DEBUG_LOG(info->line, "FLIP FULL! %i\n", tty->flip.count);
+                        return info;            /* if TTY_DONT_FLIP is set */
+                }
+        }
+        /* Read data and status at the same time */
+        data_read = *((unsigned long *)&info->port[REG_DATA_STATUS32]);
+more_data:
+        if (data_read & IO_MASK(R_SERIAL0_READ, xoff_detect) ) {
+                DFLOW(DEBUG_LOG(info->line, "XOFF detect\n", 0));
+        }
+        DINTR2(DEBUG_LOG(info->line, "ser_rx   %c\n", IO_EXTRACT(R_SERIAL0_READ, data_in, data_read)));
+
+        if (data_read & ( IO_MASK(R_SERIAL0_READ, framing_err) |
+                          IO_MASK(R_SERIAL0_READ, par_err) |
+                          IO_MASK(R_SERIAL0_READ, overrun) )) {
+                /* An error */
+                info->last_rx_active_usec = GET_JIFFIES_USEC();
+                info->last_rx_active = jiffies;
+                DINTR1(DEBUG_LOG(info->line, "ser_rx err stat_data %04X\n", data_read));
+                DLOG_INT_TRIG(
+                if (!log_int_trig1_pos) {
+                        log_int_trig1_pos = log_int_pos;
+                        log_int(rdpc(), 0, 0);
+                }
+                );
+
+
+                if ( ((data_read & IO_MASK(R_SERIAL0_READ, data_in)) == 0) &&
+                     (data_read & IO_MASK(R_SERIAL0_READ, framing_err)) ) {
+                        /* Most likely a break, but we get interrupts over and
+                         * over again.
+                         */
+
+                        if (!info->break_detected_cnt) {
+                                DEBUG_LOG(info->line, "#BRK start\n", 0);
+                        }
+                        if (data_read & IO_MASK(R_SERIAL0_READ, rxd)) {
+                                /* The RX pin is high now, so the break
+                                 * must be over, but....
+                                 * we can't really know if we will get another
+                                 * last byte ending the break or not.
+                                 * And we don't know if the byte (if any) will
+                                 * have an error or look valid.
+                                 */
+                                DEBUG_LOG(info->line, "# BL BRK\n", 0);
+                                info->errorcode = ERRCODE_INSERT_BREAK;
+                        }
+                        info->break_detected_cnt++;
+                } else {
+                        /* The error does not look like a break, but could be
+                         * the end of one
+                         */
+                        if (info->break_detected_cnt) {
+                                DEBUG_LOG(info->line, "EBRK %i\n", info->break_detected_cnt);
+                                info->errorcode = ERRCODE_INSERT_BREAK;
+                        } else {
+                                if (info->errorcode == ERRCODE_INSERT_BREAK) {
+                                        info->icount.brk++;
+                                        *tty->flip.char_buf_ptr = 0;
+                                        *tty->flip.flag_buf_ptr = TTY_BREAK;
+                                        tty->flip.flag_buf_ptr++;
+                                        tty->flip.char_buf_ptr++;
+                                        tty->flip.count++;
+                                        info->icount.rx++;
+                                }
+                                *tty->flip.char_buf_ptr = IO_EXTRACT(R_SERIAL0_READ, data_in, data_read);
+
+                                if (data_read & IO_MASK(R_SERIAL0_READ, par_err)) {
+                                        info->icount.parity++;
+                                        *tty->flip.flag_buf_ptr = TTY_PARITY;
+                                } else if (data_read & IO_MASK(R_SERIAL0_READ, overrun)) {
+                                        info->icount.overrun++;
+                                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                                } else if (data_read & IO_MASK(R_SERIAL0_READ, framing_err)) {
+                                        info->icount.frame++;
+                                        *tty->flip.flag_buf_ptr = TTY_FRAME;
+                                }
+                                info->errorcode = 0;
+                        }
+                        info->break_detected_cnt = 0;
+                }
+        } else if (data_read & IO_MASK(R_SERIAL0_READ, data_avail)) {
+                /* No error */
+                DLOG_INT_TRIG(
+                if (!log_int_trig1_pos) {
+                        if (log_int_pos >= log_int_size) {
+                                log_int_pos = 0;
+                        }
+                        log_int_trig0_pos = log_int_pos;
+                        log_int(rdpc(), 0, 0);
+                }
+                );
+                *tty->flip.char_buf_ptr = IO_EXTRACT(R_SERIAL0_READ, data_in, data_read);
+                *tty->flip.flag_buf_ptr = 0;
+        } else {
+                DEBUG_LOG(info->line, "ser_rx int but no data_avail  %08lX\n", data_read);
+        }
+
+
+        tty->flip.flag_buf_ptr++;
+        tty->flip.char_buf_ptr++;
+        tty->flip.count++;
+        info->icount.rx++;
+        data_read = *((unsigned long *)&info->port[REG_DATA_STATUS32]);
+        if (data_read & IO_MASK(R_SERIAL0_READ, data_avail)) {
+                DEBUG_LOG(info->line, "ser_rx   %c in loop\n", IO_EXTRACT(R_SERIAL0_READ, data_in, data_read));
+                goto more_data;
+        }
+
+        tty_flip_buffer_push(info->tty);
+        return info;
+}
+
+extern _INLINE_
+struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
+{
+        unsigned char rstat;
+
+#ifdef SERIAL_DEBUG_INTR
+        printk("Interrupt from serport %d\n", i);
+#endif
+/*      DEBUG_LOG(info->line, "ser_interrupt stat %03X\n", rstat | (i << 8)); */
+        if (!info->uses_dma_in) {
+                return handle_ser_rx_interrupt_no_dma(info);
+        }
+        /* DMA is used */
+        rstat = info->port[REG_STATUS];
+        if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) {
+                DFLOW(DEBUG_LOG(info->line, "XOFF detect\n", 0));
+        }
+
+        if (rstat & SER_ERROR_MASK) {
+                unsigned char data;
+
+                info->last_rx_active_usec = GET_JIFFIES_USEC();
+                info->last_rx_active = jiffies;
+                /* If we got an error, we must reset it by reading the
+                 * data_in field
+                 */
+                data = info->port[REG_DATA];
+                DINTR1(DEBUG_LOG(info->line, "ser_rx!  %c\n", data));
+                DINTR1(DEBUG_LOG(info->line, "ser_rx err stat %02X\n", rstat));
+                if (!data && (rstat & SER_FRAMING_ERR_MASK)) {
+                        /* Most likely a break, but we get interrupts over and
+                         * over again.
+                         */
+
+                        if (!info->break_detected_cnt) {
+                                DEBUG_LOG(info->line, "#BRK start\n", 0);
+                        }
+                        if (rstat & SER_RXD_MASK) {
+                                /* The RX pin is high now, so the break
+                                 * must be over, but....
+                                 * we can't really know if we will get another
+                                 * last byte ending the break or not.
+                                 * And we don't know if the byte (if any) will
+                                 * have an error or look valid.
+                                 */
+                                DEBUG_LOG(info->line, "# BL BRK\n", 0);
+                                info->errorcode = ERRCODE_INSERT_BREAK;
+                        }
+                        info->break_detected_cnt++;
+                } else {
+                        /* The error does not look like a break, but could be
+                         * the end of one
+                         */
+                        if (info->break_detected_cnt) {
+                                DEBUG_LOG(info->line, "EBRK %i\n", info->break_detected_cnt);
+                                info->errorcode = ERRCODE_INSERT_BREAK;
+                        } else {
+                                if (info->errorcode == ERRCODE_INSERT_BREAK) {
+                                        info->icount.brk++;
+                                        add_char_and_flag(info, '\0', TTY_BREAK);
+                                }
+
+                                if (rstat & SER_PAR_ERR_MASK) {
+                                        info->icount.parity++;
+                                        add_char_and_flag(info, data, TTY_PARITY);
+                                } else if (rstat & SER_OVERRUN_MASK) {
+                                        info->icount.overrun++;
+                                        add_char_and_flag(info, data, TTY_OVERRUN);
+                                } else if (rstat & SER_FRAMING_ERR_MASK) {
+                                        info->icount.frame++;
+                                        add_char_and_flag(info, data, TTY_FRAME);
+                                }
+
+                                info->errorcode = 0;
+                        }
+                        info->break_detected_cnt = 0;
+                        DEBUG_LOG(info->line, "#iERR s d %04X\n",
+                                  ((rstat & SER_ERROR_MASK) << 8) | data);
+                }
+                PROCSTAT(ser_stat[info->line].early_errors_cnt++);
+        } else { /* It was a valid byte, now let the DMA do the rest */
+                unsigned long curr_time_u = GET_JIFFIES_USEC();
+                unsigned long curr_time = jiffies;
+
+                if (info->break_detected_cnt) {
+                        /* Detect if this character is a new valid char or the
+                         * last char in a break sequence: If LSBits are 0 and
+                         * MSBits are high AND the time is close to the
+                         * previous interrupt we should discard it.
+                         */
+                        long elapsed_usec =
+                          (curr_time - info->last_rx_active) * (1000000/HZ) +
+                          curr_time_u - info->last_rx_active_usec;
+                        if (elapsed_usec < 2*info->char_time_usec) {
+                                DEBUG_LOG(info->line, "FBRK %i\n", info->line);
+                                /* Report as BREAK (error) and let
+                                 * receive_chars_dma() handle it
+                                 */
+                                info->errorcode = ERRCODE_SET_BREAK;
+                        } else {
+                                DEBUG_LOG(info->line, "Not end of BRK (V)%i\n", info->line);
+                        }
+                        DEBUG_LOG(info->line, "num brk %i\n", info->break_detected_cnt);
+                }
+
+#ifdef SERIAL_DEBUG_INTR
+                printk("** OK, disabling ser_interrupts\n");
+#endif
+                e100_disable_serial_data_irq(info);
+                DINTR2(DEBUG_LOG(info->line, "ser_rx OK %d\n", info->line));
+                info->break_detected_cnt = 0;
+
+                PROCSTAT(ser_stat[info->line].ser_ints_ok_cnt++);
+        }
+        /* Restarting the DMA never hurts */
+        *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart);
+        START_FLUSH_FAST_TIMER(info, "ser_int");
+        return info;
+} /* handle_ser_rx_interrupt */
+
+extern _INLINE_ void handle_ser_tx_interrupt(struct e100_serial *info)
+{
+        unsigned long flags;
+
+        if (info->x_char) {
+                unsigned char rstat;
+                DFLOW(DEBUG_LOG(info->line, "tx_int: xchar 0x%02X\n", info->x_char));
+                save_flags(flags); cli();
+                rstat = info->port[REG_STATUS];
+                DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat));
+
+                info->port[REG_TR_DATA] = info->x_char;
+                info->icount.tx++;
+                info->x_char = 0;
+                /* We must enable since it is disabled in ser_interrupt */
+                e100_enable_serial_tx_ready_irq(info);
+                restore_flags(flags);
+                return;
+        }
+        if (info->uses_dma_out) {
+                unsigned char rstat;
+                int i;
+                /* We only use normal tx interrupt when sending x_char */
+                DFLOW(DEBUG_LOG(info->line, "tx_int: xchar sent\n", 0));
+                save_flags(flags); cli();
+                rstat = info->port[REG_STATUS];
+                DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat));
+                e100_disable_serial_tx_ready_irq(info);
+                if (info->tty->stopped)
+                        rs_stop(info->tty);
+                /* Enable the DMA channel and tell it to continue */
+                e100_enable_txdma_channel(info);
+                /* Wait 12 cycles before doing the DMA command */
+                for(i = 6;  i > 0; i--)
+                        nop();
+
+                *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, continue);
+                restore_flags(flags);
+                return;
+        }
+        /* Normal char-by-char interrupt */
+        if (info->xmit.head == info->xmit.tail
+            || info->tty->stopped
+            || info->tty->hw_stopped) {
+                DFLOW(DEBUG_LOG(info->line, "tx_int: stopped %i\n", info->tty->stopped));
+                e100_disable_serial_tx_ready_irq(info);
+                info->tr_running = 0;
+                return;
+        }
+        DINTR2(DEBUG_LOG(info->line, "tx_int %c\n", info->xmit.buf[info->xmit.tail]));
+        /* Send a byte, rs485 timing is critical so turn of ints */
+        save_flags(flags); cli();
+        info->port[REG_TR_DATA] = info->xmit.buf[info->xmit.tail];
+        info->xmit.tail = (info->xmit.tail + 1) & (SERIAL_XMIT_SIZE-1);
+        info->icount.tx++;
+        if (info->xmit.head == info->xmit.tail) {
+#if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER)
+                if (info->rs485.enabled) {
+                        /* Set a short timer to toggle RTS */
+                        start_one_shot_timer(&fast_timers_rs485[info->line],
+                                             rs485_toggle_rts_timer_function,
+                                             (unsigned long)info,
+                                             info->char_time_usec*2,
+                                             "RS-485");
+                }
+#endif /* RS485 */
+                info->last_tx_active_usec = GET_JIFFIES_USEC();
+                info->last_tx_active = jiffies;
+                e100_disable_serial_tx_ready_irq(info);
+                info->tr_running = 0;
+                DFLOW(DEBUG_LOG(info->line, "tx_int: stop2\n", 0));
+        } else {
+                /* We must enable since it is disabled in ser_interrupt */
+                e100_enable_serial_tx_ready_irq(info);
+        }
+        restore_flags(flags);
+
+        if (CIRC_CNT(info->xmit.head,
+                     info->xmit.tail,
+                     SERIAL_XMIT_SIZE) < WAKEUP_CHARS)
+                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
+
+} /* handle_ser_tx_interrupt */
+
+/* result of time measurements:
+ * RX duration 54-60 us when doing something, otherwise 6-9 us
+ * ser_int duration: just sending: 8-15 us normally, up to 73 us
+ */
+static irqreturn_t
+ser_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        static volatile int tx_started = 0;
+        struct e100_serial *info;
+        int i;
+        unsigned long flags;
+        unsigned long irq_mask1_rd;
+        unsigned long data_mask = (1 << (8+2*0)); /* ser0 data_avail */
+        int handled = 0;
+        static volatile unsigned long reentered_ready_mask = 0;
+
+        save_flags(flags); cli();
+        irq_mask1_rd = *R_IRQ_MASK1_RD;
+        /* First handle all rx interrupts with ints disabled */
+        info = rs_table;
+        irq_mask1_rd &= e100_ser_int_mask;
+        for (i = 0; i < NR_PORTS; i++) {
+                /* Which line caused the data irq? */
+                if (irq_mask1_rd & data_mask) {
+                        handled = 1;
+                        handle_ser_rx_interrupt(info);
+                }
+                info += 1;
+                data_mask <<= 2;
+        }
+        /* Handle tx interrupts with interrupts enabled so we
+         * can take care of new data interrupts while transmitting
+         * We protect the tx part with the tx_started flag.
+         * We disable the tr_ready interrupts we are about to handle and
+         * unblock the serial interrupt so new serial interrupts may come.
+         *
+         * If we get a new interrupt:
+         *  - it migth be due to synchronous serial ports.
+         *  - serial irq will be blocked by general irq handler.
+         *  - async data will be handled above (sync will be ignored).
+         *  - tx_started flag will prevent us from trying to send again and
+         *    we will exit fast - no need to unblock serial irq.
+         *  - Next (sync) serial interrupt handler will be runned with
+         *    disabled interrupt due to restore_flags() at end of function,
+         *    so sync handler will not be preempted or reentered.
+         */
+        if (!tx_started) {
+                unsigned long ready_mask;
+                unsigned long
+                tx_started = 1;
+                /* Only the tr_ready interrupts left */
+                irq_mask1_rd &= (IO_MASK(R_IRQ_MASK1_RD, ser0_ready) |
+                                 IO_MASK(R_IRQ_MASK1_RD, ser1_ready) |
+                                 IO_MASK(R_IRQ_MASK1_RD, ser2_ready) |
+                                 IO_MASK(R_IRQ_MASK1_RD, ser3_ready));
+                while (irq_mask1_rd) {
+                        /* Disable those we are about to handle */
+                        *R_IRQ_MASK1_CLR = irq_mask1_rd;
+                        /* Unblock the serial interrupt */
+                        *R_VECT_MASK_SET = IO_STATE(R_VECT_MASK_SET, serial, set);
+
+                        sti();
+                        ready_mask = (1 << (8+1+2*0)); /* ser0 tr_ready */
+                        info = rs_table;
+                        for (i = 0; i < NR_PORTS; i++) {
+                                /* Which line caused the ready irq? */
+                                if (irq_mask1_rd & ready_mask) {
+                                        handled = 1;
+                                        handle_ser_tx_interrupt(info);
+                                }
+                                info += 1;
+                                ready_mask <<= 2;
+                        }
+                        /* handle_ser_tx_interrupt enables tr_ready interrupts */
+                        cli();
+                        /* Handle reentered TX interrupt */
+                        irq_mask1_rd = reentered_ready_mask;
+                }
+                cli();
+                tx_started = 0;
+        } else {
+                unsigned long ready_mask;
+                ready_mask = irq_mask1_rd & (IO_MASK(R_IRQ_MASK1_RD, ser0_ready) |
+                                             IO_MASK(R_IRQ_MASK1_RD, ser1_ready) |
+                                             IO_MASK(R_IRQ_MASK1_RD, ser2_ready) |
+                                             IO_MASK(R_IRQ_MASK1_RD, ser3_ready));
+                if (ready_mask) {
+                        reentered_ready_mask |= ready_mask;
+                        /* Disable those we are about to handle */
+                        *R_IRQ_MASK1_CLR = ready_mask;
+                        DFLOW(DEBUG_LOG(SERIAL_DEBUG_LINE, "ser_int reentered with TX %X\n", ready_mask));
+                }
+        }
+
+        restore_flags(flags);
+        return IRQ_RETVAL(handled);
+} /* ser_interrupt */
+#endif
+
+/*
+ * -------------------------------------------------------------------
+ * Here ends the serial interrupt routines.
+ * -------------------------------------------------------------------
+ */
+
+/*
+ * This routine is used to handle the "bottom half" processing for the
+ * serial driver, known also the "software interrupt" processing.
+ * This processing is done at the kernel interrupt level, after the
+ * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
+ * is where time-consuming activities which can not be done in the
+ * interrupt driver proper are done; the interrupt driver schedules
+ * them using rs_sched_event(), and they get done here.
+ */
+static void
+do_softint(void *private_)
+{
+        struct e100_serial      *info = (struct e100_serial *) private_;
+        struct tty_struct       *tty;
+
+        tty = info->tty;
+        if (!tty)
+                return;
+
+        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
+                if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+                    tty->ldisc.write_wakeup)
+                        (tty->ldisc.write_wakeup)(tty);
+                wake_up_interruptible(&tty->write_wait);
+        }
+}
+
+static int
+startup(struct e100_serial * info)
+{
+        unsigned long flags;
+        unsigned long xmit_page;
+        int i;
+
+        xmit_page = get_zeroed_page(GFP_KERNEL);
+        if (!xmit_page)
+                return -ENOMEM;
+
+        save_flags(flags);
+        cli();
+
+        /* if it was already initialized, skip this */
+
+        if (info->flags & ASYNC_INITIALIZED) {
+                restore_flags(flags);
+                free_page(xmit_page);
+                return 0;
+        }
+
+        if (info->xmit.buf)
+                free_page(xmit_page);
+        else
+                info->xmit.buf = (unsigned char *) xmit_page;
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("starting up ttyS%d (xmit_buf 0x%p)...\n", info->line, info->xmit.buf);
+#endif
+
+#ifdef CONFIG_SVINTO_SIM
+        /* Bits and pieces collected from below.  Better to have them
+           in one ifdef:ed clause than to mix in a lot of ifdefs,
+           right? */
+        if (info->tty)
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        info->xmit.head = info->xmit.tail = 0;
+        info->first_recv_buffer = info->last_recv_buffer = NULL;
+        info->recv_cnt = info->max_recv_cnt = 0;
+
+        for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++)
+                info->rec_descr[i].buf = NULL;
+
+        /* No real action in the simulator, but may set info important
+           to ioctl. */
+        change_speed(info);
+#else
+
+        /*
+         * Clear the FIFO buffers and disable them
+         * (they will be reenabled in change_speed())
+         */
+
+        /*
+         * Reset the DMA channels and make sure their interrupts are cleared
+         */
+
+        if (info->dma_in_enabled) {
+                info->uses_dma_in = 1;
+                e100_enable_rxdma_channel(info);
+
+                *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset);
+
+                /* Wait until reset cycle is complete */
+                while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->icmdadr) ==
+                       IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, reset));
+
+                /* Make sure the irqs are cleared */
+                *info->iclrintradr =
+                        IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) |
+                        IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do);
+        } else {
+                e100_disable_rxdma_channel(info);
+        }
+
+        if (info->dma_out_enabled) {
+                info->uses_dma_out = 1;
+                e100_enable_txdma_channel(info);
+                *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset);
+
+                while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->ocmdadr) ==
+                       IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, reset));
+
+                /* Make sure the irqs are cleared */
+                *info->oclrintradr =
+                        IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) |
+                        IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do);
+        } else {
+                e100_disable_txdma_channel(info);
+        }
+
+        if (info->tty)
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        info->xmit.head = info->xmit.tail = 0;
+        info->first_recv_buffer = info->last_recv_buffer = NULL;
+        info->recv_cnt = info->max_recv_cnt = 0;
+
+        for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++)
+                info->rec_descr[i].buf = 0;
+
+        /*
+         * and set the speed and other flags of the serial port
+         * this will start the rx/tx as well
+         */
+#ifdef SERIAL_HANDLE_EARLY_ERRORS
+        e100_enable_serial_data_irq(info);
+#endif
+        change_speed(info);
+
+        /* dummy read to reset any serial errors */
+
+        (void)info->port[REG_DATA];
+
+        /* enable the interrupts */
+        if (info->uses_dma_out)
+                e100_enable_txdma_irq(info);
+
+        e100_enable_rx_irq(info);
+
+        info->tr_running = 0; /* to be sure we don't lock up the transmitter */
+
+        /* setup the dma input descriptor and start dma */
+
+        start_receive(info);
+
+        /* for safety, make sure the descriptors last result is 0 bytes written */
+
+        info->tr_descr.sw_len = 0;
+        info->tr_descr.hw_len = 0;
+        info->tr_descr.status = 0;
+
+        /* enable RTS/DTR last */
+
+        e100_rts(info, 1);
+        e100_dtr(info, 1);
+
+#endif /* CONFIG_SVINTO_SIM */
+
+        info->flags |= ASYNC_INITIALIZED;
+
+        restore_flags(flags);
+        return 0;
+}
+
+/*
+ * This routine will shutdown a serial port; interrupts are disabled, and
+ * DTR is dropped if the hangup on close termio flag is on.
+ */
+static void
+shutdown(struct e100_serial * info)
+{
+        unsigned long flags;
+        struct etrax_dma_descr *descr = info->rec_descr;
+        struct etrax_recv_buffer *buffer;
+        int i;
+
+#ifndef CONFIG_SVINTO_SIM
+        /* shut down the transmitter and receiver */
+        DFLOW(DEBUG_LOG(info->line, "shutdown %i\n", info->line));
+        e100_disable_rx(info);
+        info->port[REG_TR_CTRL] = (info->tx_ctrl &= ~0x40);
+
+        /* disable interrupts, reset dma channels */
+        if (info->uses_dma_in) {
+                e100_disable_rxdma_irq(info);
+                *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset);
+                info->uses_dma_in = 0;
+        } else {
+                e100_disable_serial_data_irq(info);
+        }
+
+        if (info->uses_dma_out) {
+                e100_disable_txdma_irq(info);
+                info->tr_running = 0;
+                *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, reset);
+                info->uses_dma_out = 0;
+        } else {
+                e100_disable_serial_tx_ready_irq(info);
+                info->tr_running = 0;
+        }
+
+#endif /* CONFIG_SVINTO_SIM */
+
+        if (!(info->flags & ASYNC_INITIALIZED))
+                return;
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("Shutting down serial port %d (irq %d)....\n", info->line,
+               info->irq);
+#endif
+
+        save_flags(flags);
+        cli(); /* Disable interrupts */
+
+        if (info->xmit.buf) {
+                free_page((unsigned long)info->xmit.buf);
+                info->xmit.buf = NULL;
+        }
+
+        for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++)
+                if (descr[i].buf) {
+                        buffer = phys_to_virt(descr[i].buf) - sizeof *buffer;
+                        kfree(buffer);
+                        descr[i].buf = 0;
+                }
+
+        if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) {
+                /* hang up DTR and RTS if HUPCL is enabled */
+                e100_dtr(info, 0);
+                e100_rts(info, 0); /* could check CRTSCTS before doing this */
+        }
+
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        info->flags &= ~ASYNC_INITIALIZED;
+        restore_flags(flags);
+}
+
+
+/* change baud rate and other assorted parameters */
+
+static void
+change_speed(struct e100_serial *info)
+{
+        unsigned int cflag;
+        unsigned long xoff;
+        unsigned long flags;
+        /* first some safety checks */
+
+        if (!info->tty || !info->tty->termios)
+                return;
+        if (!info->port)
+                return;
+
+        cflag = info->tty->termios->c_cflag;
+
+        /* possibly, the tx/rx should be disabled first to do this safely */
+
+        /* change baud-rate and write it to the hardware */
+        if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) {
+                /* Special baudrate */
+                u32 mask = 0xFF << (info->line*8); /* Each port has 8 bits */
+                unsigned long alt_source =
+                                IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, normal) |
+                                IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, normal);
+                /* R_ALT_SER_BAUDRATE selects the source */
+                DBAUD(printk("Custom baudrate: baud_base/divisor %lu/%i\n",
+                       (unsigned long)info->baud_base, info->custom_divisor));
+                if (info->baud_base == SERIAL_PRESCALE_BASE) {
+                        /* 0, 2-65535 (0=65536) */
+                        u16 divisor = info->custom_divisor;
+                        /* R_SERIAL_PRESCALE (upper 16 bits of R_CLOCK_PRESCALE) */
+                        /* baudrate is 3.125MHz/custom_divisor */
+                        alt_source =
+                                IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, prescale) |
+                                IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, prescale);
+                        alt_source = 0x11;
+                        DBAUD(printk("Writing SERIAL_PRESCALE: divisor %i\n", divisor));
+                        *R_SERIAL_PRESCALE = divisor;
+                        info->baud = SERIAL_PRESCALE_BASE/divisor;
+                }
+#ifdef CONFIG_ETRAX_EXTERN_PB6CLK_ENABLED
+                else if ((info->baud_base==CONFIG_ETRAX_EXTERN_PB6CLK_FREQ/8 &&
+                          info->custom_divisor == 1) ||
+                         (info->baud_base==CONFIG_ETRAX_EXTERN_PB6CLK_FREQ &&
+                          info->custom_divisor == 8)) {
+                                /* ext_clk selected */
+                                alt_source =
+                                        IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, extern) |
+                                        IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, extern);
+                                DBAUD(printk("using external baudrate: %lu\n", CONFIG_ETRAX_EXTERN_PB6CLK_FREQ/8));
+                                info->baud = CONFIG_ETRAX_EXTERN_PB6CLK_FREQ/8;
+                        }
+                }
+#endif
+                else
+                {
+                        /* Bad baudbase, we don't support using timer0
+                         * for baudrate.
+                         */
+                        printk(KERN_WARNING "Bad baud_base/custom_divisor: %lu/%i\n",
+                               (unsigned long)info->baud_base, info->custom_divisor);
+                }
+                r_alt_ser_baudrate_shadow &= ~mask;
+                r_alt_ser_baudrate_shadow |= (alt_source << (info->line*8));
+                *R_ALT_SER_BAUDRATE = r_alt_ser_baudrate_shadow;
+        } else {
+                /* Normal baudrate */
+                /* Make sure we use normal baudrate */
+                u32 mask = 0xFF << (info->line*8); /* Each port has 8 bits */
+                unsigned long alt_source =
+                        IO_STATE(R_ALT_SER_BAUDRATE, ser0_rec, normal) |
+                        IO_STATE(R_ALT_SER_BAUDRATE, ser0_tr, normal);
+                r_alt_ser_baudrate_shadow &= ~mask;
+                r_alt_ser_baudrate_shadow |= (alt_source << (info->line*8));
+#ifndef CONFIG_SVINTO_SIM
+                *R_ALT_SER_BAUDRATE = r_alt_ser_baudrate_shadow;
+#endif /* CONFIG_SVINTO_SIM */
+
+                info->baud = cflag_to_baud(cflag);
+#ifndef CONFIG_SVINTO_SIM
+                info->port[REG_BAUD] = cflag_to_etrax_baud(cflag);
+#endif /* CONFIG_SVINTO_SIM */
+        }
+
+#ifndef CONFIG_SVINTO_SIM
+        /* start with default settings and then fill in changes */
+        save_flags(flags);
+        cli();
+        /* 8 bit, no/even parity */
+        info->rx_ctrl &= ~(IO_MASK(R_SERIAL0_REC_CTRL, rec_bitnr) |
+                           IO_MASK(R_SERIAL0_REC_CTRL, rec_par_en) |
+                           IO_MASK(R_SERIAL0_REC_CTRL, rec_par));
+
+        /* 8 bit, no/even parity, 1 stop bit, no cts */
+        info->tx_ctrl &= ~(IO_MASK(R_SERIAL0_TR_CTRL, tr_bitnr) |
+                           IO_MASK(R_SERIAL0_TR_CTRL, tr_par_en) |
+                           IO_MASK(R_SERIAL0_TR_CTRL, tr_par) |
+                           IO_MASK(R_SERIAL0_TR_CTRL, stop_bits) |
+                           IO_MASK(R_SERIAL0_TR_CTRL, auto_cts));
+
+        if ((cflag & CSIZE) == CS7) {
+                /* set 7 bit mode */
+                info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_bitnr, tr_7bit);
+                info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_bitnr, rec_7bit);
+        }
+
+        if (cflag & CSTOPB) {
+                /* set 2 stop bit mode */
+                info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, stop_bits, two_bits);
+        }
+
+        if (cflag & PARENB) {
+                /* enable parity */
+                info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_par_en, enable);
+                info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_par_en, enable);
+        }
+
+        if (cflag & CMSPAR) {
+                /* enable stick parity, PARODD mean Mark which matches ETRAX */
+                info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_stick_par, stick);
+                info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_stick_par, stick);
+        }
+        if (cflag & PARODD) {
+                /* set odd parity (or Mark if CMSPAR) */
+                info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_par, odd);
+                info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_par, odd);
+        }
+
+        if (cflag & CRTSCTS) {
+                /* enable automatic CTS handling */
+                DFLOW(DEBUG_LOG(info->line, "FLOW auto_cts enabled\n", 0));
+                info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, auto_cts, active);
+        }
+
+        /* make sure the tx and rx are enabled */
+
+        info->tx_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_enable, enable);
+        info->rx_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_enable, enable);
+
+        /* actually write the control regs to the hardware */
+
+        info->port[REG_TR_CTRL] = info->tx_ctrl;
+        info->port[REG_REC_CTRL] = info->rx_ctrl;
+        xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->tty));
+        xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable);
+        if (info->tty->termios->c_iflag & IXON ) {
+                DFLOW(DEBUG_LOG(info->line, "FLOW XOFF enabled 0x%02X\n", STOP_CHAR(info->tty)));
+                xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
+        }
+
+        *((unsigned long *)&info->port[REG_XOFF]) = xoff;
+        restore_flags(flags);
+#endif /* !CONFIG_SVINTO_SIM */
+
+        update_char_time(info);
+
+} /* change_speed */
+
+/* start transmitting chars NOW */
+
+static void
+rs_flush_chars(struct tty_struct *tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        unsigned long flags;
+
+        if (info->tr_running ||
+            info->xmit.head == info->xmit.tail ||
+            tty->stopped ||
+            tty->hw_stopped ||
+            !info->xmit.buf)
+                return;
+
+#ifdef SERIAL_DEBUG_FLOW
+        printk("rs_flush_chars\n");
+#endif
+
+        /* this protection might not exactly be necessary here */
+
+        save_flags(flags);
+        cli();
+        start_transmit(info);
+        restore_flags(flags);
+}
+
+extern _INLINE_ int
+rs_raw_write(struct tty_struct * tty, int from_user,
+          const unsigned char *buf, int count)
+{
+        int     c, ret = 0;
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        unsigned long flags;
+
+        /* first some sanity checks */
+
+        if (!tty || !info->xmit.buf || !tmp_buf)
+                return 0;
+
+#ifdef SERIAL_DEBUG_DATA
+        if (info->line == SERIAL_DEBUG_LINE)
+                printk("rs_raw_write (%d), status %d\n",
+                       count, info->port[REG_STATUS]);
+#endif
+
+#ifdef CONFIG_SVINTO_SIM
+        /* Really simple.  The output is here and now. */
+        SIMCOUT(buf, count);
+        return count;
+#endif
+        save_flags(flags);
+        DFLOW(DEBUG_LOG(info->line, "write count %i ", count));
+        DFLOW(DEBUG_LOG(info->line, "ldisc %i\n", tty->ldisc.chars_in_buffer(tty)));
+
+
+        /* the cli/restore_flags pairs below are needed because the
+         * DMA interrupt handler moves the info->xmit values. the memcpy
+         * needs to be in the critical region unfortunately, because we
+         * need to read xmit values, memcpy, write xmit values in one
+         * atomic operation... this could perhaps be avoided by more clever
+         * design.
+         */
+        if (from_user) {
+                down(&tmp_buf_sem);
+                while (1) {
+                        int c1;
+                        c = CIRC_SPACE_TO_END(info->xmit.head,
+                                              info->xmit.tail,
+                                              SERIAL_XMIT_SIZE);
+                        if (count < c)
+                                c = count;
+                        if (c <= 0)
+                                break;
+
+                        c -= copy_from_user(tmp_buf, buf, c);
+                        if (!c) {
+                                if (!ret)
+                                        ret = -EFAULT;
+                                break;
+                        }
+                        cli();
+                        c1 = CIRC_SPACE_TO_END(info->xmit.head,
+                                               info->xmit.tail,
+                                               SERIAL_XMIT_SIZE);
+                        if (c1 < c)
+                                c = c1;
+                        memcpy(info->xmit.buf + info->xmit.head, tmp_buf, c);
+                        info->xmit.head = ((info->xmit.head + c) &
+                                           (SERIAL_XMIT_SIZE-1));
+                        restore_flags(flags);
+                        buf += c;
+                        count -= c;
+                        ret += c;
+                }
+                up(&tmp_buf_sem);
+        } else {
+                cli();
+                while (count) {
+                        c = CIRC_SPACE_TO_END(info->xmit.head,
+                                              info->xmit.tail,
+                                              SERIAL_XMIT_SIZE);
+
+                        if (count < c)
+                                c = count;
+                        if (c <= 0)
+                                break;
+
+                        memcpy(info->xmit.buf + info->xmit.head, buf, c);
+                        info->xmit.head = (info->xmit.head + c) &
+                                (SERIAL_XMIT_SIZE-1);
+                        buf += c;
+                        count -= c;
+                        ret += c;
+                }
+                restore_flags(flags);
+        }
+
+        /* enable transmitter if not running, unless the tty is stopped
+         * this does not need IRQ protection since if tr_running == 0
+         * the IRQ's are not running anyway for this port.
+         */
+        DFLOW(DEBUG_LOG(info->line, "write ret %i\n", ret));
+
+        if (info->xmit.head != info->xmit.tail &&
+            !tty->stopped &&
+            !tty->hw_stopped &&
+            !info->tr_running) {
+                start_transmit(info);
+        }
+
+        return ret;
+} /* raw_raw_write() */
+
+static int
+rs_write(struct tty_struct * tty, int from_user,
+         const unsigned char *buf, int count)
+{
+#if defined(CONFIG_ETRAX_RS485)
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+
+        if (info->rs485.enabled)
+        {
+                /* If we are in RS-485 mode, we need to toggle RTS and disable
+                 * the receiver before initiating a DMA transfer
+                 */
+#ifdef CONFIG_ETRAX_FAST_TIMER
+                /* Abort any started timer */
+                fast_timers_rs485[info->line].function = NULL;
+                del_fast_timer(&fast_timers_rs485[info->line]);
+#endif
+                e100_rts(info, info->rs485.rts_on_send);
+#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
+                e100_disable_rx(info);
+                e100_enable_rx_irq(info);
+#endif
+
+                if (info->rs485.delay_rts_before_send > 0)
+                        msleep(info->rs485.delay_rts_before_send);
+        }
+#endif /* CONFIG_ETRAX_RS485 */
+
+        count = rs_raw_write(tty, from_user, buf, count);
+
+#if defined(CONFIG_ETRAX_RS485)
+        if (info->rs485.enabled)
+        {
+                unsigned int val;
+                /* If we are in RS-485 mode the following has to be done:
+                 * wait until DMA is ready
+                 * wait on transmit shift register
+                 * toggle RTS
+                 * enable the receiver
+                 */
+
+                /* Sleep until all sent */
+                tty_wait_until_sent(tty, 0);
+#ifdef CONFIG_ETRAX_FAST_TIMER
+                /* Now sleep a little more so that shift register is empty */
+                schedule_usleep(info->char_time_usec * 2);
+#endif
+                /* wait on transmit shift register */
+                do{
+                        get_lsr_info(info, &val);
+                }while (!(val & TIOCSER_TEMT));
+
+                e100_rts(info, info->rs485.rts_after_sent);
+
+#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
+                e100_enable_rx(info);
+                e100_enable_rxdma_irq(info);
+#endif
+        }
+#endif /* CONFIG_ETRAX_RS485 */
+
+        return count;
+} /* rs_write */
+
+
+/* how much space is available in the xmit buffer? */
+
+static int
+rs_write_room(struct tty_struct *tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+
+        return CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);
+}
+
+/* How many chars are in the xmit buffer?
+ * This does not include any chars in the transmitter FIFO.
+ * Use wait_until_sent for waiting for FIFO drain.
+ */
+
+static int
+rs_chars_in_buffer(struct tty_struct *tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+
+        return CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);
+}
+
+/* discard everything in the xmit buffer */
+
+static void
+rs_flush_buffer(struct tty_struct *tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        unsigned long flags;
+
+        save_flags(flags);
+        cli();
+        info->xmit.head = info->xmit.tail = 0;
+        restore_flags(flags);
+
+        wake_up_interruptible(&tty->write_wait);
+
+        if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+            tty->ldisc.write_wakeup)
+                (tty->ldisc.write_wakeup)(tty);
+}
+
+/*
+ * This function is used to send a high-priority XON/XOFF character to
+ * the device
+ *
+ * Since we use DMA we don't check for info->x_char in transmit_chars_dma(),
+ * but we do it in handle_ser_tx_interrupt().
+ * We disable DMA channel and enable tx ready interrupt and write the
+ * character when possible.
+ */
+static void rs_send_xchar(struct tty_struct *tty, char ch)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        unsigned long flags;
+        save_flags(flags); cli();
+        if (info->uses_dma_out) {
+                /* Put the DMA on hold and disable the channel */
+                *info->ocmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, hold);
+                while (IO_EXTRACT(R_DMA_CH6_CMD, cmd, *info->ocmdadr) !=
+                       IO_STATE_VALUE(R_DMA_CH6_CMD, cmd, hold));
+                e100_disable_txdma_channel(info);
+        }
+
+        /* Must make sure transmitter is not stopped before we can transmit */
+        if (tty->stopped)
+                rs_start(tty);
+
+        /* Enable manual transmit interrupt and send from there */
+        DFLOW(DEBUG_LOG(info->line, "rs_send_xchar 0x%02X\n", ch));
+        info->x_char = ch;
+        e100_enable_serial_tx_ready_irq(info);
+        restore_flags(flags);
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_throttle()
+ *
+ * This routine is called by the upper-layer tty layer to signal that
+ * incoming characters should be throttled.
+ * ------------------------------------------------------------
+ */
+static void
+rs_throttle(struct tty_struct * tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+#ifdef SERIAL_DEBUG_THROTTLE
+        char    buf[64];
+
+        printk("throttle %s: %lu....\n", tty_name(tty, buf),
+               (unsigned long)tty->ldisc.chars_in_buffer(tty));
+#endif
+        DFLOW(DEBUG_LOG(info->line,"rs_throttle %lu\n", tty->ldisc.chars_in_buffer(tty)));
+
+        /* Do RTS before XOFF since XOFF might take some time */
+        if (tty->termios->c_cflag & CRTSCTS) {
+                /* Turn off RTS line */
+                e100_rts(info, 0);
+        }
+        if (I_IXOFF(tty))
+                rs_send_xchar(tty, STOP_CHAR(tty));
+
+}
+
+static void
+rs_unthrottle(struct tty_struct * tty)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+#ifdef SERIAL_DEBUG_THROTTLE
+        char    buf[64];
+
+        printk("unthrottle %s: %lu....\n", tty_name(tty, buf),
+               (unsigned long)tty->ldisc.chars_in_buffer(tty));
+#endif
+        DFLOW(DEBUG_LOG(info->line,"rs_unthrottle ldisc %d\n", tty->ldisc.chars_in_buffer(tty)));
+        DFLOW(DEBUG_LOG(info->line,"rs_unthrottle flip.count: %i\n", tty->flip.count));
+        /* Do RTS before XOFF since XOFF might take some time */
+        if (tty->termios->c_cflag & CRTSCTS) {
+                /* Assert RTS line  */
+                e100_rts(info, 1);
+        }
+
+        if (I_IXOFF(tty)) {
+                if (info->x_char)
+                        info->x_char = 0;
+                else
+                        rs_send_xchar(tty, START_CHAR(tty));
+        }
+
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_ioctl() and friends
+ * ------------------------------------------------------------
+ */
+
+static int
+get_serial_info(struct e100_serial * info,
+                struct serial_struct * retinfo)
+{
+        struct serial_struct tmp;
+
+        /* this is all probably wrong, there are a lot of fields
+         * here that we don't have in e100_serial and maybe we
+         * should set them to something else than 0.
+         */
+
+        if (!retinfo)
+                return -EFAULT;
+        memset(&tmp, 0, sizeof(tmp));
+        tmp.type = info->type;
+        tmp.line = info->line;
+        tmp.port = (int)info->port;
+        tmp.irq = info->irq;
+        tmp.flags = info->flags;
+        tmp.baud_base = info->baud_base;
+        tmp.close_delay = info->close_delay;
+        tmp.closing_wait = info->closing_wait;
+        tmp.custom_divisor = info->custom_divisor;
+        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
+                return -EFAULT;
+        return 0;
+}
+
+static int
+set_serial_info(struct e100_serial *info,
+                struct serial_struct *new_info)
+{
+        struct serial_struct new_serial;
+        struct e100_serial old_info;
+        int retval = 0;
+
+        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
+                return -EFAULT;
+
+        old_info = *info;
+
+        if (!capable(CAP_SYS_ADMIN)) {
+                if ((new_serial.type != info->type) ||
+                    (new_serial.close_delay != info->close_delay) ||
+                    ((new_serial.flags & ~ASYNC_USR_MASK) !=
+                     (info->flags & ~ASYNC_USR_MASK)))
+                        return -EPERM;
+                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
+                               (new_serial.flags & ASYNC_USR_MASK));
+                goto check_and_exit;
+        }
+
+        if (info->count > 1)
+                return -EBUSY;
+
+        /*
+         * OK, past this point, all the error checking has been done.
+         * At this point, we start making changes.....
+         */
+
+        info->baud_base = new_serial.baud_base;
+        info->flags = ((info->flags & ~ASYNC_FLAGS) |
+                       (new_serial.flags & ASYNC_FLAGS));
+        info->custom_divisor = new_serial.custom_divisor;
+        info->type = new_serial.type;
+        info->close_delay = new_serial.close_delay;
+        info->closing_wait = new_serial.closing_wait;
+        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+
+ check_and_exit:
+        if (info->flags & ASYNC_INITIALIZED) {
+                change_speed(info);
+        } else
+                retval = startup(info);
+        return retval;
+}
+
+/*
+ * get_lsr_info - get line status register info
+ *
+ * Purpose: Let user call ioctl() to get info when the UART physically
+ *          is emptied.  On bus types like RS485, the transmitter must
+ *          release the bus after transmitting. This must be done when
+ *          the transmit shift register is empty, not be done when the
+ *          transmit holding register is empty.  This functionality
+ *          allows an RS485 driver to be written in user space.
+ */
+static int
+get_lsr_info(struct e100_serial * info, unsigned int *value)
+{
+        unsigned int result = TIOCSER_TEMT;
+#ifndef CONFIG_SVINTO_SIM
+        unsigned long curr_time = jiffies;
+        unsigned long curr_time_usec = GET_JIFFIES_USEC();
+        unsigned long elapsed_usec =
+                (curr_time - info->last_tx_active) * 1000000/HZ +
+                curr_time_usec - info->last_tx_active_usec;
+
+        if (info->xmit.head != info->xmit.tail ||
+            elapsed_usec < 2*info->char_time_usec) {
+                result = 0;
+        }
+#endif
+
+        if (copy_to_user(value, &result, sizeof(int)))
+                return -EFAULT;
+        return 0;
+}
+
+#ifdef SERIAL_DEBUG_IO
+struct state_str
+{
+        int state;
+        const char *str;
+};
+
+const struct state_str control_state_str[] = {
+        {TIOCM_DTR, "DTR" },
+        {TIOCM_RTS, "RTS"},
+        {TIOCM_ST, "ST?" },
+        {TIOCM_SR, "SR?" },
+        {TIOCM_CTS, "CTS" },
+        {TIOCM_CD, "CD" },
+        {TIOCM_RI, "RI" },
+        {TIOCM_DSR, "DSR" },
+        {0, NULL }
+};
+
+char *get_control_state_str(int MLines, char *s)
+{
+        int i = 0;
+
+        s[0]='\0';
+        while (control_state_str[i].str != NULL) {
+                if (MLines & control_state_str[i].state) {
+                        if (s[0] != '\0') {
+                                strcat(s, ", ");
+                        }
+                        strcat(s, control_state_str[i].str);
+                }
+                i++;
+        }
+        return s;
+}
+#endif
+
+static int
+get_modem_info(struct e100_serial * info, unsigned int *value)
+{
+        unsigned int result;
+        /* Polarity isn't verified */
+#if 0 /*def SERIAL_DEBUG_IO  */
+
+        printk("get_modem_info: RTS: %i DTR: %i CD: %i RI: %i DSR: %i CTS: %i\n",
+               E100_RTS_GET(info),
+               E100_DTR_GET(info),
+               E100_CD_GET(info),
+               E100_RI_GET(info),
+               E100_DSR_GET(info),
+               E100_CTS_GET(info));
+#endif
+
+        result =
+                (!E100_RTS_GET(info) ? TIOCM_RTS : 0)
+                | (!E100_DTR_GET(info) ? TIOCM_DTR : 0)
+                | (!E100_RI_GET(info) ? TIOCM_RNG : 0)
+                | (!E100_DSR_GET(info) ? TIOCM_DSR : 0)
+                | (!E100_CD_GET(info) ? TIOCM_CAR : 0)
+                | (!E100_CTS_GET(info) ? TIOCM_CTS : 0);
+
+#ifdef SERIAL_DEBUG_IO
+        printk("e100ser: modem state: %i 0x%08X\n", result, result);
+        {
+                char s[100];
+
+                get_control_state_str(result, s);
+                printk("state: %s\n", s);
+        }
+#endif
+        if (copy_to_user(value, &result, sizeof(int)))
+                return -EFAULT;
+        return 0;
+}
+
+
+static int
+set_modem_info(struct e100_serial * info, unsigned int cmd,
+               unsigned int *value)
+{
+        unsigned int arg;
+
+        if (copy_from_user(&arg, value, sizeof(int)))
+                return -EFAULT;
+
+        switch (cmd) {
+        case TIOCMBIS:
+                if (arg & TIOCM_RTS) {
+                        e100_rts(info, 1);
+                }
+                if (arg & TIOCM_DTR) {
+                        e100_dtr(info, 1);
+                }
+                /* Handle FEMALE behaviour */
+                if (arg & TIOCM_RI) {
+                        e100_ri_out(info, 1);
+                }
+                if (arg & TIOCM_CD) {
+                        e100_cd_out(info, 1);
+                }
+                break;
+        case TIOCMBIC:
+                if (arg & TIOCM_RTS) {
+                        e100_rts(info, 0);
+                }
+                if (arg & TIOCM_DTR) {
+                        e100_dtr(info, 0);
+                }
+                /* Handle FEMALE behaviour */
+                if (arg & TIOCM_RI) {
+                        e100_ri_out(info, 0);
+                }
+                if (arg & TIOCM_CD) {
+                        e100_cd_out(info, 0);
+                }
+                break;
+        case TIOCMSET:
+                e100_rts(info, arg & TIOCM_RTS);
+                e100_dtr(info, arg & TIOCM_DTR);
+                /* Handle FEMALE behaviour */
+                e100_ri_out(info, arg & TIOCM_RI);
+                e100_cd_out(info, arg & TIOCM_CD);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+
+static void
+rs_break(struct tty_struct *tty, int break_state)
+{
+        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
+        unsigned long flags;
+
+        if (!info->port)
+                return;
+
+        save_flags(flags);
+        cli();
+        if (break_state == -1) {
+                /* Go to manual mode and set the txd pin to 0 */
+                info->tx_ctrl &= 0x3F; /* Clear bit 7 (txd) and 6 (tr_enable) */
+        } else {
+                info->tx_ctrl |= (0x80 | 0x40); /* Set bit 7 (txd) and 6 (tr_enable) */
+        }
+        info->port[REG_TR_CTRL] = info->tx_ctrl;
+        restore_flags(flags);
+}
+
+static int
+rs_ioctl(struct tty_struct *tty, struct file * file,
+         unsigned int cmd, unsigned long arg)
+{
+        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
+
+        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
+            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD)  &&
+            (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
+                if (tty->flags & (1 << TTY_IO_ERROR))
+                        return -EIO;
+        }
+
+        switch (cmd) {
+                case TIOCMGET:
+                        return get_modem_info(info, (unsigned int *) arg);
+                case TIOCMBIS:
+                case TIOCMBIC:
+                case TIOCMSET:
+                        return set_modem_info(info, cmd, (unsigned int *) arg);
+                case TIOCGSERIAL:
+                        return get_serial_info(info,
+                                               (struct serial_struct *) arg);
+                case TIOCSSERIAL:
+                        return set_serial_info(info,
+                                               (struct serial_struct *) arg);
+                case TIOCSERGETLSR: /* Get line status register */
+                        return get_lsr_info(info, (unsigned int *) arg);
+
+                case TIOCSERGSTRUCT:
+                        if (copy_to_user((struct e100_serial *) arg,
+                                         info, sizeof(struct e100_serial)))
+                                return -EFAULT;
+                        return 0;
+
+#if defined(CONFIG_ETRAX_RS485)
+                case TIOCSERSETRS485:
+                {
+                        struct rs485_control rs485ctrl;
+                        if (copy_from_user(&rs485ctrl, (struct rs485_control*)arg, sizeof(rs485ctrl)))
+                                return -EFAULT;
+
+                        return e100_enable_rs485(tty, &rs485ctrl);
+                }
+
+                case TIOCSERWRRS485:
+                {
+                        struct rs485_write rs485wr;
+                        if (copy_from_user(&rs485wr, (struct rs485_write*)arg, sizeof(rs485wr)))
+                                return -EFAULT;
+
+                        return e100_write_rs485(tty, 1, rs485wr.outc, rs485wr.outc_size);
+                }
+#endif
+
+                default:
+                        return -ENOIOCTLCMD;
+        }
+        return 0;
+}
+
+static void
+rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+{
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+
+        if (tty->termios->c_cflag == old_termios->c_cflag &&
+            tty->termios->c_iflag == old_termios->c_iflag)
+                return;
+
+        change_speed(info);
+
+        /* Handle turning off CRTSCTS */
+        if ((old_termios->c_cflag & CRTSCTS) &&
+            !(tty->termios->c_cflag & CRTSCTS)) {
+                tty->hw_stopped = 0;
+                rs_start(tty);
+        }
+
+}
+
+/* In debugport.c - register a console write function that uses the normal
+ * serial driver
+ */
+typedef int (*debugport_write_function)(int i, const char *buf, unsigned int len);
+
+extern debugport_write_function debug_write_function;
+
+static int rs_debug_write_function(int i, const char *buf, unsigned int len)
+{
+        int cnt;
+        int written = 0;
+        struct tty_struct *tty;
+        static int recurse_cnt = 0;
+
+        tty = rs_table[i].tty;
+        if (tty)  {
+                unsigned long flags;
+                if (recurse_cnt > 5) /* We skip this debug output */
+                        return 1;
+
+                local_irq_save(flags);
+                recurse_cnt++;
+                local_irq_restore(flags);
+                do {
+                        cnt = rs_write(tty, 0, buf + written, len);
+                        if (cnt >= 0) {
+                                written += cnt;
+                                buf += cnt;
+                                len -= cnt;
+                        } else
+                                len = cnt;
+                } while(len > 0);
+                local_irq_save(flags);
+                recurse_cnt--;
+                local_irq_restore(flags);
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_close()
+ *
+ * This routine is called when the serial port gets closed.  First, we
+ * wait for the last remaining data to be sent.  Then, we unlink its
+ * S structure from the interrupt chain if necessary, and we free
+ * that IRQ if nothing is left in the chain.
+ * ------------------------------------------------------------
+ */
+static void
+rs_close(struct tty_struct *tty, struct file * filp)
+{
+        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
+        unsigned long flags;
+
+        if (!info)
+                return;
+
+        /* interrupts are disabled for this entire function */
+
+        save_flags(flags);
+        cli();
+
+        if (tty_hung_up_p(filp)) {
+                restore_flags(flags);
+                return;
+        }
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("[%d] rs_close ttyS%d, count = %d\n", current->pid,
+               info->line, info->count);
+#endif
+        if ((tty->count == 1) && (info->count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  Info->count should always
+                 * be one in these conditions.  If it's greater than
+                 * one, we've got real problems, since it means the
+                 * serial port won't be shutdown.
+                 */
+                printk(KERN_CRIT
+                       "rs_close: bad serial port count; tty->count is 1, "
+                       "info->count is %d\n", info->count);
+                info->count = 1;
+        }
+        if (--info->count < 0) {
+                printk(KERN_CRIT "rs_close: bad serial port count for ttyS%d: %d\n",
+                       info->line, info->count);
+                info->count = 0;
+        }
+        if (info->count) {
+                restore_flags(flags);
+                return;
+        }
+        info->flags |= ASYNC_CLOSING;
+        /*
+         * Save the termios structure, since this port may have
+         * separate termios for callout and dialin.
+         */
+        if (info->flags & ASYNC_NORMAL_ACTIVE)
+                info->normal_termios = *tty->termios;
+        /*
+         * Now we wait for the transmit buffer to clear; and we notify
+         * the line discipline to only process XON/XOFF characters.
+         */
+        tty->closing = 1;
+        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->closing_wait);
+        /*
+         * At this point we stop accepting input.  To do this, we
+         * disable the serial receiver and the DMA receive interrupt.
+         */
+#ifdef SERIAL_HANDLE_EARLY_ERRORS
+        e100_disable_serial_data_irq(info);
+#endif
+
+#ifndef CONFIG_SVINTO_SIM
+        e100_disable_rx(info);
+        e100_disable_rx_irq(info);
+
+        if (info->flags & ASYNC_INITIALIZED) {
+                /*
+                 * Before we drop DTR, make sure the UART transmitter
+                 * has completely drained; this is especially
+                 * important as we have a transmit FIFO!
+                 */
+                rs_wait_until_sent(tty, HZ);
+        }
+#endif
+
+        shutdown(info);
+        if (tty->driver->flush_buffer)
+                tty->driver->flush_buffer(tty);
+        if (tty->ldisc.flush_buffer)
+                tty->ldisc.flush_buffer(tty);
+        tty->closing = 0;
+        info->event = 0;
+        info->tty = 0;
+        if (info->blocked_open) {
+                if (info->close_delay) {
+                        set_current_state(TASK_INTERRUPTIBLE);
+                        schedule_timeout(info->close_delay);
+                }
+                wake_up_interruptible(&info->open_wait);
+        }
+        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&info->close_wait);
+        restore_flags(flags);
+
+        /* port closed */
+
+#if defined(CONFIG_ETRAX_RS485)
+        if (info->rs485.enabled) {
+                info->rs485.enabled = 0;
+#if defined(CONFIG_ETRAX_RS485_ON_PA)
+                *R_PORT_PA_DATA = port_pa_data_shadow &= ~(1 << rs485_pa_bit);
+#endif
+#if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
+                REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow,
+                               rs485_port_g_bit, 0);
+#endif
+#if defined(CONFIG_ETRAX_RS485_LTC1387)
+                REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow,
+                               CONFIG_ETRAX_RS485_LTC1387_DXEN_PORT_G_BIT, 0);
+                REG_SHADOW_SET(R_PORT_G_DATA, port_g_data_shadow,
+                               CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 0);
+#endif
+        }
+#endif
+}
+
+/*
+ * rs_wait_until_sent() --- wait until the transmitter is empty
+ */
+static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
+{
+        unsigned long orig_jiffies;
+        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
+        unsigned long curr_time = jiffies;
+        unsigned long curr_time_usec = GET_JIFFIES_USEC();
+        long elapsed_usec =
+                (curr_time - info->last_tx_active) * (1000000/HZ) +
+                curr_time_usec - info->last_tx_active_usec;
+
+        /*
+         * Check R_DMA_CHx_STATUS bit 0-6=number of available bytes in FIFO
+         * R_DMA_CHx_HWSW bit 31-16=nbr of bytes left in DMA buffer (0=64k)
+         */
+        orig_jiffies = jiffies;
+        while (info->xmit.head != info->xmit.tail || /* More in send queue */
+               (*info->ostatusadr & 0x007f) ||  /* more in FIFO */
+               (elapsed_usec < 2*info->char_time_usec)) {
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(1);
+                if (signal_pending(current))
+                        break;
+                if (timeout && time_after(jiffies, orig_jiffies + timeout))
+                        break;
+                curr_time = jiffies;
+                curr_time_usec = GET_JIFFIES_USEC();
+                elapsed_usec =
+                        (curr_time - info->last_tx_active) * (1000000/HZ) +
+                        curr_time_usec - info->last_tx_active_usec;
+        }
+        set_current_state(TASK_RUNNING);
+}
+
+/*
+ * rs_hangup() --- called by tty_hangup() when a hangup is signaled.
+ */
+void
+rs_hangup(struct tty_struct *tty)
+{
+        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
+
+        rs_flush_buffer(tty);
+        shutdown(info);
+        info->event = 0;
+        info->count = 0;
+        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->tty = 0;
+        wake_up_interruptible(&info->open_wait);
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_open() and friends
+ * ------------------------------------------------------------
+ */
+static int
+block_til_ready(struct tty_struct *tty, struct file * filp,
+                struct e100_serial *info)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        unsigned long   flags;
+        int             retval;
+        int             do_clocal = 0, extra_count = 0;
+
+        /*
+         * If the device is in the middle of being closed, then block
+         * until it's done, and then try again.
+         */
+        if (tty_hung_up_p(filp) ||
+            (info->flags & ASYNC_CLOSING)) {
+                if (info->flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->close_wait);
+#ifdef SERIAL_DO_RESTART
+                if (info->flags & ASYNC_HUP_NOTIFY)
+                        return -EAGAIN;
+                else
+                        return -ERESTARTSYS;
+#else
+                return -EAGAIN;
+#endif
+        }
+
+        /*
+         * If non-blocking mode is set, or the port is not enabled,
+         * then make the check up front and then exit.
+         */
+        if ((filp->f_flags & O_NONBLOCK) ||
+            (tty->flags & (1 << TTY_IO_ERROR))) {
+                info->flags |= ASYNC_NORMAL_ACTIVE;
+                return 0;
+        }
+
+        if (tty->termios->c_cflag & CLOCAL) {
+                        do_clocal = 1;
+        }
+
+        /*
+         * Block waiting for the carrier detect and the line to become
+         * free (i.e., not in use by the callout).  While we are in
+         * this loop, info->count is dropped by one, so that
+         * rs_close() knows when to free things.  We restore it upon
+         * exit, either normal or abnormal.
+         */
+        retval = 0;
+        add_wait_queue(&info->open_wait, &wait);
+#ifdef SERIAL_DEBUG_OPEN
+        printk("block_til_ready before block: ttyS%d, count = %d\n",
+               info->line, info->count);
+#endif
+        save_flags(flags);
+        cli();
+        if (!tty_hung_up_p(filp)) {
+                extra_count++;
+                info->count--;
+        }
+        restore_flags(flags);
+        info->blocked_open++;
+        while (1) {
+                save_flags(flags);
+                cli();
+                /* assert RTS and DTR */
+                e100_rts(info, 1);
+                e100_dtr(info, 1);
+                restore_flags(flags);
+                set_current_state(TASK_INTERRUPTIBLE);
+                if (tty_hung_up_p(filp) ||
+                    !(info->flags & ASYNC_INITIALIZED)) {
+#ifdef SERIAL_DO_RESTART
+                        if (info->flags & ASYNC_HUP_NOTIFY)
+                                retval = -EAGAIN;
+                        else
+                                retval = -ERESTARTSYS;
+#else
+                        retval = -EAGAIN;
+#endif
+                        break;
+                }
+                if (!(info->flags & ASYNC_CLOSING) && do_clocal)
+                        /* && (do_clocal || DCD_IS_ASSERTED) */
+                        break;
+                if (signal_pending(current)) {
+                        retval = -ERESTARTSYS;
+                        break;
+                }
+#ifdef SERIAL_DEBUG_OPEN
+                printk("block_til_ready blocking: ttyS%d, count = %d\n",
+                       info->line, info->count);
+#endif
+                schedule();
+        }
+        set_current_state(TASK_RUNNING);
+        remove_wait_queue(&info->open_wait, &wait);
+        if (extra_count)
+                info->count++;
+        info->blocked_open--;
+#ifdef SERIAL_DEBUG_OPEN
+        printk("block_til_ready after blocking: ttyS%d, count = %d\n",
+               info->line, info->count);
+#endif
+        if (retval)
+                return retval;
+        info->flags |= ASYNC_NORMAL_ACTIVE;
+        return 0;
+}
+
+/*
+ * This routine is called whenever a serial port is opened.
+ * It performs the serial-specific initialization for the tty structure.
+ */
+static int
+rs_open(struct tty_struct *tty, struct file * filp)
+{
+        struct e100_serial      *info;
+        int                     retval, line;
+        unsigned long           page;
+
+        /* find which port we want to open */
+
+        line = tty->index;
+
+        if (line < 0 || line >= NR_PORTS)
+                return -ENODEV;
+
+        /* find the corresponding e100_serial struct in the table */
+        info = rs_table + line;
+
+        /* don't allow the opening of ports that are not enabled in the HW config */
+        if (!info->enabled)
+                return -ENODEV;
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("[%d] rs_open %s, count = %d\n", current->pid, tty->name,
+               info->count);
+#endif
+
+        info->count++;
+        tty->driver_data = info;
+        info->tty = tty;
+
+        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+
+        if (!tmp_buf) {
+                page = get_zeroed_page(GFP_KERNEL);
+                if (!page) {
+                        return -ENOMEM;
+                }
+                if (tmp_buf)
+                        free_page(page);
+                else
+                        tmp_buf = (unsigned char *) page;
+        }
+
+        /*
+         * If the port is in the middle of closing, bail out now
+         */
+        if (tty_hung_up_p(filp) ||
+            (info->flags & ASYNC_CLOSING)) {
+                if (info->flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->close_wait);
+#ifdef SERIAL_DO_RESTART
+                return ((info->flags & ASYNC_HUP_NOTIFY) ?
+                        -EAGAIN : -ERESTARTSYS);
+#else
+                return -EAGAIN;
+#endif
+        }
+
+        /*
+         * Start up the serial port
+         */
+
+        retval = startup(info);
+        if (retval)
+                return retval;
+
+        retval = block_til_ready(tty, filp, info);
+        if (retval) {
+#ifdef SERIAL_DEBUG_OPEN
+                printk("rs_open returning after block_til_ready with %d\n",
+                       retval);
+#endif
+                return retval;
+        }
+
+        if ((info->count == 1) && (info->flags & ASYNC_SPLIT_TERMIOS)) {
+                *tty->termios = info->normal_termios;
+                change_speed(info);
+        }
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("rs_open ttyS%d successful...\n", info->line);
+#endif
+        DLOG_INT_TRIG( log_int_pos = 0);
+
+        DFLIP(  if (info->line == SERIAL_DEBUG_LINE) {
+                        info->icount.rx = 0;
+                } );
+
+        return 0;
+}
+
+/*
+ * /proc fs routines....
+ */
+
+extern _INLINE_ int line_info(char *buf, struct e100_serial *info)
+{
+        char    stat_buf[30];
+        int     ret;
+        unsigned long tmp;
+
+        ret = sprintf(buf, "%d: uart:E100 port:%lX irq:%d",
+                      info->line, (unsigned long)info->port, info->irq);
+
+        if (!info->port || (info->type == PORT_UNKNOWN)) {
+                ret += sprintf(buf+ret, "\n");
+                return ret;
+        }
+
+        stat_buf[0] = 0;
+        stat_buf[1] = 0;
+        if (!E100_RTS_GET(info))
+                strcat(stat_buf, "|RTS");
+        if (!E100_CTS_GET(info))
+                strcat(stat_buf, "|CTS");
+        if (!E100_DTR_GET(info))
+                strcat(stat_buf, "|DTR");
+        if (!E100_DSR_GET(info))
+                strcat(stat_buf, "|DSR");
+        if (!E100_CD_GET(info))
+                strcat(stat_buf, "|CD");
+        if (!E100_RI_GET(info))
+                strcat(stat_buf, "|RI");
+
+        ret += sprintf(buf+ret, " baud:%d", info->baud);
+
+        ret += sprintf(buf+ret, " tx:%lu rx:%lu",
+                       (unsigned long)info->icount.tx,
+                       (unsigned long)info->icount.rx);
+        tmp = CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE);
+        if (tmp) {
+                ret += sprintf(buf+ret, " tx_pend:%lu/%lu",
+                               (unsigned long)tmp,
+                               (unsigned long)SERIAL_XMIT_SIZE);
+        }
+
+        ret += sprintf(buf+ret, " rx_pend:%lu/%lu",
+                       (unsigned long)info->recv_cnt,
+                       (unsigned long)info->max_recv_cnt);
+
+#if 1
+        if (info->tty) {
+
+                if (info->tty->stopped)
+                        ret += sprintf(buf+ret, " stopped:%i",
+                                       (int)info->tty->stopped);
+                if (info->tty->hw_stopped)
+                        ret += sprintf(buf+ret, " hw_stopped:%i",
+                                       (int)info->tty->hw_stopped);
+        }
+
+        {
+                unsigned char rstat = info->port[REG_STATUS];
+                if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) )
+                        ret += sprintf(buf+ret, " xoff_detect:1");
+        }
+
+#endif
+
+
+
+
+        if (info->icount.frame)
+                ret += sprintf(buf+ret, " fe:%lu",
+                               (unsigned long)info->icount.frame);
+
+        if (info->icount.parity)
+                ret += sprintf(buf+ret, " pe:%lu",
+                               (unsigned long)info->icount.parity);
+
+        if (info->icount.brk)
+                ret += sprintf(buf+ret, " brk:%lu",
+                               (unsigned long)info->icount.brk);
+
+        if (info->icount.overrun)
+                ret += sprintf(buf+ret, " oe:%lu",
+                               (unsigned long)info->icount.overrun);
+
+        /*
+         * Last thing is the RS-232 status lines
+         */
+        ret += sprintf(buf+ret, " %s\n", stat_buf+1);
+        return ret;
+}
+
+int rs_read_proc(char *page, char **start, off_t off, int count,
+                 int *eof, void *data)
+{
+        int i, len = 0, l;
+        off_t   begin = 0;
+
+        len += sprintf(page, "serinfo:1.0 driver:%s\n",
+                       serial_version);
+        for (i = 0; i < NR_PORTS && len < 4000; i++) {
+                if (!rs_table[i].enabled)
+                        continue;
+                l = line_info(page + len, &rs_table[i]);
+                len += l;
+                if (len+begin > off+count)
+                        goto done;
+                if (len+begin < off) {
+                        begin += len;
+                        len = 0;
+                }
+        }
+#ifdef DEBUG_LOG_INCLUDED
+        for (i = 0; i < debug_log_pos; i++) {
+                len += sprintf(page + len, "%-4i %lu.%lu ", i, debug_log[i].time, timer_data_to_ns(debug_log[i].timer_data));
+                len += sprintf(page + len, debug_log[i].string, debug_log[i].value);
+                if (len+begin > off+count)
+                        goto done;
+                if (len+begin < off) {
+                        begin += len;
+                        len = 0;
+                }
+        }
+        len += sprintf(page + len, "debug_log %i/%i  %li bytes\n",
+                       i, DEBUG_LOG_SIZE, begin+len);
+        debug_log_pos = 0;
+#endif
+
+        *eof = 1;
+done:
+        if (off >= len+begin)
+                return 0;
+        *start = page + (off-begin);
+        return ((count < begin+len-off) ? count : begin+len-off);
+}
+
+/* Finally, routines used to initialize the serial driver. */
+
+static void
+show_serial_version(void)
+{
+        printk(KERN_INFO
+               "ETRAX 100LX serial-driver %s, (c) 2000-2004 Axis Communications AB\r\n",
+               &serial_version[11]); /* "$Revision: x.yy" */
+}
+
+/* rs_init inits the driver at boot (using the module_init chain) */
+
+static struct tty_operations rs_ops = {
+        .open = rs_open,
+        .close = rs_close,
+        .write = rs_write,
+        .flush_chars = rs_flush_chars,
+        .write_room = rs_write_room,
+        .chars_in_buffer = rs_chars_in_buffer,
+        .flush_buffer = rs_flush_buffer,
+        .ioctl = rs_ioctl,
+        .throttle = rs_throttle,
+        .unthrottle = rs_unthrottle,
+        .set_termios = rs_set_termios,
+        .stop = rs_stop,
+        .start = rs_start,
+        .hangup = rs_hangup,
+        .break_ctl = rs_break,
+        .send_xchar = rs_send_xchar,
+        .wait_until_sent = rs_wait_until_sent,
+        .read_proc = rs_read_proc,
+};
+
+static int __init
+rs_init(void)
+{
+        int i;
+        struct e100_serial *info;
+        struct tty_driver *driver = alloc_tty_driver(NR_PORTS);
+
+        if (!driver)
+                return -ENOMEM;
+
+        show_serial_version();
+
+        /* Setup the timed flush handler system */
+
+#if !defined(CONFIG_ETRAX_SERIAL_FAST_TIMER)
+        init_timer(&flush_timer);
+        flush_timer.function = timed_flush_handler;
+        mod_timer(&flush_timer, jiffies + CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS);
+#endif
+
+        /* Initialize the tty_driver structure */
+
+        driver->driver_name = "serial";
+        driver->name = "ttyS";
+        driver->major = TTY_MAJOR;
+        driver->minor_start = 64;
+        driver->type = TTY_DRIVER_TYPE_SERIAL;
+        driver->subtype = SERIAL_TYPE_NORMAL;
+        driver->init_termios = tty_std_termios;
+        driver->init_termios.c_cflag =
+                B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
+        driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        driver->termios = serial_termios;
+        driver->termios_locked = serial_termios_locked;
+
+        tty_set_operations(driver, &rs_ops);
+        serial_driver = driver;
+        if (tty_register_driver(driver))
+                panic("Couldn't register serial driver\n");
+        /* do some initializing for the separate ports */
+
+        for (i = 0, info = rs_table; i < NR_PORTS; i++,info++) {
+                info->uses_dma_in = 0;
+                info->uses_dma_out = 0;
+                info->line = i;
+                info->tty = 0;
+                info->type = PORT_ETRAX;
+                info->tr_running = 0;
+                info->forced_eop = 0;
+                info->baud_base = DEF_BAUD_BASE;
+                info->custom_divisor = 0;
+                info->flags = 0;
+                info->close_delay = 5*HZ/10;
+                info->closing_wait = 30*HZ;
+                info->x_char = 0;
+                info->event = 0;
+                info->count = 0;
+                info->blocked_open = 0;
+                info->normal_termios = driver->init_termios;
+                init_waitqueue_head(&info->open_wait);
+                init_waitqueue_head(&info->close_wait);
+                info->xmit.buf = NULL;
+                info->xmit.tail = info->xmit.head = 0;
+                info->first_recv_buffer = info->last_recv_buffer = NULL;
+                info->recv_cnt = info->max_recv_cnt = 0;
+                info->last_tx_active_usec = 0;
+                info->last_tx_active = 0;
+
+#if defined(CONFIG_ETRAX_RS485)
+                /* Set sane defaults */
+                info->rs485.rts_on_send = 0;
+                info->rs485.rts_after_sent = 1;
+                info->rs485.delay_rts_before_send = 0;
+                info->rs485.enabled = 0;
+#endif
+                INIT_WORK(&info->work, do_softint, info);
+
+                if (info->enabled) {
+                        printk(KERN_INFO "%s%d at 0x%x is a builtin UART with DMA\n",
+                               serial_driver->name, info->line, (unsigned int)info->port);
+                }
+        }
+#ifdef CONFIG_ETRAX_FAST_TIMER
+#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
+        memset(fast_timers, 0, sizeof(fast_timers));
+#endif
+#ifdef CONFIG_ETRAX_RS485
+        memset(fast_timers_rs485, 0, sizeof(fast_timers_rs485));
+#endif
+        fast_timer_init();
+#endif
+
+#ifndef CONFIG_SVINTO_SIM
+        /* Not needed in simulator.  May only complicate stuff. */
+        /* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */
+
+        if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial ", NULL))
+                panic("irq8");
+
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
+#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT
+        if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 0 dma tr", NULL))
+                panic("irq22");
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN
+        if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 0 dma rec", NULL))
+                panic("irq23");
+#endif
+#endif
+
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
+#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT
+        if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 1 dma tr", NULL))
+                panic("irq24");
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN
+        if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 1 dma rec", NULL))
+                panic("irq25");
+#endif
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
+        /* DMA Shared with par0 (and SCSI0 and ATA) */
+#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT
+        if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma tr", NULL))
+                panic("irq18");
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN
+        if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma rec", NULL))
+                panic("irq19");
+#endif
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
+        /* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */
+#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT
+        if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma tr", NULL))
+                panic("irq20");
+#endif
+#ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN
+        if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma rec", NULL))
+                panic("irq21");
+#endif
+#endif
+
+#ifdef CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST
+        if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, SA_SHIRQ | SA_INTERRUPT,
+                       "fast serial dma timeout", NULL)) {
+                printk(KERN_CRIT "err: timer1 irq\n");
+        }
+#endif
+#endif /* CONFIG_SVINTO_SIM */
+        debug_write_function = rs_debug_write_function;
+        return 0;
+}
+
+/* this makes sure that rs_init is called during kernel boot */
+
+module_init(rs_init);
+
+/*
+ * register_serial and unregister_serial allows for serial ports to be
+ * configured at run-time, to support PCMCIA modems.
+ */
+int
+register_serial(struct serial_struct *req)
+{
+        return -1;
+}
+
+void unregister_serial(int line)
+{
+}
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
new file mode 100644
index 000000000000..1800c0e7531a
--- /dev/null
+++ b/drivers/serial/crisv10.h
@@ -0,0 +1,137 @@
+/*
+ * serial.h: Arch-dep definitions for the Etrax100 serial driver.
+ *
+ * Copyright (C) 1998, 1999, 2000 Axis Communications AB
+ */
+
+#ifndef _ETRAX_SERIAL_H
+#define _ETRAX_SERIAL_H
+
+#include <linux/config.h>
+#include <linux/circ_buf.h>
+#include <asm/termios.h>
+
+/* Software state per channel */
+
+#ifdef __KERNEL__
+/*
+ * This is our internal structure for each serial port's state.
+ *
+ * Many fields are paralleled by the structure used by the serial_struct
+ * structure.
+ *
+ * For definitions of the flags field, see tty.h
+ */
+
+#define SERIAL_RECV_DESCRIPTORS 8
+
+struct etrax_recv_buffer {
+        struct etrax_recv_buffer *next;
+        unsigned short length;
+        unsigned char error;
+        unsigned char pad;
+
+        unsigned char buffer[0];
+};
+
+struct e100_serial {
+        int                     baud;
+        volatile u8             *port; /* R_SERIALx_CTRL */
+        u32                     irq;  /* bitnr in R_IRQ_MASK2 for dmaX_descr */
+
+        /* Output registers */
+        volatile u8             *oclrintradr; /* adr to R_DMA_CHx_CLR_INTR */
+        volatile u32            *ofirstadr;   /* adr to R_DMA_CHx_FIRST */
+        volatile u8             *ocmdadr;     /* adr to R_DMA_CHx_CMD */
+        const volatile u8       *ostatusadr;  /* adr to R_DMA_CHx_STATUS */
+
+        /* Input registers */
+        volatile u8             *iclrintradr; /* adr to R_DMA_CHx_CLR_INTR */
+        volatile u32            *ifirstadr;   /* adr to R_DMA_CHx_FIRST */
+        volatile u8             *icmdadr;     /* adr to R_DMA_CHx_CMD */
+        volatile u32            *idescradr;   /* adr to R_DMA_CHx_DESCR */
+
+        int                     flags;  /* defined in tty.h */
+
+        u8                      rx_ctrl; /* shadow for R_SERIALx_REC_CTRL */
+        u8                      tx_ctrl; /* shadow for R_SERIALx_TR_CTRL */
+        u8                      iseteop; /* bit number for R_SET_EOP for the input dma */
+        int                     enabled; /* Set to 1 if the port is enabled in HW config */
+
+        u8              dma_out_enabled:1; /* Set to 1 if DMA should be used */
+        u8              dma_in_enabled:1;  /* Set to 1 if DMA should be used */
+
+        /* end of fields defined in rs_table[] in .c-file */
+        u8              uses_dma_in;  /* Set to 1 if DMA is used */
+        u8              uses_dma_out; /* Set to 1 if DMA is used */
+        u8              forced_eop;   /* a fifo eop has been forced */
+        int                     baud_base;     /* For special baudrates */
+        int                     custom_divisor; /* For special baudrates */
+        struct etrax_dma_descr  tr_descr;
+        struct etrax_dma_descr  rec_descr[SERIAL_RECV_DESCRIPTORS];
+        int                     cur_rec_descr;
+
+        volatile int            tr_running; /* 1 if output is running */
+
+        struct tty_struct       *tty;
+        int                     read_status_mask;
+        int                     ignore_status_mask;
+        int                     x_char; /* xon/xoff character */
+        int                     close_delay;
+        unsigned short          closing_wait;
+        unsigned short          closing_wait2;
+        unsigned long           event;
+        unsigned long           last_active;
+        int                     line;
+        int                     type;  /* PORT_ETRAX */
+        int                     count;      /* # of fd on device */
+        int                     blocked_open; /* # of blocked opens */
+        struct circ_buf         xmit;
+        struct etrax_recv_buffer *first_recv_buffer;
+        struct etrax_recv_buffer *last_recv_buffer;
+        unsigned int            recv_cnt;
+        unsigned int            max_recv_cnt;
+
+        struct work_struct      work;
+        struct async_icount     icount;   /* error-statistics etc.*/
+        struct termios          normal_termios;
+        struct termios          callout_termios;
+#ifdef DECLARE_WAITQUEUE
+        wait_queue_head_t       open_wait;
+        wait_queue_head_t       close_wait;
+#else
+        struct wait_queue       *open_wait;
+        struct wait_queue       *close_wait;
+#endif
+
+        unsigned long           char_time_usec;       /* The time for 1 char, in usecs */
+        unsigned long           flush_time_usec;      /* How often we should flush */
+        unsigned long           last_tx_active_usec;  /* Last tx usec in the jiffies */
+        unsigned long           last_tx_active;       /* Last tx time in jiffies */
+        unsigned long           last_rx_active_usec;  /* Last rx usec in the jiffies */
+        unsigned long           last_rx_active;       /* Last rx time in jiffies */
+
+        int                     break_detected_cnt;
+        int                     errorcode;
+
+#ifdef CONFIG_ETRAX_RS485
+        struct rs485_control    rs485;  /* RS-485 support */
+#endif
+};
+
+/* this PORT is not in the standard serial.h. it's not actually used for
+ * anything since we only have one type of async serial-port anyway in this
+ * system.
+ */
+
+#define PORT_ETRAX 1
+
+/*
+ * Events are used to schedule things to happen at timer-interrupt
+ * time, instead of at rs interrupt time.
+ */
+#define RS_EVENT_WRITE_WAKEUP   0
+
+#endif /* __KERNEL__ */
+
+#endif /* !_ETRAX_SERIAL_H */
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
new file mode 100644
index 000000000000..97824eeeafae
--- /dev/null
+++ b/drivers/serial/dz.c
@@ -0,0 +1,822 @@
+/*
+ * dz.c: Serial port driver for DECStations equiped 
+ *       with the DZ chipset.
+ *
+ * Copyright (C) 1998 Olivier A. D. Lebaillif 
+ *             
+ * Email: olivier.lebaillif@ifrsys.com
+ *
+ * [31-AUG-98] triemer
+ * Changed IRQ to use Harald's dec internals interrupts.h
+ * removed base_addr code - moving address assignment to setup.c
+ * Changed name of dz_init to rs_init to be consistent with tc code
+ * [13-NOV-98] triemer fixed code to receive characters
+ *    after patches by harald to irq code.  
+ * [09-JAN-99] triemer minor fix for schedule - due to removal of timeout
+ *            field from "current" - somewhere between 2.1.121 and 2.1.131
+ Qua Jun 27 15:02:26 BRT 2001
+ * [27-JUN-2001] Arnaldo Carvalho de Melo <acme@conectiva.com.br> - cleanups
+ *  
+ * Parts (C) 1999 David Airlie, airlied@linux.ie 
+ * [07-SEP-99] Bugfixes 
+ *
+ * [06-Jan-2002] Russell King <rmk@arm.linux.org.uk>
+ * Converted to new serial core
+ */
+
+#undef DEBUG_DZ
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/bootinfo.h>
+#include <asm/dec/interrupts.h>
+#include <asm/dec/kn01.h>
+#include <asm/dec/kn02.h>
+#include <asm/dec/machtype.h>
+#include <asm/dec/prom.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
+
+#define CONSOLE_LINE (3)        /* for definition of struct console */
+
+#include "dz.h"
+
+#define DZ_INTR_DEBUG 1
+
+static char *dz_name = "DECstation DZ serial driver version ";
+static char *dz_version = "1.02";
+
+struct dz_port {
+        struct uart_port        port;
+        unsigned int            cflag;
+};
+
+static struct dz_port dz_ports[DZ_NB_PORT];
+
+#ifdef DEBUG_DZ
+/*
+ * debugging code to send out chars via prom 
+ */
+static void debug_console(const char *s, int count)
+{
+        unsigned i;
+
+        for (i = 0; i < count; i++) {
+                if (*s == 10)
+                        prom_printf("%c", 13);
+                prom_printf("%c", *s++);
+        }
+}
+#endif
+
+/*
+ * ------------------------------------------------------------
+ * dz_in () and dz_out ()
+ *
+ * These routines are used to access the registers of the DZ 
+ * chip, hiding relocation differences between implementation.
+ * ------------------------------------------------------------
+ */
+
+static inline unsigned short dz_in(struct dz_port *dport, unsigned offset)
+{
+        volatile unsigned short *addr =
+                (volatile unsigned short *) (dport->port.membase + offset);
+        return *addr;
+}
+
+static inline void dz_out(struct dz_port *dport, unsigned offset,
+                          unsigned short value)
+{
+        volatile unsigned short *addr =
+                (volatile unsigned short *) (dport->port.membase + offset);
+        *addr = value;
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_stop () and rs_start ()
+ *
+ * These routines are called before setting or resetting 
+ * tty->stopped. They enable or disable transmitter interrupts, 
+ * as necessary.
+ * ------------------------------------------------------------
+ */
+
+static void dz_stop_tx(struct uart_port *uport, unsigned int tty_stop)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned short tmp, mask = 1 << dport->port.line;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dport->port.lock, flags);
+        tmp = dz_in(dport, DZ_TCR);     /* read the TX flag */
+        tmp &= ~mask;                   /* clear the TX flag */
+        dz_out(dport, DZ_TCR, tmp);
+        spin_unlock_irqrestore(&dport->port.lock, flags);
+}
+
+static void dz_start_tx(struct uart_port *uport, unsigned int tty_start)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned short tmp, mask = 1 << dport->port.line;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dport->port.lock, flags);
+        tmp = dz_in(dport, DZ_TCR);     /* read the TX flag */
+        tmp |= mask;                    /* set the TX flag */
+        dz_out(dport, DZ_TCR, tmp);
+        spin_unlock_irqrestore(&dport->port.lock, flags);
+}
+
+static void dz_stop_rx(struct uart_port *uport)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dport->port.lock, flags);
+        dport->cflag &= ~DZ_CREAD;
+        dz_out(dport, DZ_LPR, dport->cflag);
+        spin_unlock_irqrestore(&dport->port.lock, flags);
+}
+
+static void dz_enable_ms(struct uart_port *port)
+{
+        /* nothing to do */
+}
+
+/*
+ * ------------------------------------------------------------
+ * Here starts the interrupt handling routines.  All of the 
+ * following subroutines are declared as inline and are folded 
+ * into dz_interrupt.  They were separated out for readability's 
+ * sake. 
+ *
+ * Note: rs_interrupt() is a "fast" interrupt, which means that it
+ * runs with interrupts turned off.  People who may want to modify
+ * rs_interrupt() should try to keep the interrupt handler as fast as
+ * possible.  After you are done making modifications, it is not a bad
+ * idea to do:
+ * 
+ *      make drivers/serial/dz.s
+ *
+ * and look at the resulting assemble code in dz.s.
+ *
+ * ------------------------------------------------------------
+ */
+
+/*
+ * ------------------------------------------------------------
+ * receive_char ()
+ *
+ * This routine deals with inputs from any lines.
+ * ------------------------------------------------------------
+ */
+static inline void dz_receive_chars(struct dz_port *dport)
+{
+        struct tty_struct *tty = NULL;
+        struct uart_icount *icount;
+        int ignore = 0;
+        unsigned short status, tmp;
+        unsigned char ch, flag;
+
+        /* this code is going to be a problem...
+           the call to tty_flip_buffer is going to need
+           to be rethought...
+         */
+        do {
+                status = dz_in(dport, DZ_RBUF);
+
+                /* punt so we don't get duplicate characters */
+                if (!(status & DZ_DVAL))
+                        goto ignore_char;
+
+
+                ch = UCHAR(status);     /* grab the char */
+                flag = TTY_NORMAL;
+
+#if 0
+                if (info->is_console) {
+                        if (ch == 0)
+                                return;         /* it's a break ... */
+                }
+#endif
+
+                tty = dport->port.info->tty;/* now tty points to the proper dev */
+                icount = &dport->port.icount;
+
+                if (!tty)
+                        break;
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        break;
+
+                icount->rx++;
+
+                /* keep track of the statistics */
+                if (status & (DZ_OERR | DZ_FERR | DZ_PERR)) {
+                        if (status & DZ_PERR)   /* parity error */
+                                icount->parity++;
+                        else if (status & DZ_FERR)      /* frame error */
+                                icount->frame++;
+                        if (status & DZ_OERR)   /* overrun error */
+                                icount->overrun++;
+
+                        /*  check to see if we should ignore the character
+                           and mask off conditions that should be ignored
+                         */
+
+                        if (status & dport->port.ignore_status_mask) {
+                                if (++ignore > 100)
+                                        break;
+                                goto ignore_char;
+                        }
+                        /* mask off the error conditions we want to ignore */
+                        tmp = status & dport->port.read_status_mask;
+
+                        if (tmp & DZ_PERR) {
+                                flag = TTY_PARITY;
+#ifdef DEBUG_DZ
+                                debug_console("PERR\n", 5);
+#endif
+                        } else if (tmp & DZ_FERR) {
+                                flag = TTY_FRAME;
+#ifdef DEBUG_DZ
+                                debug_console("FERR\n", 5);
+#endif
+                        }
+                        if (tmp & DZ_OERR) {
+#ifdef DEBUG_DZ
+                                debug_console("OERR\n", 5);
+#endif
+                                tty_insert_flip_char(tty, ch, flag);
+                                ch = 0;
+                                flag = TTY_OVERRUN;
+                        }
+                }
+                tty_insert_flip_char(tty, ch, flag);
+              ignore_char:
+        } while (status & DZ_DVAL);
+
+        if (tty)
+                tty_flip_buffer_push(tty);
+}
+
+/*
+ * ------------------------------------------------------------
+ * transmit_char ()
+ *
+ * This routine deals with outputs to any lines.
+ * ------------------------------------------------------------
+ */
+static inline void dz_transmit_chars(struct dz_port *dport)
+{
+        struct circ_buf *xmit = &dport->port.info->xmit;
+        unsigned char tmp;
+
+        if (dport->port.x_char) {       /* XON/XOFF chars */
+                dz_out(dport, DZ_TDR, dport->port.x_char);
+                dport->port.icount.tx++;
+                dport->port.x_char = 0;
+                return;
+        }
+        /* if nothing to do or stopped or hardware stopped */
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&dport->port)) {
+                dz_stop_tx(&dport->port, 0);
+                return;
+        }
+
+        /*
+         * if something to do ... (rember the dz has no output fifo so we go
+         * one char at a time :-<
+         */
+        tmp = xmit->buf[xmit->tail];
+        xmit->tail = (xmit->tail + 1) & (DZ_XMIT_SIZE - 1);
+        dz_out(dport, DZ_TDR, tmp);
+        dport->port.icount.tx++;
+
+        if (uart_circ_chars_pending(xmit) < DZ_WAKEUP_CHARS)
+                uart_write_wakeup(&dport->port);
+
+        /* Are we done */
+        if (uart_circ_empty(xmit))
+                dz_stop_tx(&dport->port, 0);
+}
+
+/*
+ * ------------------------------------------------------------
+ * check_modem_status ()
+ *
+ * Only valid for the MODEM line duh !
+ * ------------------------------------------------------------
+ */
+static inline void check_modem_status(struct dz_port *dport)
+{
+        unsigned short status;
+
+        /* if not ne modem line just return */
+        if (dport->port.line != DZ_MODEM)
+                return;
+
+        status = dz_in(dport, DZ_MSR);
+
+        /* it's easy, since DSR2 is the only bit in the register */
+        if (status)
+                dport->port.icount.dsr++;
+}
+
+/*
+ * ------------------------------------------------------------
+ * dz_interrupt ()
+ *
+ * this is the main interrupt routine for the DZ chip.
+ * It deals with the multiple ports.
+ * ------------------------------------------------------------
+ */
+static irqreturn_t dz_interrupt(int irq, void *dev, struct pt_regs *regs)
+{
+        struct dz_port *dport;
+        unsigned short status;
+
+        /* get the reason why we just got an irq */
+        status = dz_in((struct dz_port *)dev, DZ_CSR);
+        dport = &dz_ports[LINE(status)];
+
+        if (status & DZ_RDONE)
+                dz_receive_chars(dport);
+
+        if (status & DZ_TRDY)
+                dz_transmit_chars(dport);
+
+        /* FIXME: what about check modem status??? --rmk */
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * -------------------------------------------------------------------
+ * Here ends the DZ interrupt routines.
+ * -------------------------------------------------------------------
+ */
+
+static unsigned int dz_get_mctrl(struct uart_port *uport)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned int mctrl = TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+
+        if (dport->port.line == DZ_MODEM) {
+                /*
+                 * CHECKME: This is a guess from the other code... --rmk
+                 */
+                if (dz_in(dport, DZ_MSR) & DZ_MODEM_DSR)
+                        mctrl &= ~TIOCM_DSR;
+        }
+
+        return mctrl;
+}
+
+static void dz_set_mctrl(struct uart_port *uport, unsigned int mctrl)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned short tmp;
+
+        if (dport->port.line == DZ_MODEM) {
+                tmp = dz_in(dport, DZ_TCR);
+                if (mctrl & TIOCM_DTR)
+                        tmp &= ~DZ_MODEM_DTR;
+                else
+                        tmp |= DZ_MODEM_DTR;
+                dz_out(dport, DZ_TCR, tmp);
+        }
+}
+
+/*
+ * -------------------------------------------------------------------
+ * startup ()
+ *
+ * various initialization tasks
+ * ------------------------------------------------------------------- 
+ */
+static int dz_startup(struct uart_port *uport)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned long flags;
+        unsigned short tmp;
+
+        /* The dz lines for the mouse/keyboard must be
+         * opened using their respective drivers.
+         */
+        if ((dport->port.line == DZ_KEYBOARD) ||
+            (dport->port.line == DZ_MOUSE))
+                return -ENODEV;
+
+        spin_lock_irqsave(&dport->port.lock, flags);
+
+        /* enable the interrupt and the scanning */
+        tmp = dz_in(dport, DZ_CSR);
+        tmp |= DZ_RIE | DZ_TIE | DZ_MSE;
+        dz_out(dport, DZ_CSR, tmp);
+
+        spin_unlock_irqrestore(&dport->port.lock, flags);
+
+        return 0;
+}
+
+/* 
+ * -------------------------------------------------------------------
+ * shutdown ()
+ *
+ * This routine will shutdown a serial port; interrupts are disabled, and
+ * DTR is dropped if the hangup on close termio flag is on.
+ * ------------------------------------------------------------------- 
+ */
+static void dz_shutdown(struct uart_port *uport)
+{
+        dz_stop_tx(uport, 0);
+}
+
+/*
+ * get_lsr_info - get line status register info
+ *
+ * Purpose: Let user call ioctl() to get info when the UART physically
+ *          is emptied.  On bus types like RS485, the transmitter must
+ *          release the bus after transmitting. This must be done when
+ *          the transmit shift register is empty, not be done when the
+ *          transmit holding register is empty.  This functionality
+ *          allows an RS485 driver to be written in user space. 
+ */
+static unsigned int dz_tx_empty(struct uart_port *uport)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned short status = dz_in(dport, DZ_LPR);
+
+        /* FIXME: this appears to be obviously broken --rmk. */
+        return status ? TIOCSER_TEMT : 0;
+}
+
+static void dz_break_ctl(struct uart_port *uport, int break_state)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned long flags;
+        unsigned short tmp, mask = 1 << uport->line;
+
+        spin_lock_irqsave(&uport->lock, flags);
+        tmp = dz_in(dport, DZ_TCR);
+        if (break_state)
+                tmp |= mask;
+        else
+                tmp &= ~mask;
+        dz_out(dport, DZ_TCR, tmp);
+        spin_unlock_irqrestore(&uport->lock, flags);
+}
+
+static void dz_set_termios(struct uart_port *uport, struct termios *termios,
+                           struct termios *old_termios)
+{
+        struct dz_port *dport = (struct dz_port *)uport;
+        unsigned long flags;
+        unsigned int cflag, baud;
+
+        cflag = dport->port.line;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                cflag |= DZ_CS5;
+                break;
+        case CS6:
+                cflag |= DZ_CS6;
+                break;
+        case CS7:
+                cflag |= DZ_CS7;
+                break;
+        case CS8:
+        default:
+                cflag |= DZ_CS8;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                cflag |= DZ_CSTOPB;
+        if (termios->c_cflag & PARENB)
+                cflag |= DZ_PARENB;
+        if (termios->c_cflag & PARODD)
+                cflag |= DZ_PARODD;
+
+        baud = uart_get_baud_rate(uport, termios, old_termios, 50, 9600);
+        switch (baud) {
+        case 50:
+                cflag |= DZ_B50;
+                break;
+        case 75:
+                cflag |= DZ_B75;
+                break;
+        case 110:
+                cflag |= DZ_B110;
+                break;
+        case 134:
+                cflag |= DZ_B134;
+                break;
+        case 150:
+                cflag |= DZ_B150;
+                break;
+        case 300:
+                cflag |= DZ_B300;
+                break;
+        case 600:
+                cflag |= DZ_B600;
+                break;
+        case 1200:
+                cflag |= DZ_B1200;
+                break;
+        case 1800:
+                cflag |= DZ_B1800;
+                break;
+        case 2000:
+                cflag |= DZ_B2000;
+                break;
+        case 2400:
+                cflag |= DZ_B2400;
+                break;
+        case 3600:
+                cflag |= DZ_B3600;
+                break;
+        case 4800:
+                cflag |= DZ_B4800;
+                break;
+        case 7200:
+                cflag |= DZ_B7200;
+                break;
+        case 9600:
+        default:
+                cflag |= DZ_B9600;
+        }
+
+        if (termios->c_cflag & CREAD)
+                cflag |= DZ_RXENAB;
+
+        spin_lock_irqsave(&dport->port.lock, flags);
+
+        dz_out(dport, DZ_LPR, cflag);
+        dport->cflag = cflag;
+
+        /* setup accept flag */
+        dport->port.read_status_mask = DZ_OERR;
+        if (termios->c_iflag & INPCK)
+                dport->port.read_status_mask |= DZ_FERR | DZ_PERR;
+
+        /* characters to ignore */
+        uport->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                dport->port.ignore_status_mask |= DZ_FERR | DZ_PERR;
+
+        spin_unlock_irqrestore(&dport->port.lock, flags);
+}
+
+static const char *dz_type(struct uart_port *port)
+{
+        return "DZ";
+}
+
+static void dz_release_port(struct uart_port *port)
+{
+        /* nothing to do */
+}
+
+static int dz_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static void dz_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE)
+                port->type = PORT_DZ;
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int dz_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        int ret = 0;
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_DZ)
+                ret = -EINVAL;
+        if (ser->irq != port->irq)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops dz_ops = {
+        .tx_empty       = dz_tx_empty,
+        .get_mctrl      = dz_get_mctrl,
+        .set_mctrl      = dz_set_mctrl,
+        .stop_tx        = dz_stop_tx,
+        .start_tx       = dz_start_tx,
+        .stop_rx        = dz_stop_rx,
+        .enable_ms      = dz_enable_ms,
+        .break_ctl      = dz_break_ctl,
+        .startup        = dz_startup,
+        .shutdown       = dz_shutdown,
+        .set_termios    = dz_set_termios,
+        .type           = dz_type,
+        .release_port   = dz_release_port,
+        .request_port   = dz_request_port,
+        .config_port    = dz_config_port,
+        .verify_port    = dz_verify_port,
+};
+
+static void __init dz_init_ports(void)
+{
+        static int first = 1;
+        struct dz_port *dport;
+        unsigned long base;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        if (mips_machtype == MACH_DS23100 ||
+            mips_machtype == MACH_DS5100)
+                base = (unsigned long) KN01_DZ11_BASE;
+        else
+                base = (unsigned long) KN02_DZ11_BASE;
+
+        for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) {
+                spin_lock_init(&dport->port.lock);
+                dport->port.membase     = (char *) base;
+                dport->port.iotype      = SERIAL_IO_PORT;
+                dport->port.irq         = dec_interrupt[DEC_IRQ_DZ11];
+                dport->port.line        = i;
+                dport->port.fifosize    = 1;
+                dport->port.ops         = &dz_ops;
+                dport->port.flags       = UPF_BOOT_AUTOCONF;
+        }
+}
+
+static void dz_reset(struct dz_port *dport)
+{
+        dz_out(dport, DZ_CSR, DZ_CLR);
+
+        while (dz_in(dport, DZ_CSR) & DZ_CLR);
+                /* FIXME: cpu_relax? */
+
+        iob();
+
+        /* enable scanning */
+        dz_out(dport, DZ_CSR, DZ_MSE);
+}
+
+#ifdef CONFIG_SERIAL_DZ_CONSOLE
+static void dz_console_put_char(struct dz_port *dport, unsigned char ch)
+{
+        unsigned long flags;
+        int loops = 2500;
+        unsigned short tmp = ch;
+        /* this code sends stuff out to serial device - spinning its
+           wheels and waiting. */
+
+        spin_lock_irqsave(&dport->port.lock, flags);
+
+        /* spin our wheels */
+        while (((dz_in(dport, DZ_CSR) & DZ_TRDY) != DZ_TRDY) && loops--)
+                /* FIXME: cpu_relax, udelay? --rmk */
+                ;
+
+        /* Actually transmit the character. */
+        dz_out(dport, DZ_TDR, tmp);
+
+        spin_unlock_irqrestore(&dport->port.lock, flags);
+}
+/* 
+ * -------------------------------------------------------------------
+ * dz_console_print ()
+ *
+ * dz_console_print is registered for printk.
+ * The console must be locked when we get here.
+ * ------------------------------------------------------------------- 
+ */
+static void dz_console_print(struct console *cons,
+                             const char *str,
+                             unsigned int count)
+{
+        struct dz_port *dport = &dz_ports[CONSOLE_LINE];
+#ifdef DEBUG_DZ
+        prom_printf((char *) str);
+#endif
+        while (count--) {
+                if (*str == '\n')
+                        dz_console_put_char(dport, '\r');
+                dz_console_put_char(dport, *str++);
+        }
+}
+
+static int __init dz_console_setup(struct console *co, char *options)
+{
+        struct dz_port *dport = &dz_ports[CONSOLE_LINE];
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+        int ret;
+        unsigned short mask, tmp;
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        dz_reset(dport);
+
+        ret = uart_set_options(&dport->port, co, baud, parity, bits, flow);
+        if (ret == 0) {
+                mask = 1 << dport->port.line;
+                tmp = dz_in(dport, DZ_TCR);     /* read the TX flag */
+                if (!(tmp & mask)) {
+                        tmp |= mask;            /* set the TX flag */
+                        dz_out(dport, DZ_TCR, tmp);
+                }
+        }
+
+        return ret;
+}
+
+static struct console dz_sercons =
+{
+        .name   = "ttyS",
+        .write  = dz_console_print,
+        .device = uart_console_device,
+        .setup  = dz_console_setup,
+        .flags  = CON_CONSDEV | CON_PRINTBUFFER,
+        .index  = CONSOLE_LINE,
+};
+
+void __init dz_serial_console_init(void)
+{
+        dz_init_ports();
+
+        register_console(&dz_sercons);
+}
+
+#define SERIAL_DZ_CONSOLE       &dz_sercons
+#else
+#define SERIAL_DZ_CONSOLE       NULL
+#endif /* CONFIG_SERIAL_DZ_CONSOLE */
+
+static struct uart_driver dz_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial",
+#ifdef CONFIG_DEVFS
+        .dev_name               = "tts/%d",
+#else
+        .dev_name               = "ttyS%d",
+#endif
+        .major                  = TTY_MAJOR,
+        .minor                  = 64,
+        .nr                     = DZ_NB_PORT,
+        .cons                   = SERIAL_DZ_CONSOLE,
+};
+
+int __init dz_init(void)
+{
+        unsigned long flags;
+        int ret, i;
+
+        printk("%s%s\n", dz_name, dz_version);
+
+        dz_init_ports();
+
+        save_flags(flags);
+        cli();
+
+#ifndef CONFIG_SERIAL_DZ_CONSOLE
+        /* reset the chip */
+        dz_reset(&dz_ports[0]);
+#endif
+
+        /* order matters here... the trick is that flags
+           is updated... in request_irq - to immediatedly obliterate
+           it is unwise. */
+        restore_flags(flags);
+
+        if (request_irq(dz_ports[0].port.irq, dz_interrupt,
+                        SA_INTERRUPT, "DZ", &dz_ports[0]))
+                panic("Unable to register DZ interrupt");
+
+        ret = uart_register_driver(&dz_reg);
+        if (ret != 0)
+                return ret;
+
+        for (i = 0; i < DZ_NB_PORT; i++)
+                uart_add_one_port(&dz_reg, &dz_ports[i].port);
+
+        return ret;
+}
+
+MODULE_DESCRIPTION("DECstation DZ serial driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/dz.h b/drivers/serial/dz.h
new file mode 100644
index 000000000000..86ef417382bb
--- /dev/null
+++ b/drivers/serial/dz.h
@@ -0,0 +1,118 @@
+/*
+ * dz.h: Serial port driver for DECStations equiped 
+ *       with the DZ chipset.
+ *
+ * Copyright (C) 1998 Olivier A. D. Lebaillif 
+ *             
+ * Email: olivier.lebaillif@ifrsys.com
+ *
+ */
+#ifndef DZ_SERIAL_H
+#define DZ_SERIAL_H
+
+/*
+ * Definitions for the Control and Status Received.
+ */
+#define DZ_TRDY        0x8000                 /* Transmitter empty */
+#define DZ_TIE         0x4000                 /* Transmitter Interrupt Enable */
+#define DZ_RDONE       0x0080                 /* Receiver data ready */
+#define DZ_RIE         0x0040                 /* Receive Interrupt Enable */
+#define DZ_MSE         0x0020                 /* Master Scan Enable */
+#define DZ_CLR         0x0010                 /* Master reset */
+#define DZ_MAINT       0x0008                 /* Loop Back Mode */
+
+/*
+ * Definitions for the Received buffer. 
+ */
+#define DZ_RBUF_MASK   0x00FF                 /* Data Mask in the Receive Buffer */
+#define DZ_LINE_MASK   0x0300                 /* Line Mask in the Receive Buffer */
+#define DZ_DVAL        0x8000                 /* Valid Data indicator */
+#define DZ_OERR        0x4000                 /* Overrun error indicator */
+#define DZ_FERR        0x2000                 /* Frame error indicator */
+#define DZ_PERR        0x1000                 /* Parity error indicator */
+
+#define LINE(x) (x & DZ_LINE_MASK) >> 8       /* Get the line number from the input buffer */
+#define UCHAR(x) (unsigned char)(x & DZ_RBUF_MASK)
+
+/*
+ * Definitions for the Transmit Register.
+ */
+#define DZ_LINE_KEYBOARD 0x0001
+#define DZ_LINE_MOUSE    0x0002
+#define DZ_LINE_MODEM    0x0004
+#define DZ_LINE_PRINTER  0x0008
+
+#define DZ_MODEM_DTR     0x0400               /* DTR for the modem line (2) */
+
+/*
+ * Definitions for the Modem Status Register.
+ */
+#define DZ_MODEM_DSR     0x0200               /* DSR for the modem line (2) */
+
+/*
+ * Definitions for the Transmit Data Register.
+ */
+#define DZ_BRK0          0x0100               /* Break assertion for line 0 */
+#define DZ_BRK1          0x0200               /* Break assertion for line 1 */
+#define DZ_BRK2          0x0400               /* Break assertion for line 2 */
+#define DZ_BRK3          0x0800               /* Break assertion for line 3 */
+
+/*
+ * Definitions for the Line Parameter Register.
+ */
+#define DZ_KEYBOARD      0x0000               /* line 0 = keyboard */
+#define DZ_MOUSE         0x0001               /* line 1 = mouse */
+#define DZ_MODEM         0x0002               /* line 2 = modem */
+#define DZ_PRINTER       0x0003               /* line 3 = printer */
+
+#define DZ_CSIZE         0x0018               /* Number of bits per byte (mask) */
+#define DZ_CS5           0x0000               /* 5 bits per byte */
+#define DZ_CS6           0x0008               /* 6 bits per byte */
+#define DZ_CS7           0x0010               /* 7 bits per byte */
+#define DZ_CS8           0x0018               /* 8 bits per byte */
+
+#define DZ_CSTOPB        0x0020               /* 2 stop bits instead of one */ 
+
+#define DZ_PARENB        0x0040               /* Parity enable */
+#define DZ_PARODD        0x0080               /* Odd parity instead of even */
+
+#define DZ_CBAUD         0x0E00               /* Baud Rate (mask) */
+#define DZ_B50           0x0000
+#define DZ_B75           0x0100
+#define DZ_B110          0x0200
+#define DZ_B134          0x0300
+#define DZ_B150          0x0400
+#define DZ_B300          0x0500
+#define DZ_B600          0x0600
+#define DZ_B1200         0x0700 
+#define DZ_B1800         0x0800
+#define DZ_B2000         0x0900
+#define DZ_B2400         0x0A00
+#define DZ_B3600         0x0B00
+#define DZ_B4800         0x0C00
+#define DZ_B7200         0x0D00
+#define DZ_B9600         0x0E00
+
+#define DZ_CREAD         0x1000               /* Enable receiver */
+#define DZ_RXENAB        0x1000               /* enable receive char */
+/*
+ * Addresses for the DZ registers
+ */
+#define DZ_CSR       0x00            /* Control and Status Register */
+#define DZ_RBUF      0x08            /* Receive Buffer */
+#define DZ_LPR       0x08            /* Line Parameters Register */
+#define DZ_TCR       0x10            /* Transmitter Control Register */
+#define DZ_MSR       0x18            /* Modem Status Register */
+#define DZ_TDR       0x18            /* Transmit Data Register */
+
+#define DZ_NB_PORT 4
+
+#define DZ_XMIT_SIZE   4096                 /* buffer size */
+#define DZ_WAKEUP_CHARS   DZ_XMIT_SIZE/4
+
+#ifdef MODULE
+int init_module (void)
+void cleanup_module (void)
+#endif
+
+#endif /* DZ_SERIAL_H */
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
new file mode 100644
index 000000000000..546a0bc77e1e
--- /dev/null
+++ b/drivers/serial/icom.c
@@ -0,0 +1,1691 @@
+/*
+  * icom.c
+  *
+  * Copyright (C) 2001 IBM Corporation. All rights reserved.
+  *
+  * Serial device driver.
+  *
+  * Based on code from serial.c
+  *
+  * 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.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  */
+#define SERIAL_DO_RESTART
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/termios.h>
+#include <linux/fs.h>
+#include <linux/tty_flip.h>
+#include <linux/serial.h>
+#include <linux/serial_reg.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/fcntl.h>
+#include <linux/ptrace.h>
+#include <linux/ioport.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+#include <linux/smp.h>
+#include <linux/smp_lock.h>
+#include <linux/spinlock.h>
+#include <linux/kobject.h>
+#include <linux/firmware.h>
+#include <linux/bitops.h>
+
+#include <asm/system.h>
+#include <asm/segment.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+
+#include "icom.h"
+
+/*#define ICOM_TRACE             enable port trace capabilities */
+
+#define ICOM_DRIVER_NAME "icom"
+#define ICOM_VERSION_STR "1.3.1"
+#define NR_PORTS               128
+#define ICOM_PORT ((struct icom_port *)port)
+#define to_icom_adapter(d) container_of(d, struct icom_adapter, kobj)
+
+static const struct pci_device_id icom_pci_table[] = {
+        {
+              .vendor = PCI_VENDOR_ID_IBM,
+              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
+              .subvendor = PCI_ANY_ID,
+              .subdevice = PCI_ANY_ID,
+              .driver_data = ADAPTER_V1,
+         },
+        {
+              .vendor = PCI_VENDOR_ID_IBM,
+              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+              .subvendor = PCI_VENDOR_ID_IBM,
+              .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX,
+              .driver_data = ADAPTER_V2,
+         },
+        {
+              .vendor = PCI_VENDOR_ID_IBM,
+              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+              .subvendor = PCI_VENDOR_ID_IBM,
+              .subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM,
+              .driver_data = ADAPTER_V2,
+         },
+        {
+              .vendor = PCI_VENDOR_ID_IBM,
+              .device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
+              .subvendor = PCI_VENDOR_ID_IBM,
+              .subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,
+              .driver_data = ADAPTER_V2,
+         },
+        {}
+};
+
+struct lookup_proc_table start_proc[4] = {
+        {NULL, ICOM_CONTROL_START_A},
+        {NULL, ICOM_CONTROL_START_B},
+        {NULL, ICOM_CONTROL_START_C},
+        {NULL, ICOM_CONTROL_START_D}
+};
+
+
+struct lookup_proc_table stop_proc[4] = {
+        {NULL, ICOM_CONTROL_STOP_A},
+        {NULL, ICOM_CONTROL_STOP_B},
+        {NULL, ICOM_CONTROL_STOP_C},
+        {NULL, ICOM_CONTROL_STOP_D}
+};
+
+struct lookup_int_table int_mask_tbl[4] = {
+        {NULL, ICOM_INT_MASK_PRC_A},
+        {NULL, ICOM_INT_MASK_PRC_B},
+        {NULL, ICOM_INT_MASK_PRC_C},
+        {NULL, ICOM_INT_MASK_PRC_D},
+};
+
+
+MODULE_DEVICE_TABLE(pci, icom_pci_table);
+
+static LIST_HEAD(icom_adapter_head);
+
+/* spinlock for adapter initialization and changing adapter operations */
+static spinlock_t icom_lock;
+
+#ifdef ICOM_TRACE
+static inline void trace(struct icom_port *, char *, unsigned long) {};
+#else
+static inline void trace(struct icom_port *icom_port, char *trace_pt, unsigned long trace_data) {};
+#endif
+
+static void free_port_memory(struct icom_port *icom_port)
+{
+        struct pci_dev *dev = icom_port->adapter->pci_dev;
+
+        trace(icom_port, "RET_PORT_MEM", 0);
+        if (icom_port->recv_buf) {
+                pci_free_consistent(dev, 4096, icom_port->recv_buf,
+                                    icom_port->recv_buf_pci);
+                icom_port->recv_buf = NULL;
+        }
+        if (icom_port->xmit_buf) {
+                pci_free_consistent(dev, 4096, icom_port->xmit_buf,
+                                    icom_port->xmit_buf_pci);
+                icom_port->xmit_buf = NULL;
+        }
+        if (icom_port->statStg) {
+                pci_free_consistent(dev, 4096, icom_port->statStg,
+                                    icom_port->statStg_pci);
+                icom_port->statStg = NULL;
+        }
+
+        if (icom_port->xmitRestart) {
+                pci_free_consistent(dev, 4096, icom_port->xmitRestart,
+                                    icom_port->xmitRestart_pci);
+                icom_port->xmitRestart = NULL;
+        }
+}
+
+static int __init get_port_memory(struct icom_port *icom_port)
+{
+        int index;
+        unsigned long stgAddr;
+        unsigned long startStgAddr;
+        unsigned long offset;
+        struct pci_dev *dev = icom_port->adapter->pci_dev;
+
+        icom_port->xmit_buf =
+            pci_alloc_consistent(dev, 4096, &icom_port->xmit_buf_pci);
+        if (!icom_port->xmit_buf) {
+                dev_err(&dev->dev, "Can not allocate Transmit buffer\n");
+                return -ENOMEM;
+        }
+
+        trace(icom_port, "GET_PORT_MEM",
+              (unsigned long) icom_port->xmit_buf);
+
+        icom_port->recv_buf =
+            pci_alloc_consistent(dev, 4096, &icom_port->recv_buf_pci);
+        if (!icom_port->recv_buf) {
+                dev_err(&dev->dev, "Can not allocate Receive buffer\n");
+                free_port_memory(icom_port);
+                return -ENOMEM;
+        }
+        trace(icom_port, "GET_PORT_MEM",
+              (unsigned long) icom_port->recv_buf);
+
+        icom_port->statStg =
+            pci_alloc_consistent(dev, 4096, &icom_port->statStg_pci);
+        if (!icom_port->statStg) {
+                dev_err(&dev->dev, "Can not allocate Status buffer\n");
+                free_port_memory(icom_port);
+                return -ENOMEM;
+        }
+        trace(icom_port, "GET_PORT_MEM",
+              (unsigned long) icom_port->statStg);
+
+        icom_port->xmitRestart =
+            pci_alloc_consistent(dev, 4096, &icom_port->xmitRestart_pci);
+        if (!icom_port->xmitRestart) {
+                dev_err(&dev->dev,
+                        "Can not allocate xmit Restart buffer\n");
+                free_port_memory(icom_port);
+                return -ENOMEM;
+        }
+
+        memset(icom_port->statStg, 0, 4096);
+
+        /* FODs: Frame Out Descriptor Queue, this is a FIFO queue that
+           indicates that frames are to be transmitted
+        */
+
+        stgAddr = (unsigned long) icom_port->statStg;
+        for (index = 0; index < NUM_XBUFFS; index++) {
+                trace(icom_port, "FOD_ADDR", stgAddr);
+                stgAddr = stgAddr + sizeof(icom_port->statStg->xmit[0]);
+                if (index < (NUM_XBUFFS - 1)) {
+                        memset(&icom_port->statStg->xmit[index], 0, sizeof(struct xmit_status_area));
+                        icom_port->statStg->xmit[index].leLengthASD =
+                            (unsigned short int) cpu_to_le16(XMIT_BUFF_SZ);
+                        trace(icom_port, "FOD_ADDR", stgAddr);
+                        trace(icom_port, "FOD_XBUFF",
+                              (unsigned long) icom_port->xmit_buf);
+                        icom_port->statStg->xmit[index].leBuffer =
+                            cpu_to_le32(icom_port->xmit_buf_pci);
+                } else if (index == (NUM_XBUFFS - 1)) {
+                        memset(&icom_port->statStg->xmit[index], 0, sizeof(struct xmit_status_area));
+                        icom_port->statStg->xmit[index].leLengthASD =
+                            (unsigned short int) cpu_to_le16(XMIT_BUFF_SZ);
+                        trace(icom_port, "FOD_XBUFF",
+                              (unsigned long) icom_port->xmit_buf);
+                        icom_port->statStg->xmit[index].leBuffer =
+                            cpu_to_le32(icom_port->xmit_buf_pci);
+                } else {
+                        memset(&icom_port->statStg->xmit[index], 0, sizeof(struct xmit_status_area));
+                }
+        }
+        /* FIDs */
+        startStgAddr = stgAddr;
+
+        /* fill in every entry, even if no buffer */
+        for (index = 0; index <  NUM_RBUFFS; index++) {
+                trace(icom_port, "FID_ADDR", stgAddr);
+                stgAddr = stgAddr + sizeof(icom_port->statStg->rcv[0]);
+                icom_port->statStg->rcv[index].leLength = 0;
+                icom_port->statStg->rcv[index].WorkingLength =
+                    (unsigned short int) cpu_to_le16(RCV_BUFF_SZ);
+                if (index < (NUM_RBUFFS - 1) ) {
+                        offset = stgAddr - (unsigned long) icom_port->statStg;
+                        icom_port->statStg->rcv[index].leNext =
+                              cpu_to_le32(icom_port-> statStg_pci + offset);
+                        trace(icom_port, "FID_RBUFF",
+                              (unsigned long) icom_port->recv_buf);
+                        icom_port->statStg->rcv[index].leBuffer =
+                            cpu_to_le32(icom_port->recv_buf_pci);
+                } else if (index == (NUM_RBUFFS -1) ) {
+                        offset = startStgAddr - (unsigned long) icom_port->statStg;
+                        icom_port->statStg->rcv[index].leNext =
+                            cpu_to_le32(icom_port-> statStg_pci + offset);
+                        trace(icom_port, "FID_RBUFF",
+                              (unsigned long) icom_port->recv_buf + 2048);
+                        icom_port->statStg->rcv[index].leBuffer =
+                            cpu_to_le32(icom_port->recv_buf_pci + 2048);
+                } else {
+                        icom_port->statStg->rcv[index].leNext = 0;
+                        icom_port->statStg->rcv[index].leBuffer = 0;
+                }
+        }
+
+        return 0;
+}
+
+static void stop_processor(struct icom_port *icom_port)
+{
+        unsigned long temp;
+        unsigned long flags;
+        int port;
+
+        spin_lock_irqsave(&icom_lock, flags);
+
+        port = icom_port->port;
+        if (port == 0 || port == 1)
+                stop_proc[port].global_control_reg = &icom_port->global_reg->control;
+        else
+                stop_proc[port].global_control_reg = &icom_port->global_reg->control_2;
+
+
+        if (port < 4) {
+                temp = readl(stop_proc[port].global_control_reg);
+                temp =
+                        (temp & ~start_proc[port].processor_id) | stop_proc[port].processor_id;
+                writel(temp, stop_proc[port].global_control_reg);
+
+                /* write flush */
+                readl(stop_proc[port].global_control_reg);
+        } else {
+                dev_err(&icom_port->adapter->pci_dev->dev,
+                        "Invalid port assignment\n");
+        }
+
+        spin_unlock_irqrestore(&icom_lock, flags);
+}
+
+static void start_processor(struct icom_port *icom_port)
+{
+        unsigned long temp;
+        unsigned long flags;
+        int port;
+
+        spin_lock_irqsave(&icom_lock, flags);
+
+        port = icom_port->port;
+        if (port == 0 || port == 1)
+                start_proc[port].global_control_reg = &icom_port->global_reg->control;
+        else
+                start_proc[port].global_control_reg = &icom_port->global_reg->control_2;
+        if (port < 4) {
+                temp = readl(start_proc[port].global_control_reg);
+                temp =
+                        (temp & ~stop_proc[port].processor_id) | start_proc[port].processor_id;
+                writel(temp, start_proc[port].global_control_reg);
+
+                /* write flush */
+                readl(start_proc[port].global_control_reg);
+        } else {
+                dev_err(&icom_port->adapter->pci_dev->dev,
+                        "Invalid port assignment\n");
+        }
+
+        spin_unlock_irqrestore(&icom_lock, flags);
+}
+
+static void load_code(struct icom_port *icom_port)
+{
+        const struct firmware *fw;
+        char __iomem *iram_ptr;
+        int index;
+        int status = 0;
+        void __iomem *dram_ptr = icom_port->dram;
+        dma_addr_t temp_pci;
+        unsigned char *new_page = NULL;
+        unsigned char cable_id = NO_CABLE;
+        struct pci_dev *dev = icom_port->adapter->pci_dev;
+
+        /* Clear out any pending interrupts */
+        writew(0x3FFF, icom_port->int_reg);
+
+        trace(icom_port, "CLEAR_INTERRUPTS", 0);
+
+        /* Stop processor */
+        stop_processor(icom_port);
+
+        /* Zero out DRAM */
+        memset_io(dram_ptr, 0, 512);
+
+        /* Load Call Setup into Adapter */
+        if (request_firmware(&fw, "icom_call_setup.bin", &dev->dev) < 0) {
+                dev_err(&dev->dev,"Unable to load icom_call_setup.bin firmware image\n");
+                status = -1;
+                goto load_code_exit;
+        }
+
+        if (fw->size > ICOM_DCE_IRAM_OFFSET) {
+                dev_err(&dev->dev, "Invalid firmware image for icom_call_setup.bin found.\n");
+                release_firmware(fw);
+                status = -1;
+                goto load_code_exit;
+        }
+
+        iram_ptr = (char __iomem *)icom_port->dram + ICOM_IRAM_OFFSET;
+        for (index = 0; index < fw->size; index++)
+                writeb(fw->data[index], &iram_ptr[index]);
+
+        release_firmware(fw);
+
+        /* Load Resident DCE portion of Adapter */
+        if (request_firmware(&fw, "icom_res_dce.bin", &dev->dev) < 0) {
+                dev_err(&dev->dev,"Unable to load icom_res_dce.bin firmware image\n");
+                status = -1;
+                goto load_code_exit;
+        }
+
+        if (fw->size > ICOM_IRAM_SIZE) {
+                dev_err(&dev->dev, "Invalid firmware image for icom_res_dce.bin found.\n");
+                release_firmware(fw);
+                status = -1;
+                goto load_code_exit;
+        }
+
+        iram_ptr = (char __iomem *) icom_port->dram + ICOM_IRAM_OFFSET;
+        for (index = ICOM_DCE_IRAM_OFFSET; index < fw->size; index++)
+                writeb(fw->data[index], &iram_ptr[index]);
+
+        release_firmware(fw);
+
+        /* Set Hardware level */
+        if ((icom_port->adapter->version | ADAPTER_V2) == ADAPTER_V2)
+                writeb(V2_HARDWARE, &(icom_port->dram->misc_flags));
+
+        /* Start the processor in Adapter */
+        start_processor(icom_port);
+
+        writeb((HDLC_PPP_PURE_ASYNC | HDLC_FF_FILL),
+               &(icom_port->dram->HDLCConfigReg));
+        writeb(0x04, &(icom_port->dram->FlagFillIdleTimer));    /* 0.5 seconds */
+        writeb(0x00, &(icom_port->dram->CmdReg));
+        writeb(0x10, &(icom_port->dram->async_config3));
+        writeb((ICOM_ACFG_DRIVE1 | ICOM_ACFG_NO_PARITY | ICOM_ACFG_8BPC |
+                ICOM_ACFG_1STOP_BIT), &(icom_port->dram->async_config2));
+
+        /*Set up data in icom DRAM to indicate where personality
+         *code is located and its length.
+         */
+        new_page = pci_alloc_consistent(dev, 4096, &temp_pci);
+
+        if (!new_page) {
+                dev_err(&dev->dev, "Can not allocate DMA buffer\n");
+                status = -1;
+                goto load_code_exit;
+        }
+
+        if (request_firmware(&fw, "icom_asc.bin", &dev->dev) < 0) {
+                dev_err(&dev->dev,"Unable to load icom_asc.bin firmware image\n");
+                status = -1;
+                goto load_code_exit;
+        }
+
+        if (fw->size > ICOM_DCE_IRAM_OFFSET) {
+                dev_err(&dev->dev, "Invalid firmware image for icom_asc.bin found.\n");
+                release_firmware(fw);
+                status = -1;
+                goto load_code_exit;
+        }
+
+        for (index = 0; index < fw->size; index++)
+                new_page[index] = fw->data[index];
+
+        release_firmware(fw);
+
+        writeb((char) ((fw->size + 16)/16), &icom_port->dram->mac_length);
+        writel(temp_pci, &icom_port->dram->mac_load_addr);
+
+        /*Setting the syncReg to 0x80 causes adapter to start downloading
+           the personality code into adapter instruction RAM.
+           Once code is loaded, it will begin executing and, based on
+           information provided above, will start DMAing data from
+           shared memory to adapter DRAM.
+         */
+        /* the wait loop below verifies this write operation has been done
+           and processed
+        */
+        writeb(START_DOWNLOAD, &icom_port->dram->sync);
+
+        /* Wait max 1 Sec for data download and processor to start */
+        for (index = 0; index < 10; index++) {
+                msleep(100);
+                if (readb(&icom_port->dram->misc_flags) & ICOM_HDW_ACTIVE)
+                        break;
+        }
+
+        if (index == 10)
+                status = -1;
+
+        /*
+         * check Cable ID
+         */
+        cable_id = readb(&icom_port->dram->cable_id);
+
+        if (cable_id & ICOM_CABLE_ID_VALID) {
+                /* Get cable ID into the lower 4 bits (standard form) */
+                cable_id = (cable_id & ICOM_CABLE_ID_MASK) >> 4;
+                icom_port->cable_id = cable_id;
+        } else {
+                dev_err(&dev->dev,"Invalid or no cable attached\n");
+                icom_port->cable_id = NO_CABLE;
+        }
+
+      load_code_exit:
+
+        if (status != 0) {
+                /* Clear out any pending interrupts */
+                writew(0x3FFF, icom_port->int_reg);
+
+                /* Turn off port */
+                writeb(ICOM_DISABLE, &(icom_port->dram->disable));
+
+                /* Stop processor */
+                stop_processor(icom_port);
+
+                dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n");
+        }
+
+      if (new_page != NULL)
+              pci_free_consistent(dev, 4096, new_page, temp_pci);
+}
+
+static int startup(struct icom_port *icom_port)
+{
+        unsigned long temp;
+        unsigned char cable_id, raw_cable_id;
+        unsigned long flags;
+        int port;
+
+        trace(icom_port, "STARTUP", 0);
+
+        if (!icom_port->dram) {
+                /* should NEVER be NULL */
+                dev_err(&icom_port->adapter->pci_dev->dev,
+                        "Unusable Port, port configuration missing\n");
+                return -ENODEV;
+        }
+
+        /*
+         * check Cable ID
+         */
+        raw_cable_id = readb(&icom_port->dram->cable_id);
+        trace(icom_port, "CABLE_ID", raw_cable_id);
+
+        /* Get cable ID into the lower 4 bits (standard form) */
+        cable_id = (raw_cable_id & ICOM_CABLE_ID_MASK) >> 4;
+
+        /* Check for valid Cable ID */
+        if (!(raw_cable_id & ICOM_CABLE_ID_VALID) ||
+            (cable_id != icom_port->cable_id)) {
+
+                /* reload adapter code, pick up any potential changes in cable id */
+                load_code(icom_port);
+
+                /* still no sign of cable, error out */
+                raw_cable_id = readb(&icom_port->dram->cable_id);
+                cable_id = (raw_cable_id & ICOM_CABLE_ID_MASK) >> 4;
+                if (!(raw_cable_id & ICOM_CABLE_ID_VALID) ||
+                    (icom_port->cable_id == NO_CABLE))
+                        return -EIO;
+        }
+
+        /*
+         * Finally, clear and  enable interrupts
+         */
+        spin_lock_irqsave(&icom_lock, flags);
+        port = icom_port->port;
+        if (port == 0 || port == 1)
+                int_mask_tbl[port].global_int_mask = &icom_port->global_reg->int_mask;
+        else
+                int_mask_tbl[port].global_int_mask = &icom_port->global_reg->int_mask_2;
+
+        if (port == 0 || port == 2)
+                writew(0x00FF, icom_port->int_reg);
+        else
+                writew(0x3F00, icom_port->int_reg);
+        if (port < 4) {
+                temp = readl(int_mask_tbl[port].global_int_mask);
+                writel(temp & ~int_mask_tbl[port].processor_id, int_mask_tbl[port].global_int_mask);
+
+                /* write flush */
+                readl(int_mask_tbl[port].global_int_mask);
+        } else {
+                dev_err(&icom_port->adapter->pci_dev->dev,
+                        "Invalid port assignment\n");
+        }
+
+        spin_unlock_irqrestore(&icom_lock, flags);
+        return 0;
+}
+
+static void shutdown(struct icom_port *icom_port)
+{
+        unsigned long temp;
+        unsigned char cmdReg;
+        unsigned long flags;
+        int port;
+
+        spin_lock_irqsave(&icom_lock, flags);
+        trace(icom_port, "SHUTDOWN", 0);
+
+        /*
+         * disable all interrupts
+         */
+        port = icom_port->port;
+        if (port == 0 || port == 1)
+                int_mask_tbl[port].global_int_mask = &icom_port->global_reg->int_mask;
+        else
+                int_mask_tbl[port].global_int_mask = &icom_port->global_reg->int_mask_2;
+
+        if (port < 4) {
+                temp = readl(int_mask_tbl[port].global_int_mask);
+                writel(temp | int_mask_tbl[port].processor_id, int_mask_tbl[port].global_int_mask);
+
+                /* write flush */
+                readl(int_mask_tbl[port].global_int_mask);
+        } else {
+                dev_err(&icom_port->adapter->pci_dev->dev,
+                        "Invalid port assignment\n");
+        }
+        spin_unlock_irqrestore(&icom_lock, flags);
+
+        /*
+         * disable break condition
+         */
+        cmdReg = readb(&icom_port->dram->CmdReg);
+        if ((cmdReg | CMD_SND_BREAK) == CMD_SND_BREAK) {
+                writeb(cmdReg & ~CMD_SND_BREAK, &icom_port->dram->CmdReg);
+        }
+}
+
+static int icom_write(struct uart_port *port)
+{
+        unsigned long data_count;
+        unsigned char cmdReg;
+        unsigned long offset;
+        int temp_tail = port->info->xmit.tail;
+
+        trace(ICOM_PORT, "WRITE", 0);
+
+        if (cpu_to_le16(ICOM_PORT->statStg->xmit[0].flags) &
+            SA_FLAGS_READY_TO_XMIT) {
+                trace(ICOM_PORT, "WRITE_FULL", 0);
+                return 0;
+        }
+
+        data_count = 0;
+        while ((port->info->xmit.head != temp_tail) &&
+               (data_count <= XMIT_BUFF_SZ)) {
+
+                ICOM_PORT->xmit_buf[data_count++] =
+                    port->info->xmit.buf[temp_tail];
+
+                temp_tail++;
+                temp_tail &= (UART_XMIT_SIZE - 1);
+        }
+
+        if (data_count) {
+                ICOM_PORT->statStg->xmit[0].flags =
+                    cpu_to_le16(SA_FLAGS_READY_TO_XMIT);
+                ICOM_PORT->statStg->xmit[0].leLength =
+                    cpu_to_le16(data_count);
+                offset =
+                    (unsigned long) &ICOM_PORT->statStg->xmit[0] -
+                    (unsigned long) ICOM_PORT->statStg;
+                *ICOM_PORT->xmitRestart =
+                    cpu_to_le32(ICOM_PORT->statStg_pci + offset);
+                cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+                writeb(cmdReg | CMD_XMIT_RCV_ENABLE,
+                       &ICOM_PORT->dram->CmdReg);
+                writeb(START_XMIT, &ICOM_PORT->dram->StartXmitCmd);
+                trace(ICOM_PORT, "WRITE_START", data_count);
+                /* write flush */
+                readb(&ICOM_PORT->dram->StartXmitCmd);
+        }
+
+        return data_count;
+}
+
+static inline void check_modem_status(struct icom_port *icom_port)
+{
+        static char old_status = 0;
+        char delta_status;
+        unsigned char status;
+
+        spin_lock(&icom_port->uart_port.lock);
+
+        /*modem input register */
+        status = readb(&icom_port->dram->isr);
+        trace(icom_port, "CHECK_MODEM", status);
+        delta_status = status ^ old_status;
+        if (delta_status) {
+                if (delta_status & ICOM_RI)
+                        icom_port->uart_port.icount.rng++;
+                if (delta_status & ICOM_DSR)
+                        icom_port->uart_port.icount.dsr++;
+                if (delta_status & ICOM_DCD)
+                        uart_handle_dcd_change(&icom_port->uart_port,
+                                               delta_status & ICOM_DCD);
+                if (delta_status & ICOM_CTS)
+                        uart_handle_cts_change(&icom_port->uart_port,
+                                               delta_status & ICOM_CTS);
+
+                wake_up_interruptible(&icom_port->uart_port.info->
+                                      delta_msr_wait);
+                old_status = status;
+        }
+        spin_unlock(&icom_port->uart_port.lock);
+}
+
+static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
+{
+        unsigned short int count;
+        int i;
+
+        if (port_int_reg & (INT_XMIT_COMPLETED)) {
+                trace(icom_port, "XMIT_COMPLETE", 0);
+
+                /* clear buffer in use bit */
+                icom_port->statStg->xmit[0].flags &=
+                        cpu_to_le16(~SA_FLAGS_READY_TO_XMIT);
+
+                count = (unsigned short int)
+                        cpu_to_le16(icom_port->statStg->xmit[0].leLength);
+                icom_port->uart_port.icount.tx += count;
+
+                for (i=0; i<count &&
+                        !uart_circ_empty(&icom_port->uart_port.info->xmit); i++) {
+
+                        icom_port->uart_port.info->xmit.tail++;
+                        icom_port->uart_port.info->xmit.tail &=
+                                (UART_XMIT_SIZE - 1);
+                }
+
+                if (!icom_write(&icom_port->uart_port))
+                        /* activate write queue */
+                        uart_write_wakeup(&icom_port->uart_port);
+        } else
+                trace(icom_port, "XMIT_DISABLED", 0);
+}
+
+static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
+{
+        short int count, rcv_buff;
+        struct tty_struct *tty = icom_port->uart_port.info->tty;
+        unsigned short int status;
+        struct uart_icount *icount;
+        unsigned long offset;
+
+        trace(icom_port, "RCV_COMPLETE", 0);
+        rcv_buff = icom_port->next_rcv;
+
+        status = cpu_to_le16(icom_port->statStg->rcv[rcv_buff].flags);
+        while (status & SA_FL_RCV_DONE) {
+
+                trace(icom_port, "FID_STATUS", status);
+                count = cpu_to_le16(icom_port->statStg->rcv[rcv_buff].leLength);
+
+                trace(icom_port, "RCV_COUNT", count);
+                if (count > (TTY_FLIPBUF_SIZE - tty->flip.count))
+                        count = TTY_FLIPBUF_SIZE - tty->flip.count;
+
+                trace(icom_port, "REAL_COUNT", count);
+
+                offset =
+                        cpu_to_le32(icom_port->statStg->rcv[rcv_buff].leBuffer) -
+                        icom_port->recv_buf_pci;
+
+                memcpy(tty->flip.char_buf_ptr,(unsigned char *)
+                       ((unsigned long)icom_port->recv_buf + offset), count);
+
+                if (count > 0) {
+                        tty->flip.count += count - 1;
+                        tty->flip.char_buf_ptr += count - 1;
+
+                        memset(tty->flip.flag_buf_ptr, 0, count);
+                        tty->flip.flag_buf_ptr += count - 1;
+                }
+
+                icount = &icom_port->uart_port.icount;
+                icount->rx += count;
+
+                /* Break detect logic */
+                if ((status & SA_FLAGS_FRAME_ERROR)
+                    && (tty->flip.char_buf_ptr[0] == 0x00)) {
+                        status &= ~SA_FLAGS_FRAME_ERROR;
+                        status |= SA_FLAGS_BREAK_DET;
+                        trace(icom_port, "BREAK_DET", 0);
+                }
+
+                if (status &
+                    (SA_FLAGS_BREAK_DET | SA_FLAGS_PARITY_ERROR |
+                     SA_FLAGS_FRAME_ERROR | SA_FLAGS_OVERRUN)) {
+
+                        if (status & SA_FLAGS_BREAK_DET)
+                                icount->brk++;
+                        if (status & SA_FLAGS_PARITY_ERROR)
+                                icount->parity++;
+                        if (status & SA_FLAGS_FRAME_ERROR)
+                                icount->frame++;
+                        if (status & SA_FLAGS_OVERRUN)
+                                icount->overrun++;
+
+                        /*
+                         * Now check to see if character should be
+                         * ignored, and mask off conditions which
+                         * should be ignored.
+                         */
+                        if (status & icom_port->ignore_status_mask) {
+                                trace(icom_port, "IGNORE_CHAR", 0);
+                                goto ignore_char;
+                        }
+
+                        status &= icom_port->read_status_mask;
+
+                        if (status & SA_FLAGS_BREAK_DET) {
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        } else if (status & SA_FLAGS_PARITY_ERROR) {
+                                trace(icom_port, "PARITY_ERROR", 0);
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        } else if (status & SA_FLAGS_FRAME_ERROR)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+
+                        if (status & SA_FLAGS_OVERRUN) {
+                                /*
+                                 * Overrun is special, since it's
+                                 * reported immediately, and doesn't
+                                 * affect the current character
+                                 */
+                                if (tty->flip.count < TTY_FLIPBUF_SIZE) {
+                                        tty->flip.count++;
+                                        tty->flip.flag_buf_ptr++;
+                                        tty->flip.char_buf_ptr++;
+                                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                                }
+                        }
+                }
+
+                tty->flip.flag_buf_ptr++;
+                tty->flip.char_buf_ptr++;
+                tty->flip.count++;
+                ignore_char:
+                        icom_port->statStg->rcv[rcv_buff].flags = 0;
+                icom_port->statStg->rcv[rcv_buff].leLength = 0;
+                icom_port->statStg->rcv[rcv_buff].WorkingLength =
+                        (unsigned short int) cpu_to_le16(RCV_BUFF_SZ);
+
+                rcv_buff++;
+                if (rcv_buff == NUM_RBUFFS)
+                        rcv_buff = 0;
+
+                status = cpu_to_le16(icom_port->statStg->rcv[rcv_buff].flags);
+        }
+        icom_port->next_rcv = rcv_buff;
+        tty_flip_buffer_push(tty);
+}
+
+static void process_interrupt(u16 port_int_reg,
+                              struct icom_port *icom_port)
+{
+
+        spin_lock(&icom_port->uart_port.lock);
+        trace(icom_port, "INTERRUPT", port_int_reg);
+
+        if (port_int_reg & (INT_XMIT_COMPLETED | INT_XMIT_DISABLED))
+                xmit_interrupt(port_int_reg, icom_port);
+
+        if (port_int_reg & INT_RCV_COMPLETED)
+                recv_interrupt(port_int_reg, icom_port);
+
+        spin_unlock(&icom_port->uart_port.lock);
+}
+
+static irqreturn_t icom_interrupt(int irq, void *dev_id,
+                                  struct pt_regs *regs)
+{
+        void __iomem * int_reg;
+        u32 adapter_interrupts;
+        u16 port_int_reg;
+        struct icom_adapter *icom_adapter;
+        struct icom_port *icom_port;
+
+        /* find icom_port for this interrupt */
+        icom_adapter = (struct icom_adapter *) dev_id;
+
+        if ((icom_adapter->version | ADAPTER_V2) == ADAPTER_V2) {
+                int_reg = icom_adapter->base_addr + 0x8024;
+
+                adapter_interrupts = readl(int_reg);
+
+                if (adapter_interrupts & 0x00003FFF) {
+                        /* port 2 interrupt,  NOTE:  for all ADAPTER_V2, port 2 will be active */
+                        icom_port = &icom_adapter->port_info[2];
+                        port_int_reg = (u16) adapter_interrupts;
+                        process_interrupt(port_int_reg, icom_port);
+                        check_modem_status(icom_port);
+                }
+                if (adapter_interrupts & 0x3FFF0000) {
+                        /* port 3 interrupt */
+                        icom_port = &icom_adapter->port_info[3];
+                        if (icom_port->status == ICOM_PORT_ACTIVE) {
+                                port_int_reg =
+                                    (u16) (adapter_interrupts >> 16);
+                                process_interrupt(port_int_reg, icom_port);
+                                check_modem_status(icom_port);
+                        }
+                }
+
+                /* Clear out any pending interrupts */
+                writel(adapter_interrupts, int_reg);
+
+                int_reg = icom_adapter->base_addr + 0x8004;
+        } else {
+                int_reg = icom_adapter->base_addr + 0x4004;
+        }
+
+        adapter_interrupts = readl(int_reg);
+
+        if (adapter_interrupts & 0x00003FFF) {
+                /* port 0 interrupt, NOTE:  for all adapters, port 0 will be active */
+                icom_port = &icom_adapter->port_info[0];
+                port_int_reg = (u16) adapter_interrupts;
+                process_interrupt(port_int_reg, icom_port);
+                check_modem_status(icom_port);
+        }
+        if (adapter_interrupts & 0x3FFF0000) {
+                /* port 1 interrupt */
+                icom_port = &icom_adapter->port_info[1];
+                if (icom_port->status == ICOM_PORT_ACTIVE) {
+                        port_int_reg = (u16) (adapter_interrupts >> 16);
+                        process_interrupt(port_int_reg, icom_port);
+                        check_modem_status(icom_port);
+                }
+        }
+
+        /* Clear out any pending interrupts */
+        writel(adapter_interrupts, int_reg);
+
+        /* flush the write */
+        adapter_interrupts = readl(int_reg);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * ------------------------------------------------------------------
+ * Begin serial-core API
+ * ------------------------------------------------------------------
+ */
+static unsigned int icom_tx_empty(struct uart_port *port)
+{
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        if (cpu_to_le16(ICOM_PORT->statStg->xmit[0].flags) &
+            SA_FLAGS_READY_TO_XMIT)
+                ret = TIOCSER_TEMT;
+        else
+                ret = 0;
+
+        spin_unlock_irqrestore(&port->lock, flags);
+        return ret;
+}
+
+static void icom_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        unsigned char local_osr;
+
+        trace(ICOM_PORT, "SET_MODEM", 0);
+        local_osr = readb(&ICOM_PORT->dram->osr);
+
+        if (mctrl & TIOCM_RTS) {
+                trace(ICOM_PORT, "RAISE_RTS", 0);
+                local_osr |= ICOM_RTS;
+        } else {
+                trace(ICOM_PORT, "LOWER_RTS", 0);
+                local_osr &= ~ICOM_RTS;
+        }
+
+        if (mctrl & TIOCM_DTR) {
+                trace(ICOM_PORT, "RAISE_DTR", 0);
+                local_osr |= ICOM_DTR;
+        } else {
+                trace(ICOM_PORT, "LOWER_DTR", 0);
+                local_osr &= ~ICOM_DTR;
+        }
+
+        writeb(local_osr, &ICOM_PORT->dram->osr);
+}
+
+static unsigned int icom_get_mctrl(struct uart_port *port)
+{
+        unsigned char status;
+        unsigned int result;
+
+        trace(ICOM_PORT, "GET_MODEM", 0);
+
+        status = readb(&ICOM_PORT->dram->isr);
+
+        result = ((status & ICOM_DCD) ? TIOCM_CAR : 0)
+            | ((status & ICOM_RI) ? TIOCM_RNG : 0)
+            | ((status & ICOM_DSR) ? TIOCM_DSR : 0)
+            | ((status & ICOM_CTS) ? TIOCM_CTS : 0);
+        return result;
+}
+
+static void icom_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        unsigned char cmdReg;
+
+        if (tty_stop) {
+                trace(ICOM_PORT, "STOP", 0);
+                cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+                writeb(cmdReg | CMD_HOLD_XMIT, &ICOM_PORT->dram->CmdReg);
+        }
+}
+
+static void icom_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        unsigned char cmdReg;
+
+        trace(ICOM_PORT, "START", 0);
+        cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+        if ((cmdReg & CMD_HOLD_XMIT) == CMD_HOLD_XMIT)
+                writeb(cmdReg & ~CMD_HOLD_XMIT,
+                       &ICOM_PORT->dram->CmdReg);
+
+        icom_write(port);
+}
+
+static void icom_send_xchar(struct uart_port *port, char ch)
+{
+        unsigned char xdata;
+        int index;
+        unsigned long flags;
+
+        trace(ICOM_PORT, "SEND_XCHAR", ch);
+
+        /* wait .1 sec to send char */
+        for (index = 0; index < 10; index++) {
+                spin_lock_irqsave(&port->lock, flags);
+                xdata = readb(&ICOM_PORT->dram->xchar);
+                if (xdata == 0x00) {
+                        trace(ICOM_PORT, "QUICK_WRITE", 0);
+                        writeb(ch, &ICOM_PORT->dram->xchar);
+
+                        /* flush write operation */
+                        xdata = readb(&ICOM_PORT->dram->xchar);
+                        spin_unlock_irqrestore(&port->lock, flags);
+                        break;
+                }
+                spin_unlock_irqrestore(&port->lock, flags);
+                msleep(10);
+        }
+}
+
+static void icom_stop_rx(struct uart_port *port)
+{
+        unsigned char cmdReg;
+
+        cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+        writeb(cmdReg & ~CMD_RCV_ENABLE, &ICOM_PORT->dram->CmdReg);
+}
+
+static void icom_enable_ms(struct uart_port *port)
+{
+        /* no-op */
+}
+
+static void icom_break(struct uart_port *port, int break_state)
+{
+        unsigned char cmdReg;
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        trace(ICOM_PORT, "BREAK", 0);
+        cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+        if (break_state == -1) {
+                writeb(cmdReg | CMD_SND_BREAK, &ICOM_PORT->dram->CmdReg);
+        } else {
+                writeb(cmdReg & ~CMD_SND_BREAK, &ICOM_PORT->dram->CmdReg);
+        }
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int icom_open(struct uart_port *port)
+{
+        int retval;
+
+        kobject_get(&ICOM_PORT->adapter->kobj);
+        retval = startup(ICOM_PORT);
+
+        if (retval) {
+                kobject_put(&ICOM_PORT->adapter->kobj);
+                trace(ICOM_PORT, "STARTUP_ERROR", 0);
+                return retval;
+        }
+
+        return 0;
+}
+
+static void icom_close(struct uart_port *port)
+{
+        unsigned char cmdReg;
+
+        trace(ICOM_PORT, "CLOSE", 0);
+
+        /* stop receiver */
+        cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+        writeb(cmdReg & (unsigned char) ~CMD_RCV_ENABLE,
+               &ICOM_PORT->dram->CmdReg);
+
+        shutdown(ICOM_PORT);
+
+        kobject_put(&ICOM_PORT->adapter->kobj);
+}
+
+static void icom_set_termios(struct uart_port *port,
+                             struct termios *termios,
+                             struct termios *old_termios)
+{
+        int baud;
+        unsigned cflag, iflag;
+        int bits;
+        char new_config2;
+        char new_config3 = 0;
+        char tmp_byte;
+        int index;
+        int rcv_buff, xmit_buff;
+        unsigned long offset;
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        trace(ICOM_PORT, "CHANGE_SPEED", 0);
+
+        cflag = termios->c_cflag;
+        iflag = termios->c_iflag;
+
+        new_config2 = ICOM_ACFG_DRIVE1;
+
+        /* byte size and parity */
+        switch (cflag & CSIZE) {
+        case CS5:               /* 5 bits/char */
+                new_config2 |= ICOM_ACFG_5BPC;
+                bits = 7;
+                break;
+        case CS6:               /* 6 bits/char */
+                new_config2 |= ICOM_ACFG_6BPC;
+                bits = 8;
+                break;
+        case CS7:               /* 7 bits/char */
+                new_config2 |= ICOM_ACFG_7BPC;
+                bits = 9;
+                break;
+        case CS8:               /* 8 bits/char */
+                new_config2 |= ICOM_ACFG_8BPC;
+                bits = 10;
+                break;
+        default:
+                bits = 10;
+                break;
+        }
+        if (cflag & CSTOPB) {
+                /* 2 stop bits */
+                new_config2 |= ICOM_ACFG_2STOP_BIT;
+                bits++;
+        }
+        if (cflag & PARENB) {
+                /* parity bit enabled */
+                new_config2 |= ICOM_ACFG_PARITY_ENAB;
+                trace(ICOM_PORT, "PARENB", 0);
+                bits++;
+        }
+        if (cflag & PARODD) {
+                /* odd parity */
+                new_config2 |= ICOM_ACFG_PARITY_ODD;
+                trace(ICOM_PORT, "PARODD", 0);
+        }
+
+        /* Determine divisor based on baud rate */
+        baud = uart_get_baud_rate(port, termios, old_termios,
+                                  icom_acfg_baud[0],
+                                  icom_acfg_baud[BAUD_TABLE_LIMIT]);
+        if (!baud)
+                baud = 9600;    /* B0 transition handled in rs_set_termios */
+
+        for (index = 0; index < BAUD_TABLE_LIMIT; index++) {
+                if (icom_acfg_baud[index] == baud) {
+                        new_config3 = index;
+                        break;
+                }
+        }
+
+        uart_update_timeout(port, cflag, baud);
+
+        /* CTS flow control flag and modem status interrupts */
+        tmp_byte = readb(&(ICOM_PORT->dram->HDLCConfigReg));
+        if (cflag & CRTSCTS)
+                tmp_byte |= HDLC_HDW_FLOW;
+        else
+                tmp_byte &= ~HDLC_HDW_FLOW;
+        writeb(tmp_byte, &(ICOM_PORT->dram->HDLCConfigReg));
+
+        /*
+         * Set up parity check flag
+         */
+        ICOM_PORT->read_status_mask = SA_FLAGS_OVERRUN | SA_FL_RCV_DONE;
+        if (iflag & INPCK)
+                ICOM_PORT->read_status_mask |=
+                    SA_FLAGS_FRAME_ERROR | SA_FLAGS_PARITY_ERROR;
+
+        if ((iflag & BRKINT) || (iflag & PARMRK))
+                ICOM_PORT->read_status_mask |= SA_FLAGS_BREAK_DET;
+
+        /*
+         * Characters to ignore
+         */
+        ICOM_PORT->ignore_status_mask = 0;
+        if (iflag & IGNPAR)
+                ICOM_PORT->ignore_status_mask |=
+                    SA_FLAGS_PARITY_ERROR | SA_FLAGS_FRAME_ERROR;
+        if (iflag & IGNBRK) {
+                ICOM_PORT->ignore_status_mask |= SA_FLAGS_BREAK_DET;
+                /*
+                 * If we're ignore parity and break indicators, ignore
+                 * overruns too.  (For real raw support).
+                 */
+                if (iflag & IGNPAR)
+                        ICOM_PORT->ignore_status_mask |= SA_FLAGS_OVERRUN;
+        }
+
+        /*
+         * !!! ignore all characters if CREAD is not set
+         */
+        if ((cflag & CREAD) == 0)
+                ICOM_PORT->ignore_status_mask |= SA_FL_RCV_DONE;
+
+        /* Turn off Receiver to prepare for reset */
+        writeb(CMD_RCV_DISABLE, &ICOM_PORT->dram->CmdReg);
+
+        for (index = 0; index < 10; index++) {
+                if (readb(&ICOM_PORT->dram->PrevCmdReg) == 0x00) {
+                        break;
+                }
+        }
+
+        /* clear all current buffers of data */
+        for (rcv_buff = 0; rcv_buff < NUM_RBUFFS; rcv_buff++) {
+                ICOM_PORT->statStg->rcv[rcv_buff].flags = 0;
+                ICOM_PORT->statStg->rcv[rcv_buff].leLength = 0;
+                ICOM_PORT->statStg->rcv[rcv_buff].WorkingLength =
+                    (unsigned short int) cpu_to_le16(RCV_BUFF_SZ);
+        }
+
+        for (xmit_buff = 0; xmit_buff < NUM_XBUFFS; xmit_buff++) {
+                ICOM_PORT->statStg->xmit[xmit_buff].flags = 0;
+        }
+
+        /* activate changes and start xmit and receiver here */
+        /* Enable the receiver */
+        writeb(new_config3, &(ICOM_PORT->dram->async_config3));
+        writeb(new_config2, &(ICOM_PORT->dram->async_config2));
+        tmp_byte = readb(&(ICOM_PORT->dram->HDLCConfigReg));
+        tmp_byte |= HDLC_PPP_PURE_ASYNC | HDLC_FF_FILL;
+        writeb(tmp_byte, &(ICOM_PORT->dram->HDLCConfigReg));
+        writeb(0x04, &(ICOM_PORT->dram->FlagFillIdleTimer));    /* 0.5 seconds */
+        writeb(0xFF, &(ICOM_PORT->dram->ier));  /* enable modem signal interrupts */
+
+        /* reset processor */
+        writeb(CMD_RESTART, &ICOM_PORT->dram->CmdReg);
+
+        for (index = 0; index < 10; index++) {
+                if (readb(&ICOM_PORT->dram->CmdReg) == 0x00) {
+                        break;
+                }
+        }
+
+        /* Enable Transmitter and Reciever */
+        offset =
+            (unsigned long) &ICOM_PORT->statStg->rcv[0] -
+            (unsigned long) ICOM_PORT->statStg;
+        writel(ICOM_PORT->statStg_pci + offset,
+               &ICOM_PORT->dram->RcvStatusAddr);
+        ICOM_PORT->next_rcv = 0;
+        ICOM_PORT->put_length = 0;
+        *ICOM_PORT->xmitRestart = 0;
+        writel(ICOM_PORT->xmitRestart_pci,
+               &ICOM_PORT->dram->XmitStatusAddr);
+        trace(ICOM_PORT, "XR_ENAB", 0);
+        writeb(CMD_XMIT_RCV_ENABLE, &ICOM_PORT->dram->CmdReg);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *icom_type(struct uart_port *port)
+{
+        return "icom";
+}
+
+static void icom_release_port(struct uart_port *port)
+{
+}
+
+static int icom_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static void icom_config_port(struct uart_port *port, int flags)
+{
+        port->type = PORT_ICOM;
+}
+
+static struct uart_ops icom_ops = {
+        .tx_empty = icom_tx_empty,
+        .set_mctrl = icom_set_mctrl,
+        .get_mctrl = icom_get_mctrl,
+        .stop_tx = icom_stop_tx,
+        .start_tx = icom_start_tx,
+        .send_xchar = icom_send_xchar,
+        .stop_rx = icom_stop_rx,
+        .enable_ms = icom_enable_ms,
+        .break_ctl = icom_break,
+        .startup = icom_open,
+        .shutdown = icom_close,
+        .set_termios = icom_set_termios,
+        .type = icom_type,
+        .release_port = icom_release_port,
+        .request_port = icom_request_port,
+        .config_port = icom_config_port,
+};
+
+#define ICOM_CONSOLE NULL
+
+static struct uart_driver icom_uart_driver = {
+        .owner = THIS_MODULE,
+        .driver_name = ICOM_DRIVER_NAME,
+        .dev_name = "ttyA",
+        .major = ICOM_MAJOR,
+        .minor = ICOM_MINOR_START,
+        .nr = NR_PORTS,
+        .cons = ICOM_CONSOLE,
+};
+
+static int __devinit icom_init_ports(struct icom_adapter *icom_adapter)
+{
+        u32 subsystem_id = icom_adapter->subsystem_id;
+        int retval = 0;
+        int i;
+        struct icom_port *icom_port;
+
+        if (icom_adapter->version == ADAPTER_V1) {
+                icom_adapter->numb_ports = 2;
+
+                for (i = 0; i < 2; i++) {
+                        icom_port = &icom_adapter->port_info[i];
+                        icom_port->port = i;
+                        icom_port->status = ICOM_PORT_ACTIVE;
+                        icom_port->imbed_modem = ICOM_UNKNOWN;
+                }
+        } else {
+                if (subsystem_id == PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL) {
+                        icom_adapter->numb_ports = 4;
+
+                        for (i = 0; i < 4; i++) {
+                                icom_port = &icom_adapter->port_info[i];
+
+                                icom_port->port = i;
+                                icom_port->status = ICOM_PORT_ACTIVE;
+                                icom_port->imbed_modem = ICOM_IMBED_MODEM;
+                        }
+                } else {
+                        icom_adapter->numb_ports = 4;
+
+                        icom_adapter->port_info[0].port = 0;
+                        icom_adapter->port_info[0].status = ICOM_PORT_ACTIVE;
+
+                        if (subsystem_id ==
+                            PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM) {
+                                icom_adapter->port_info[0].imbed_modem = ICOM_IMBED_MODEM;
+                        } else {
+                                icom_adapter->port_info[0].imbed_modem = ICOM_RVX;
+                        }
+
+                        icom_adapter->port_info[1].status = ICOM_PORT_OFF;
+
+                        icom_adapter->port_info[2].port = 2;
+                        icom_adapter->port_info[2].status = ICOM_PORT_ACTIVE;
+                        icom_adapter->port_info[2].imbed_modem = ICOM_RVX;
+                        icom_adapter->port_info[3].status = ICOM_PORT_OFF;
+                }
+        }
+
+        return retval;
+}
+
+static void icom_port_active(struct icom_port *icom_port, struct icom_adapter *icom_adapter, int port_num)
+{
+        if (icom_adapter->version == ADAPTER_V1) {
+                icom_port->global_reg = icom_adapter->base_addr + 0x4000;
+                icom_port->int_reg = icom_adapter->base_addr +
+                    0x4004 + 2 - 2 * port_num;
+        } else {
+                icom_port->global_reg = icom_adapter->base_addr + 0x8000;
+                if (icom_port->port < 2)
+                        icom_port->int_reg = icom_adapter->base_addr +
+                            0x8004 + 2 - 2 * icom_port->port;
+                else
+                        icom_port->int_reg = icom_adapter->base_addr +
+                            0x8024 + 2 - 2 * (icom_port->port - 2);
+        }
+}
+static int __init icom_load_ports(struct icom_adapter *icom_adapter)
+{
+        struct icom_port *icom_port;
+        int port_num;
+        int retval;
+
+        for (port_num = 0; port_num < icom_adapter->numb_ports; port_num++) {
+
+                icom_port = &icom_adapter->port_info[port_num];
+
+                if (icom_port->status == ICOM_PORT_ACTIVE) {
+                        icom_port_active(icom_port, icom_adapter, port_num);
+                        icom_port->dram = icom_adapter->base_addr +
+                                        0x2000 * icom_port->port;
+
+                        icom_port->adapter = icom_adapter;
+
+                        /* get port memory */
+                        if ((retval = get_port_memory(icom_port)) != 0) {
+                                dev_err(&icom_port->adapter->pci_dev->dev,
+                                        "Memory allocation for port FAILED\n");
+                        }
+                }
+        }
+        return 0;
+}
+
+static int __devinit icom_alloc_adapter(struct icom_adapter
+                                        **icom_adapter_ref)
+{
+        int adapter_count = 0;
+        struct icom_adapter *icom_adapter;
+        struct icom_adapter *cur_adapter_entry;
+        struct list_head *tmp;
+
+        icom_adapter = (struct icom_adapter *)
+            kmalloc(sizeof(struct icom_adapter), GFP_KERNEL);
+
+        if (!icom_adapter) {
+                return -ENOMEM;
+        }
+
+        memset(icom_adapter, 0, sizeof(struct icom_adapter));
+
+        list_for_each(tmp, &icom_adapter_head) {
+                cur_adapter_entry =
+                    list_entry(tmp, struct icom_adapter,
+                               icom_adapter_entry);
+                if (cur_adapter_entry->index != adapter_count) {
+                        break;
+                }
+                adapter_count++;
+        }
+
+        icom_adapter->index = adapter_count;
+        list_add_tail(&icom_adapter->icom_adapter_entry, tmp);
+
+        *icom_adapter_ref = icom_adapter;
+        return 0;
+}
+
+static void icom_free_adapter(struct icom_adapter *icom_adapter)
+{
+        list_del(&icom_adapter->icom_adapter_entry);
+        kfree(icom_adapter);
+}
+
+static void icom_remove_adapter(struct icom_adapter *icom_adapter)
+{
+        struct icom_port *icom_port;
+        int index;
+
+        for (index = 0; index < icom_adapter->numb_ports; index++) {
+                icom_port = &icom_adapter->port_info[index];
+
+                if (icom_port->status == ICOM_PORT_ACTIVE) {
+                        dev_info(&icom_adapter->pci_dev->dev,
+                                 "Device removed\n");
+
+                        uart_remove_one_port(&icom_uart_driver,
+                                             &icom_port->uart_port);
+
+                        /* be sure that DTR and RTS are dropped */
+                        writeb(0x00, &icom_port->dram->osr);
+
+                        /* Wait 0.1 Sec for simple Init to complete */
+                        msleep(100);
+
+                        /* Stop proccessor */
+                        stop_processor(icom_port);
+
+                        free_port_memory(icom_port);
+                }
+        }
+
+        free_irq(icom_adapter->irq_number, (void *) icom_adapter);
+        iounmap(icom_adapter->base_addr);
+        icom_free_adapter(icom_adapter);
+        pci_release_regions(icom_adapter->pci_dev);
+}
+
+static void icom_kobj_release(struct kobject *kobj)
+{
+        struct icom_adapter *icom_adapter;
+
+        icom_adapter = to_icom_adapter(kobj);
+        icom_remove_adapter(icom_adapter);
+}
+
+static struct kobj_type icom_kobj_type = {
+        .release = icom_kobj_release,
+};
+
+static int __devinit icom_probe(struct pci_dev *dev,
+                                const struct pci_device_id *ent)
+{
+        int index;
+        unsigned int command_reg;
+        int retval;
+        struct icom_adapter *icom_adapter;
+        struct icom_port *icom_port;
+
+        retval = pci_enable_device(dev);
+        if (retval) {
+                dev_err(&dev->dev, "Device enable FAILED\n");
+                return retval;
+        }
+
+        if ( (retval = pci_request_regions(dev, "icom"))) {
+                 dev_err(&dev->dev, "pci_request_region FAILED\n");
+                 pci_disable_device(dev);
+                 return retval;
+         }
+
+        pci_set_master(dev);
+
+        if ( (retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg))) {
+                dev_err(&dev->dev, "PCI Config read FAILED\n");
+                return retval;
+        }
+
+        pci_write_config_dword(dev, PCI_COMMAND,
+                command_reg | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
+                | PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
+
+        if (ent->driver_data == ADAPTER_V1) {
+                pci_write_config_dword(dev, 0x44, 0x8300830A);
+         } else {
+                pci_write_config_dword(dev, 0x44, 0x42004200);
+                pci_write_config_dword(dev, 0x48, 0x42004200);
+         }
+
+
+        retval = icom_alloc_adapter(&icom_adapter);
+        if (retval) {
+                 dev_err(&dev->dev, "icom_alloc_adapter FAILED\n");
+                 retval = -EIO;
+                 goto probe_exit0;
+        }
+
+         icom_adapter->base_addr_pci = pci_resource_start(dev, 0);
+         icom_adapter->irq_number = dev->irq;
+         icom_adapter->pci_dev = dev;
+         icom_adapter->version = ent->driver_data;
+         icom_adapter->subsystem_id = ent->subdevice;
+
+
+        retval = icom_init_ports(icom_adapter);
+        if (retval) {
+                dev_err(&dev->dev, "Port configuration failed\n");
+                goto probe_exit1;
+        }
+
+         icom_adapter->base_addr = ioremap(icom_adapter->base_addr_pci,
+                                                pci_resource_len(dev, 0));
+
+        if (!icom_adapter->base_addr)
+                goto probe_exit1;
+
+         /* save off irq and request irq line */
+         if ( (retval = request_irq(dev->irq, icom_interrupt,
+                                   SA_INTERRUPT | SA_SHIRQ, ICOM_DRIVER_NAME,
+                                   (void *) icom_adapter))) {
+                  goto probe_exit2;
+         }
+
+        retval = icom_load_ports(icom_adapter);
+
+        for (index = 0; index < icom_adapter->numb_ports; index++) {
+                icom_port = &icom_adapter->port_info[index];
+
+                if (icom_port->status == ICOM_PORT_ACTIVE) {
+                        icom_port->uart_port.irq = icom_port->adapter->irq_number;
+                        icom_port->uart_port.type = PORT_ICOM;
+                        icom_port->uart_port.iotype = UPIO_MEM;
+                        icom_port->uart_port.membase =
+                                               (char *) icom_adapter->base_addr_pci;
+                        icom_port->uart_port.fifosize = 16;
+                        icom_port->uart_port.ops = &icom_ops;
+                        icom_port->uart_port.line =
+                        icom_port->port + icom_adapter->index * 4;
+                        if (uart_add_one_port (&icom_uart_driver, &icom_port->uart_port)) {
+                                icom_port->status = ICOM_PORT_OFF;
+                                dev_err(&dev->dev, "Device add failed\n");
+                         } else
+                                dev_info(&dev->dev, "Device added\n");
+                }
+        }
+
+        kobject_init(&icom_adapter->kobj);
+        icom_adapter->kobj.ktype = &icom_kobj_type;
+        return 0;
+
+probe_exit2:
+        iounmap(icom_adapter->base_addr);
+probe_exit1:
+        icom_free_adapter(icom_adapter);
+
+probe_exit0:
+        pci_release_regions(dev);
+        pci_disable_device(dev);
+
+        return retval;
+
+
+}
+
+static void __devexit icom_remove(struct pci_dev *dev)
+{
+        struct icom_adapter *icom_adapter;
+        struct list_head *tmp;
+
+        list_for_each(tmp, &icom_adapter_head) {
+                icom_adapter = list_entry(tmp, struct icom_adapter,
+                                          icom_adapter_entry);
+                if (icom_adapter->pci_dev == dev) {
+                        kobject_put(&icom_adapter->kobj);
+                        return;
+                }
+        }
+
+        dev_err(&dev->dev, "Unable to find device to remove\n");
+}
+
+static struct pci_driver icom_pci_driver = {
+        .name = ICOM_DRIVER_NAME,
+        .id_table = icom_pci_table,
+        .probe = icom_probe,
+        .remove = __devexit_p(icom_remove),
+};
+
+static int __init icom_init(void)
+{
+        int ret;
+
+        spin_lock_init(&icom_lock);
+
+        ret = uart_register_driver(&icom_uart_driver);
+        if (ret)
+                return ret;
+
+        ret = pci_register_driver(&icom_pci_driver);
+
+        if (ret < 0)
+                uart_unregister_driver(&icom_uart_driver);
+
+        return ret;
+}
+
+static void __exit icom_exit(void)
+{
+        pci_unregister_driver(&icom_pci_driver);
+        uart_unregister_driver(&icom_uart_driver);
+}
+
+module_init(icom_init);
+module_exit(icom_exit);
+
+#ifdef ICOM_TRACE
+static inline void trace(struct icom_port *icom_port, char *trace_pt,
+                  unsigned long trace_data)
+{
+        dev_info(&icom_port->adapter->pci_dev->dev, ":%d:%s - %lx\n",
+                 icom_port->port, trace_pt, trace_data);
+}
+#endif
+
+MODULE_AUTHOR("Michael Anderson <mjanders@us.ibm.com>");
+MODULE_DESCRIPTION("IBM iSeries Serial IOA driver");
+MODULE_SUPPORTED_DEVICE
+    ("IBM iSeries 2745, 2771, 2772, 2742, 2793 and 2805 Communications adapters");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/serial/icom.h b/drivers/serial/icom.h
new file mode 100644
index 000000000000..23dc0f7ddf8b
--- /dev/null
+++ b/drivers/serial/icom.h
@@ -0,0 +1,290 @@
+/*
+ * icom.h
+ *
+ * Copyright (C) 2001 Michael Anderson, IBM Corporation
+ *
+ * Serial device driver include file.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include<linux/serial_core.h>
+
+#define BAUD_TABLE_LIMIT        ((sizeof(icom_acfg_baud)/sizeof(int)) - 1)
+static int icom_acfg_baud[] = {
+        300,
+        600,
+        900,
+        1200,
+        1800,
+        2400,
+        3600,
+        4800,
+        7200,
+        9600,
+        14400,
+        19200,
+        28800,
+        38400,
+        57600,
+        76800,
+        115200,
+        153600,
+        230400,
+        307200,
+        460800,
+};
+
+struct icom_regs {
+        u32 control;            /* Adapter Control Register     */
+        u32 interrupt;          /* Adapter Interrupt Register   */
+        u32 int_mask;           /* Adapter Interrupt Mask Reg   */
+        u32 int_pri;            /* Adapter Interrupt Priority r */
+        u32 int_reg_b;          /* Adapter non-masked Interrupt */
+        u32 resvd01;
+        u32 resvd02;
+        u32 resvd03;
+        u32 control_2;          /* Adapter Control Register 2   */
+        u32 interrupt_2;        /* Adapter Interrupt Register 2 */
+        u32 int_mask_2;         /* Adapter Interrupt Mask 2     */
+        u32 int_pri_2;          /* Adapter Interrupt Prior 2    */
+        u32 int_reg_2b;         /* Adapter non-masked 2         */
+};
+
+struct func_dram {
+        u32 reserved[108];      /* 0-1B0   reserved by personality code */
+        u32 RcvStatusAddr;      /* 1B0-1B3 Status Address for Next rcv */
+        u8 RcvStnAddr;          /* 1B4     Receive Station Addr */
+        u8 IdleState;           /* 1B5     Idle State */
+        u8 IdleMonitor;         /* 1B6     Idle Monitor */
+        u8 FlagFillIdleTimer;   /* 1B7     Flag Fill Idle Timer */
+        u32 XmitStatusAddr;     /* 1B8-1BB Transmit Status Address */
+        u8 StartXmitCmd;        /* 1BC     Start Xmit Command */
+        u8 HDLCConfigReg;       /* 1BD     Reserved */
+        u8 CauseCode;           /* 1BE     Cause code for fatal error */
+        u8 xchar;               /* 1BF     High priority send */
+        u32 reserved3;          /* 1C0-1C3 Reserved */
+        u8 PrevCmdReg;          /* 1C4     Reserved */
+        u8 CmdReg;              /* 1C5     Command Register */
+        u8 async_config2;       /* 1C6     Async Config Byte 2 */
+        u8 async_config3;       /* 1C7     Async Config Byte 3 */
+        u8 dce_resvd[20];       /* 1C8-1DB DCE Rsvd           */
+        u8 dce_resvd21;         /* 1DC     DCE Rsvd (21st byte */
+        u8 misc_flags;          /* 1DD     misc flags         */
+#define V2_HARDWARE     0x40
+#define ICOM_HDW_ACTIVE 0x01
+        u8 call_length;         /* 1DE     Phone #/CFI buff ln */
+        u8 call_length2;        /* 1DF     Upper byte (unused) */
+        u32 call_addr;          /* 1E0-1E3 Phn #/CFI buff addr */
+        u16 timer_value;        /* 1E4-1E5 general timer value */
+        u8 timer_command;       /* 1E6     general timer cmd  */
+        u8 dce_command;         /* 1E7     dce command reg    */
+        u8 dce_cmd_status;      /* 1E8     dce command stat   */
+        u8 x21_r1_ioff;         /* 1E9     dce ready counter  */
+        u8 x21_r0_ioff;         /* 1EA     dce not ready ctr  */
+        u8 x21_ralt_ioff;       /* 1EB     dce CNR counter    */
+        u8 x21_r1_ion;          /* 1EC     dce ready I on ctr */
+        u8 rsvd_ier;            /* 1ED     Rsvd for IER (if ne */
+        u8 ier;                 /* 1EE     Interrupt Enable   */
+        u8 isr;                 /* 1EF     Input Signal Reg   */
+        u8 osr;                 /* 1F0     Output Signal Reg  */
+        u8 reset;               /* 1F1     Reset/Reload Reg   */
+        u8 disable;             /* 1F2     Disable Reg        */
+        u8 sync;                /* 1F3     Sync Reg           */
+        u8 error_stat;          /* 1F4     Error Status       */
+        u8 cable_id;            /* 1F5     Cable ID           */
+        u8 cs_length;           /* 1F6     CS Load Length     */
+        u8 mac_length;          /* 1F7     Mac Load Length    */
+        u32 cs_load_addr;       /* 1F8-1FB Call Load PCI Addr */
+        u32 mac_load_addr;      /* 1FC-1FF Mac Load PCI Addr  */
+};
+
+/*
+ * adapter defines and structures
+ */
+#define ICOM_CONTROL_START_A         0x00000008
+#define ICOM_CONTROL_STOP_A          0x00000004
+#define ICOM_CONTROL_START_B         0x00000002
+#define ICOM_CONTROL_STOP_B          0x00000001
+#define ICOM_CONTROL_START_C         0x00000008
+#define ICOM_CONTROL_STOP_C          0x00000004
+#define ICOM_CONTROL_START_D         0x00000002
+#define ICOM_CONTROL_STOP_D          0x00000001
+#define ICOM_IRAM_OFFSET             0x1000
+#define ICOM_IRAM_SIZE               0x0C00
+#define ICOM_DCE_IRAM_OFFSET         0x0A00
+#define ICOM_CABLE_ID_VALID          0x01
+#define ICOM_CABLE_ID_MASK           0xF0
+#define ICOM_DISABLE                 0x80
+#define CMD_XMIT_RCV_ENABLE          0xC0
+#define CMD_XMIT_ENABLE              0x40
+#define CMD_RCV_DISABLE              0x00
+#define CMD_RCV_ENABLE               0x80
+#define CMD_RESTART                  0x01
+#define CMD_HOLD_XMIT                0x02
+#define CMD_SND_BREAK                0x04
+#define RS232_CABLE                  0x06
+#define V24_CABLE                    0x0E
+#define V35_CABLE                    0x0C
+#define V36_CABLE                    0x02
+#define NO_CABLE                     0x00
+#define START_DOWNLOAD               0x80
+#define ICOM_INT_MASK_PRC_A          0x00003FFF
+#define ICOM_INT_MASK_PRC_B          0x3FFF0000
+#define ICOM_INT_MASK_PRC_C          0x00003FFF
+#define ICOM_INT_MASK_PRC_D          0x3FFF0000
+#define INT_RCV_COMPLETED            0x1000
+#define INT_XMIT_COMPLETED           0x2000
+#define INT_IDLE_DETECT              0x0800
+#define INT_RCV_DISABLED             0x0400
+#define INT_XMIT_DISABLED            0x0200
+#define INT_RCV_XMIT_SHUTDOWN        0x0100
+#define INT_FATAL_ERROR              0x0080
+#define INT_CABLE_PULL               0x0020
+#define INT_SIGNAL_CHANGE            0x0010
+#define HDLC_PPP_PURE_ASYNC          0x02
+#define HDLC_FF_FILL                 0x00
+#define HDLC_HDW_FLOW                0x01
+#define START_XMIT                   0x80
+#define ICOM_ACFG_DRIVE1             0x20
+#define ICOM_ACFG_NO_PARITY          0x00
+#define ICOM_ACFG_PARITY_ENAB        0x02
+#define ICOM_ACFG_PARITY_ODD         0x01
+#define ICOM_ACFG_8BPC               0x00
+#define ICOM_ACFG_7BPC               0x04
+#define ICOM_ACFG_6BPC               0x08
+#define ICOM_ACFG_5BPC               0x0C
+#define ICOM_ACFG_1STOP_BIT          0x00
+#define ICOM_ACFG_2STOP_BIT          0x10
+#define ICOM_DTR                     0x80
+#define ICOM_RTS                     0x40
+#define ICOM_RI                      0x08
+#define ICOM_DSR                     0x80
+#define ICOM_DCD                     0x20
+#define ICOM_CTS                     0x40
+
+#define NUM_XBUFFS 1
+#define NUM_RBUFFS 2
+#define RCV_BUFF_SZ 0x0200
+#define XMIT_BUFF_SZ 0x1000
+struct statusArea {
+    /**********************************************/
+        /* Transmit Status Area                       */
+    /**********************************************/
+        struct xmit_status_area{
+                u32 leNext;     /* Next entry in Little Endian on Adapter */
+                u32 leNextASD;
+                u32 leBuffer;   /* Buffer for entry in LE for Adapter */
+                u16 leLengthASD;
+                u16 leOffsetASD;
+                u16 leLength;   /* Length of data in segment */
+                u16 flags;
+#define SA_FLAGS_DONE           0x0080  /* Done with Segment */
+#define SA_FLAGS_CONTINUED      0x8000  /* More Segments */
+#define SA_FLAGS_IDLE           0x4000  /* Mark IDLE after frm */
+#define SA_FLAGS_READY_TO_XMIT  0x0800
+#define SA_FLAGS_STAT_MASK      0x007F
+        } xmit[NUM_XBUFFS];
+
+    /**********************************************/
+        /* Receive Status Area                        */
+    /**********************************************/
+        struct {
+                u32 leNext;     /* Next entry in Little Endian on Adapter */
+                u32 leNextASD;
+                u32 leBuffer;   /* Buffer for entry in LE for Adapter */
+                u16 WorkingLength;      /* size of segment */
+                u16 reserv01;
+                u16 leLength;   /* Length of data in segment */
+                u16 flags;
+#define SA_FL_RCV_DONE           0x0010 /* Data ready */
+#define SA_FLAGS_OVERRUN         0x0040
+#define SA_FLAGS_PARITY_ERROR    0x0080
+#define SA_FLAGS_FRAME_ERROR     0x0001
+#define SA_FLAGS_FRAME_TRUNC     0x0002
+#define SA_FLAGS_BREAK_DET       0x0004 /* set conditionally by device driver, not hardware */
+#define SA_FLAGS_RCV_MASK        0xFFE6
+        } rcv[NUM_RBUFFS];
+};
+
+struct icom_adapter;
+
+
+#define ICOM_MAJOR       243
+#define ICOM_MINOR_START 0
+
+struct icom_port {
+        struct uart_port uart_port;
+        u8 imbed_modem;
+#define ICOM_UNKNOWN            1
+#define ICOM_RVX                2
+#define ICOM_IMBED_MODEM        3
+        unsigned char cable_id;
+        unsigned char read_status_mask;
+        unsigned char ignore_status_mask;
+        void __iomem * int_reg;
+        struct icom_regs __iomem *global_reg;
+        struct func_dram __iomem *dram;
+        int port;
+        struct statusArea *statStg;
+        dma_addr_t statStg_pci;
+        u32 *xmitRestart;
+        dma_addr_t xmitRestart_pci;
+        unsigned char *xmit_buf;
+        dma_addr_t xmit_buf_pci;
+        unsigned char *recv_buf;
+        dma_addr_t recv_buf_pci;
+        int next_rcv;
+        int put_length;
+        int status;
+#define ICOM_PORT_ACTIVE        1       /* Port exists. */
+#define ICOM_PORT_OFF           0       /* Port does not exist. */
+        int load_in_progress;
+        struct icom_adapter *adapter;
+};
+
+struct icom_adapter {
+        void __iomem * base_addr;
+        unsigned long base_addr_pci;
+        unsigned char irq_number;
+        struct pci_dev *pci_dev;
+        struct icom_port port_info[4];
+        int index;
+        int version;
+#define ADAPTER_V1      0x0001
+#define ADAPTER_V2      0x0002
+        u32 subsystem_id;
+#define FOUR_PORT_MODEL                         0x0252
+#define V2_TWO_PORTS_RVX                        0x021A
+#define V2_ONE_PORT_RVX_ONE_PORT_IMBED_MDM      0x0251
+        int numb_ports;
+        struct list_head icom_adapter_entry;
+        struct kobject kobj;
+};
+
+/* prototype */
+extern void iCom_sercons_init(void);
+
+struct lookup_proc_table {
+        u32     __iomem *global_control_reg;
+        unsigned long   processor_id;
+};
+
+struct lookup_int_table {
+        u32     __iomem *global_int_mask;
+        unsigned long   processor_id;
+};
+
+#define MSECS_TO_JIFFIES(ms) (((ms)*HZ+999)/1000)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
new file mode 100644
index 000000000000..d273134f9e6c
--- /dev/null
+++ b/drivers/serial/imx.c
@@ -0,0 +1,909 @@
+/*
+ *  linux/drivers/serial/imx.c
+ *
+ *  Driver for Motorola IMX serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Author: Sascha Hauer <sascha@saschahauer.de>
+ *  Copyright (C) 2004 Pengutronix
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * [29-Mar-2005] Mike Lee
+ * Added hardware handshake
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_IMX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/hardware.h>
+
+/* We've been assigned a range on the "Low-density serial ports" major */
+#define SERIAL_IMX_MAJOR        204
+#define MINOR_START             41
+
+#define NR_PORTS                2
+
+#define IMX_ISR_PASS_LIMIT      256
+
+/*
+ * This is the size of our serial port register set.
+ */
+#define UART_PORT_SIZE  0x100
+
+/*
+ * This determines how often we check the modem status signals
+ * for any change.  They generally aren't connected to an IRQ
+ * so we have to poll them.  We also check immediately before
+ * filling the TX fifo incase CTS has been dropped.
+ */
+#define MCTRL_TIMEOUT   (250*HZ/1000)
+
+#define DRIVER_NAME "IMX-uart"
+
+struct imx_port {
+        struct uart_port        port;
+        struct timer_list       timer;
+        unsigned int            old_status;
+        int txirq,rxirq;
+};
+
+/*
+ * Handle any change of modem status signal since we were last called.
+ */
+static void imx_mctrl_check(struct imx_port *sport)
+{
+        unsigned int status, changed;
+
+        status = sport->port.ops->get_mctrl(&sport->port);
+        changed = status ^ sport->old_status;
+
+        if (changed == 0)
+                return;
+
+        sport->old_status = status;
+
+        if (changed & TIOCM_RI)
+                sport->port.icount.rng++;
+        if (changed & TIOCM_DSR)
+                sport->port.icount.dsr++;
+        if (changed & TIOCM_CAR)
+                uart_handle_dcd_change(&sport->port, status & TIOCM_CAR);
+        if (changed & TIOCM_CTS)
+                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
+
+        wake_up_interruptible(&sport->port.info->delta_msr_wait);
+}
+
+/*
+ * This is our per-port timeout handler, for checking the
+ * modem status signals.
+ */
+static void imx_timeout(unsigned long data)
+{
+        struct imx_port *sport = (struct imx_port *)data;
+        unsigned long flags;
+
+        if (sport->port.info) {
+                spin_lock_irqsave(&sport->port.lock, flags);
+                imx_mctrl_check(sport);
+                spin_unlock_irqrestore(&sport->port.lock, flags);
+
+                mod_timer(&sport->timer, jiffies + MCTRL_TIMEOUT);
+        }
+}
+
+/*
+ * interrupts disabled on entry
+ */
+static void imx_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        UCR1((u32)sport->port.membase) &= ~UCR1_TXMPTYEN;
+}
+
+/*
+ * interrupts disabled on entry
+ */
+static void imx_stop_rx(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        UCR2((u32)sport->port.membase) &= ~UCR2_RXEN;
+}
+
+/*
+ * Set the modem control timer to fire immediately.
+ */
+static void imx_enable_ms(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        mod_timer(&sport->timer, jiffies);
+}
+
+static inline void imx_transmit_buffer(struct imx_port *sport)
+{
+        struct circ_buf *xmit = &sport->port.info->xmit;
+
+        do {
+                /* send xmit->buf[xmit->tail]
+                 * out the port here */
+                URTX0((u32)sport->port.membase) = xmit->buf[xmit->tail];
+                xmit->tail = (xmit->tail + 1) &
+                         (UART_XMIT_SIZE - 1);
+                sport->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (!(UTS((u32)sport->port.membase) & UTS_TXFULL));
+
+        if (uart_circ_empty(xmit))
+                imx_stop_tx(&sport->port, 0);
+}
+
+/*
+ * interrupts disabled on entry
+ */
+static void imx_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        UCR1((u32)sport->port.membase) |= UCR1_TXMPTYEN;
+
+        if(UTS((u32)sport->port.membase) & UTS_TXEMPTY)
+                imx_transmit_buffer(sport);
+}
+
+static irqreturn_t imx_txint(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct imx_port *sport = (struct imx_port *)dev_id;
+        struct circ_buf *xmit = &sport->port.info->xmit;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sport->port.lock,flags);
+        if (sport->port.x_char)
+        {
+                /* Send next char */
+                URTX0((u32)sport->port.membase) = sport->port.x_char;
+                goto out;
+        }
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) {
+                imx_stop_tx(&sport->port, 0);
+                goto out;
+        }
+
+        imx_transmit_buffer(sport);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&sport->port);
+
+out:
+        spin_unlock_irqrestore(&sport->port.lock,flags);
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t imx_rxint(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct imx_port *sport = dev_id;
+        unsigned int rx,flg,ignored = 0;
+        struct tty_struct *tty = sport->port.info->tty;
+        unsigned long flags;
+
+        rx = URXD0((u32)sport->port.membase);
+        spin_lock_irqsave(&sport->port.lock,flags);
+
+        do {
+                flg = TTY_NORMAL;
+                sport->port.icount.rx++;
+
+                if( USR2((u32)sport->port.membase) & USR2_BRCD ) {
+                        USR2((u32)sport->port.membase) |= USR2_BRCD;
+                        if(uart_handle_break(&sport->port))
+                                goto ignore_char;
+                }
+
+                if (uart_handle_sysrq_char
+                            (&sport->port, (unsigned char)rx, regs))
+                        goto ignore_char;
+
+                if( rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) )
+                        goto handle_error;
+
+        error_return:
+                tty_insert_flip_char(tty, rx, flg);
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        goto out;
+
+        ignore_char:
+                rx = URXD0((u32)sport->port.membase);
+        } while(rx & URXD_CHARRDY);
+
+out:
+        spin_unlock_irqrestore(&sport->port.lock,flags);
+        tty_flip_buffer_push(tty);
+        return IRQ_HANDLED;
+
+handle_error:
+        if (rx & URXD_PRERR)
+                sport->port.icount.parity++;
+        else if (rx & URXD_FRMERR)
+                sport->port.icount.frame++;
+        if (rx & URXD_OVRRUN)
+                sport->port.icount.overrun++;
+
+        if (rx & sport->port.ignore_status_mask) {
+                if (++ignored > 100)
+                        goto out;
+                goto ignore_char;
+        }
+
+        rx &= sport->port.read_status_mask;
+
+        if (rx & URXD_PRERR)
+                flg = TTY_PARITY;
+        else if (rx & URXD_FRMERR)
+                flg = TTY_FRAME;
+        if (rx & URXD_OVRRUN)
+                flg = TTY_OVERRUN;
+
+#ifdef SUPPORT_SYSRQ
+        sport->port.sysrq = 0;
+#endif
+        goto error_return;
+}
+
+/*
+ * Return TIOCSER_TEMT when transmitter is not busy.
+ */
+static unsigned int imx_tx_empty(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        return USR2((u32)sport->port.membase) & USR2_TXDC ?  TIOCSER_TEMT : 0;
+}
+
+static unsigned int imx_get_mctrl(struct uart_port *port)
+{
+        return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+}
+
+static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+/*
+ * Interrupts always disabled.
+ */
+static void imx_break_ctl(struct uart_port *port, int break_state)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sport->port.lock, flags);
+
+        if ( break_state != 0 )
+                UCR1((u32)sport->port.membase) |= UCR1_SNDBRK;
+        else
+                UCR1((u32)sport->port.membase) &= ~UCR1_SNDBRK;
+
+        spin_unlock_irqrestore(&sport->port.lock, flags);
+}
+
+#define TXTL 2 /* reset default */
+#define RXTL 1 /* reset default */
+
+static int imx_startup(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        int retval;
+        unsigned int val;
+        unsigned long flags;
+
+        /* set receiver / transmitter trigger level. We assume
+         * that RFDIV has been set by the arch setup or by the bootloader.
+         */
+        val = (UFCR((u32)sport->port.membase) & UFCR_RFDIV)  | TXTL<<10 | RXTL;
+        UFCR((u32)sport->port.membase) = val;
+
+        /* disable the DREN bit (Data Ready interrupt enable) before
+         * requesting IRQs
+         */
+        UCR4((u32)sport->port.membase) &= ~UCR4_DREN;
+
+        /*
+         * Allocate the IRQ
+         */
+        retval = request_irq(sport->rxirq, imx_rxint, 0,
+                             DRIVER_NAME, sport);
+        if (retval) goto error_out2;
+
+        retval = request_irq(sport->txirq, imx_txint, 0,
+                             "imx-uart", sport);
+        if (retval) goto error_out1;
+
+        /*
+         * Finally, clear and enable interrupts
+         */
+
+        UCR1((u32)sport->port.membase) |=
+                         (UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_UARTEN);
+
+        UCR2((u32)sport->port.membase) |= (UCR2_RXEN | UCR2_TXEN);
+        /*
+         * Enable modem status interrupts
+         */
+        spin_lock_irqsave(&sport->port.lock,flags);
+        imx_enable_ms(&sport->port);
+        spin_unlock_irqrestore(&sport->port.lock,flags);
+
+        return 0;
+
+error_out1:
+        free_irq(sport->rxirq, sport);
+error_out2:
+        free_irq(sport->txirq, sport);
+        return retval;
+}
+
+static void imx_shutdown(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        /*
+         * Stop our timer.
+         */
+        del_timer_sync(&sport->timer);
+
+        /*
+         * Free the interrupts
+         */
+        free_irq(sport->txirq, sport);
+        free_irq(sport->rxirq, sport);
+
+        /*
+         * Disable all interrupts, port and break condition.
+         */
+
+        UCR1((u32)sport->port.membase) &=
+                         ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_UARTEN);
+}
+
+static void
+imx_set_termios(struct uart_port *port, struct termios *termios,
+                   struct termios *old)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        unsigned long flags;
+        unsigned int ucr2, old_ucr1, old_txrxen, baud, quot;
+        unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;
+
+        /*
+         * If we don't support modem control lines, don't allow
+         * these to be set.
+         */
+        if (0) {
+                termios->c_cflag &= ~(HUPCL | CRTSCTS | CMSPAR);
+                termios->c_cflag |= CLOCAL;
+        }
+
+        /*
+         * We only support CS7 and CS8.
+         */
+        while ((termios->c_cflag & CSIZE) != CS7 &&
+               (termios->c_cflag & CSIZE) != CS8) {
+                termios->c_cflag &= ~CSIZE;
+                termios->c_cflag |= old_csize;
+                old_csize = CS8;
+        }
+
+        if ((termios->c_cflag & CSIZE) == CS8)
+                ucr2 = UCR2_WS | UCR2_SRST | UCR2_IRTS;
+        else
+                ucr2 = UCR2_SRST | UCR2_IRTS;
+
+        if (termios->c_cflag & CRTSCTS) {
+                ucr2 &= ~UCR2_IRTS;
+                ucr2 |= UCR2_CTSC;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                ucr2 |= UCR2_STPB;
+        if (termios->c_cflag & PARENB) {
+                ucr2 |= UCR2_PREN;
+                if (!(termios->c_cflag & PARODD))
+                        ucr2 |= UCR2_PROE;
+        }
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+
+        spin_lock_irqsave(&sport->port.lock, flags);
+
+        sport->port.read_status_mask = 0;
+        if (termios->c_iflag & INPCK)
+                sport->port.read_status_mask |= (URXD_FRMERR | URXD_PRERR);
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                sport->port.read_status_mask |= URXD_BRK;
+
+        /*
+         * Characters to ignore
+         */
+        sport->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                sport->port.ignore_status_mask |= URXD_PRERR;
+        if (termios->c_iflag & IGNBRK) {
+                sport->port.ignore_status_mask |= URXD_BRK;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        sport->port.ignore_status_mask |= URXD_OVRRUN;
+        }
+
+        del_timer_sync(&sport->timer);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        /*
+         * disable interrupts and drain transmitter
+         */
+        old_ucr1 = UCR1((u32)sport->port.membase);
+        UCR1((u32)sport->port.membase) &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN);
+
+        while ( !(USR2((u32)sport->port.membase) & USR2_TXDC))
+                barrier();
+
+        /* then, disable everything */
+        old_txrxen = UCR2((u32)sport->port.membase) & ( UCR2_TXEN | UCR2_RXEN );
+        UCR2((u32)sport->port.membase) &= ~( UCR2_TXEN | UCR2_RXEN);
+
+        /* set the parity, stop bits and data size */
+        UCR2((u32)sport->port.membase) = ucr2;
+
+        /* set the baud rate. We assume uartclk = 16 MHz
+         *
+         * baud * 16   UBIR - 1
+         * --------- = --------
+         *  uartclk    UBMR - 1
+         */
+        UBIR((u32)sport->port.membase) = (baud / 100) - 1;
+        UBMR((u32)sport->port.membase) = 10000 - 1;
+
+        UCR1((u32)sport->port.membase) = old_ucr1;
+        UCR2((u32)sport->port.membase) |= old_txrxen;
+
+        if (UART_ENABLE_MS(&sport->port, termios->c_cflag))
+                imx_enable_ms(&sport->port);
+
+        spin_unlock_irqrestore(&sport->port.lock, flags);
+}
+
+static const char *imx_type(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        return sport->port.type == PORT_IMX ? "IMX" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'.
+ */
+static void imx_release_port(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        release_mem_region(sport->port.mapbase, UART_PORT_SIZE);
+}
+
+/*
+ * Request the memory region(s) being used by 'port'.
+ */
+static int imx_request_port(struct uart_port *port)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        return request_mem_region(sport->port.mapbase, UART_PORT_SIZE,
+                        "imx-uart") != NULL ? 0 : -EBUSY;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void imx_config_port(struct uart_port *port, int flags)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+
+        if (flags & UART_CONFIG_TYPE &&
+            imx_request_port(&sport->port) == 0)
+                sport->port.type = PORT_IMX;
+}
+
+/*
+ * Verify the new serial_struct (for TIOCSSERIAL).
+ * The only change we allow are to the flags and type, and
+ * even then only between PORT_IMX and PORT_UNKNOWN
+ */
+static int
+imx_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        int ret = 0;
+
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_IMX)
+                ret = -EINVAL;
+        if (sport->port.irq != ser->irq)
+                ret = -EINVAL;
+        if (ser->io_type != UPIO_MEM)
+                ret = -EINVAL;
+        if (sport->port.uartclk / 16 != ser->baud_base)
+                ret = -EINVAL;
+        if ((void *)sport->port.mapbase != ser->iomem_base)
+                ret = -EINVAL;
+        if (sport->port.iobase != ser->port)
+                ret = -EINVAL;
+        if (ser->hub6 != 0)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops imx_pops = {
+        .tx_empty       = imx_tx_empty,
+        .set_mctrl      = imx_set_mctrl,
+        .get_mctrl      = imx_get_mctrl,
+        .stop_tx        = imx_stop_tx,
+        .start_tx       = imx_start_tx,
+        .stop_rx        = imx_stop_rx,
+        .enable_ms      = imx_enable_ms,
+        .break_ctl      = imx_break_ctl,
+        .startup        = imx_startup,
+        .shutdown       = imx_shutdown,
+        .set_termios    = imx_set_termios,
+        .type           = imx_type,
+        .release_port   = imx_release_port,
+        .request_port   = imx_request_port,
+        .config_port    = imx_config_port,
+        .verify_port    = imx_verify_port,
+};
+
+static struct imx_port imx_ports[] = {
+        {
+        .txirq  = UART1_MINT_TX,
+        .rxirq  = UART1_MINT_RX,
+        .port   = {
+                .type           = PORT_IMX,
+                .iotype         = SERIAL_IO_MEM,
+                .membase        = (void *)IMX_UART1_BASE,
+                .mapbase        = IMX_UART1_BASE, /* FIXME */
+                .irq            = UART1_MINT_RX,
+                .uartclk        = 16000000,
+                .fifosize       = 8,
+                .flags          = ASYNC_BOOT_AUTOCONF,
+                .ops            = &imx_pops,
+                .line           = 0,
+        },
+        }, {
+        .txirq  = UART2_MINT_TX,
+        .rxirq  = UART2_MINT_RX,
+        .port   = {
+                .type           = PORT_IMX,
+                .iotype         = SERIAL_IO_MEM,
+                .membase        = (void *)IMX_UART2_BASE,
+                .mapbase        = IMX_UART2_BASE, /* FIXME */
+                .irq            = UART2_MINT_RX,
+                .uartclk        = 16000000,
+                .fifosize       = 8,
+                .flags          = ASYNC_BOOT_AUTOCONF,
+                .ops            = &imx_pops,
+                .line           = 1,
+        },
+        }
+};
+
+/*
+ * Setup the IMX serial ports.
+ * Note also that we support "console=ttySMXx" where "x" is either 0 or 1.
+ * Which serial port this ends up being depends on the machine you're
+ * running this kernel on.  I'm not convinced that this is a good idea,
+ * but that's the way it traditionally works.
+ *
+ */
+static void __init imx_init_ports(void)
+{
+        static int first = 1;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        for (i = 0; i < ARRAY_SIZE(imx_ports); i++) {
+                init_timer(&imx_ports[i].timer);
+                imx_ports[i].timer.function = imx_timeout;
+                imx_ports[i].timer.data     = (unsigned long)&imx_ports[i];
+        }
+
+        imx_gpio_mode(PC9_PF_UART1_CTS);
+        imx_gpio_mode(PC10_PF_UART1_RTS);
+        imx_gpio_mode(PC11_PF_UART1_TXD);
+        imx_gpio_mode(PC12_PF_UART1_RXD);
+        imx_gpio_mode(PB28_PF_UART2_CTS);
+        imx_gpio_mode(PB29_PF_UART2_RTS);
+
+        imx_gpio_mode(PB30_PF_UART2_TXD);
+        imx_gpio_mode(PB31_PF_UART2_RXD);
+
+#if 0 /* We don't need these, on the mx1 the _modem_ side of the uart
+       * is implemented.
+       */
+        imx_gpio_mode(PD7_AF_UART2_DTR);
+        imx_gpio_mode(PD8_AF_UART2_DCD);
+        imx_gpio_mode(PD9_AF_UART2_RI);
+        imx_gpio_mode(PD10_AF_UART2_DSR);
+#endif
+
+
+}
+
+#ifdef CONFIG_SERIAL_IMX_CONSOLE
+
+/*
+ * Interrupts are disabled on entering
+ */
+static void
+imx_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct imx_port *sport = &imx_ports[co->index];
+        unsigned int old_ucr1, old_ucr2, i;
+
+        /*
+         *      First, save UCR1/2 and then disable interrupts
+         */
+        old_ucr1 = UCR1((u32)sport->port.membase);
+        old_ucr2 = UCR2((u32)sport->port.membase);
+
+        UCR1((u32)sport->port.membase) =
+                           (old_ucr1 | UCR1_UARTCLKEN | UCR1_UARTEN)
+                           & ~(UCR1_TXMPTYEN | UCR1_RRDYEN);
+        UCR2((u32)sport->port.membase) = old_ucr2 | UCR2_TXEN;
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++) {
+
+                while ((UTS((u32)sport->port.membase) & UTS_TXFULL))
+                        barrier();
+
+                URTX0((u32)sport->port.membase) = s[i];
+
+                if (s[i] == '\n') {
+                        while ((UTS((u32)sport->port.membase) & UTS_TXFULL))
+                                barrier();
+                        URTX0((u32)sport->port.membase) = '\r';
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore UCR1/2
+         */
+        while (!(USR2((u32)sport->port.membase) & USR2_TXDC));
+
+        UCR1((u32)sport->port.membase) = old_ucr1;
+        UCR2((u32)sport->port.membase) = old_ucr2;
+}
+
+/*
+ * If the port was already initialised (eg, by a boot loader),
+ * try to determine the current setup.
+ */
+static void __init
+imx_console_get_options(struct imx_port *sport, int *baud,
+                           int *parity, int *bits)
+{
+        if ( UCR1((u32)sport->port.membase) | UCR1_UARTEN ) {
+                /* ok, the port was enabled */
+                unsigned int ucr2, ubir,ubmr, uartclk;
+
+                ucr2 = UCR2((u32)sport->port.membase);
+
+                *parity = 'n';
+                if (ucr2 & UCR2_PREN) {
+                        if (ucr2 & UCR2_PROE)
+                                *parity = 'o';
+                        else
+                                *parity = 'e';
+                }
+
+                if (ucr2 & UCR2_WS)
+                        *bits = 8;
+                else
+                        *bits = 7;
+
+                ubir = UBIR((u32)sport->port.membase) & 0xffff;
+                ubmr = UBMR((u32)sport->port.membase) & 0xffff;
+                uartclk = sport->port.uartclk;
+
+                *baud = ((uartclk/16) * (ubir + 1)) / (ubmr + 1);
+        }
+}
+
+static int __init
+imx_console_setup(struct console *co, char *options)
+{
+        struct imx_port *sport;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index == -1 || co->index >= ARRAY_SIZE(imx_ports))
+                co->index = 0;
+        sport = &imx_ports[co->index];
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                imx_console_get_options(sport, &baud, &parity, &bits);
+
+        return uart_set_options(&sport->port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver imx_reg;
+static struct console imx_console = {
+        .name           = "ttySMX",
+        .write          = imx_console_write,
+        .device         = uart_console_device,
+        .setup          = imx_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &imx_reg,
+};
+
+static int __init imx_rs_console_init(void)
+{
+        imx_init_ports();
+        register_console(&imx_console);
+        return 0;
+}
+console_initcall(imx_rs_console_init);
+
+#define IMX_CONSOLE     &imx_console
+#else
+#define IMX_CONSOLE     NULL
+#endif
+
+static struct uart_driver imx_reg = {
+        .owner          = THIS_MODULE,
+        .driver_name    = DRIVER_NAME,
+        .dev_name       = "ttySMX",
+        .devfs_name     = "ttsmx/",
+        .major          = SERIAL_IMX_MAJOR,
+        .minor          = MINOR_START,
+        .nr             = ARRAY_SIZE(imx_ports),
+        .cons           = IMX_CONSOLE,
+};
+
+static int serial_imx_suspend(struct device *_dev, u32 state, u32 level)
+{
+        struct imx_port *sport = dev_get_drvdata(_dev);
+
+        if (sport && level == SUSPEND_DISABLE)
+                uart_suspend_port(&imx_reg, &sport->port);
+
+        return 0;
+}
+
+static int serial_imx_resume(struct device *_dev, u32 level)
+{
+        struct imx_port *sport = dev_get_drvdata(_dev);
+
+        if (sport && level == RESUME_ENABLE)
+                uart_resume_port(&imx_reg, &sport->port);
+
+        return 0;
+}
+
+static int serial_imx_probe(struct device *_dev)
+{
+        struct platform_device *dev = to_platform_device(_dev);
+
+        imx_ports[dev->id].port.dev = _dev;
+        uart_add_one_port(&imx_reg, &imx_ports[dev->id].port);
+        dev_set_drvdata(_dev, &imx_ports[dev->id]);
+        return 0;
+}
+
+static int serial_imx_remove(struct device *_dev)
+{
+        struct imx_port *sport = dev_get_drvdata(_dev);
+
+        dev_set_drvdata(_dev, NULL);
+
+        if (sport)
+                uart_remove_one_port(&imx_reg, &sport->port);
+
+        return 0;
+}
+
+static struct device_driver serial_imx_driver = {
+        .name           = "imx-uart",
+        .bus            = &platform_bus_type,
+        .probe          = serial_imx_probe,
+        .remove         = serial_imx_remove,
+
+        .suspend        = serial_imx_suspend,
+        .resume         = serial_imx_resume,
+};
+
+static int __init imx_serial_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Serial: IMX driver\n");
+
+        imx_init_ports();
+
+        ret = uart_register_driver(&imx_reg);
+        if (ret)
+                return ret;
+
+        ret = driver_register(&serial_imx_driver);
+        if (ret != 0)
+                uart_unregister_driver(&imx_reg);
+
+        return 0;
+}
+
+static void __exit imx_serial_exit(void)
+{
+        uart_unregister_driver(&imx_reg);
+}
+
+module_init(imx_serial_init);
+module_exit(imx_serial_exit);
+
+MODULE_AUTHOR("Sascha Hauer");
+MODULE_DESCRIPTION("IMX generic serial port driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
new file mode 100644
index 000000000000..d054f1265701
--- /dev/null
+++ b/drivers/serial/ioc4_serial.c
@@ -0,0 +1,2909 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ */
+
+
+/*
+ * This file contains a module version of the ioc4 serial driver. This
+ * includes all the support functions needed (support functions, etc.)
+ * and the serial driver itself.
+ */
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serialP.h>
+#include <linux/circ_buf.h>
+#include <linux/serial_reg.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/ioc4_common.h>
+#include <linux/serial_core.h>
+
+/*
+ * interesting things about the ioc4
+ */
+
+#define IOC4_NUM_SERIAL_PORTS   4       /* max ports per card */
+#define IOC4_NUM_CARDS          8       /* max cards per partition */
+
+#define GET_SIO_IR(_n)  (_n == 0) ? (IOC4_SIO_IR_S0) : \
+                                (_n == 1) ? (IOC4_SIO_IR_S1) : \
+                                (_n == 2) ? (IOC4_SIO_IR_S2) : \
+                                (IOC4_SIO_IR_S3)
+
+#define GET_OTHER_IR(_n)  (_n == 0) ? (IOC4_OTHER_IR_S0_MEMERR) : \
+                                (_n == 1) ? (IOC4_OTHER_IR_S1_MEMERR) : \
+                                (_n == 2) ? (IOC4_OTHER_IR_S2_MEMERR) : \
+                                (IOC4_OTHER_IR_S3_MEMERR)
+
+
+/*
+ * All IOC4 registers are 32 bits wide.
+ */
+
+/*
+ * PCI Memory Space Map
+ */
+#define IOC4_PCI_ERR_ADDR_L     0x000   /* Low Error Address */
+#define IOC4_PCI_ERR_ADDR_VLD           (0x1 << 0)
+#define IOC4_PCI_ERR_ADDR_MST_ID_MSK    (0xf << 1)
+#define IOC4_PCI_ERR_ADDR_MST_NUM_MSK   (0xe << 1)
+#define IOC4_PCI_ERR_ADDR_MST_TYP_MSK   (0x1 << 1)
+#define IOC4_PCI_ERR_ADDR_MUL_ERR       (0x1 << 5)
+#define IOC4_PCI_ERR_ADDR_ADDR_MSK      (0x3ffffff << 6)
+
+/* Interrupt types */
+#define IOC4_SIO_INTR_TYPE      0
+#define IOC4_OTHER_INTR_TYPE    1
+#define IOC4_NUM_INTR_TYPES     2
+
+/* Bitmasks for IOC4_SIO_IR, IOC4_SIO_IEC, and IOC4_SIO_IES  */
+#define IOC4_SIO_IR_S0_TX_MT       0x00000001   /* Serial port 0 TX empty */
+#define IOC4_SIO_IR_S0_RX_FULL     0x00000002   /* Port 0 RX buf full */
+#define IOC4_SIO_IR_S0_RX_HIGH     0x00000004   /* Port 0 RX hiwat */
+#define IOC4_SIO_IR_S0_RX_TIMER    0x00000008   /* Port 0 RX timeout */
+#define IOC4_SIO_IR_S0_DELTA_DCD   0x00000010   /* Port 0 delta DCD */
+#define IOC4_SIO_IR_S0_DELTA_CTS   0x00000020   /* Port 0 delta CTS */
+#define IOC4_SIO_IR_S0_INT         0x00000040   /* Port 0 pass-thru intr */
+#define IOC4_SIO_IR_S0_TX_EXPLICIT 0x00000080   /* Port 0 explicit TX thru */
+#define IOC4_SIO_IR_S1_TX_MT       0x00000100   /* Serial port 1 */
+#define IOC4_SIO_IR_S1_RX_FULL     0x00000200   /* */
+#define IOC4_SIO_IR_S1_RX_HIGH     0x00000400   /* */
+#define IOC4_SIO_IR_S1_RX_TIMER    0x00000800   /* */
+#define IOC4_SIO_IR_S1_DELTA_DCD   0x00001000   /* */
+#define IOC4_SIO_IR_S1_DELTA_CTS   0x00002000   /* */
+#define IOC4_SIO_IR_S1_INT         0x00004000   /* */
+#define IOC4_SIO_IR_S1_TX_EXPLICIT 0x00008000   /* */
+#define IOC4_SIO_IR_S2_TX_MT       0x00010000   /* Serial port 2 */
+#define IOC4_SIO_IR_S2_RX_FULL     0x00020000   /* */
+#define IOC4_SIO_IR_S2_RX_HIGH     0x00040000   /* */
+#define IOC4_SIO_IR_S2_RX_TIMER    0x00080000   /* */
+#define IOC4_SIO_IR_S2_DELTA_DCD   0x00100000   /* */
+#define IOC4_SIO_IR_S2_DELTA_CTS   0x00200000   /* */
+#define IOC4_SIO_IR_S2_INT         0x00400000   /* */
+#define IOC4_SIO_IR_S2_TX_EXPLICIT 0x00800000   /* */
+#define IOC4_SIO_IR_S3_TX_MT       0x01000000   /* Serial port 3 */
+#define IOC4_SIO_IR_S3_RX_FULL     0x02000000   /* */
+#define IOC4_SIO_IR_S3_RX_HIGH     0x04000000   /* */
+#define IOC4_SIO_IR_S3_RX_TIMER    0x08000000   /* */
+#define IOC4_SIO_IR_S3_DELTA_DCD   0x10000000   /* */
+#define IOC4_SIO_IR_S3_DELTA_CTS   0x20000000   /* */
+#define IOC4_SIO_IR_S3_INT         0x40000000   /* */
+#define IOC4_SIO_IR_S3_TX_EXPLICIT 0x80000000   /* */
+
+/* Per device interrupt masks */
+#define IOC4_SIO_IR_S0          (IOC4_SIO_IR_S0_TX_MT | \
+                                 IOC4_SIO_IR_S0_RX_FULL | \
+                                 IOC4_SIO_IR_S0_RX_HIGH | \
+                                 IOC4_SIO_IR_S0_RX_TIMER | \
+                                 IOC4_SIO_IR_S0_DELTA_DCD | \
+                                 IOC4_SIO_IR_S0_DELTA_CTS | \
+                                 IOC4_SIO_IR_S0_INT | \
+                                 IOC4_SIO_IR_S0_TX_EXPLICIT)
+#define IOC4_SIO_IR_S1          (IOC4_SIO_IR_S1_TX_MT | \
+                                 IOC4_SIO_IR_S1_RX_FULL | \
+                                 IOC4_SIO_IR_S1_RX_HIGH | \
+                                 IOC4_SIO_IR_S1_RX_TIMER | \
+                                 IOC4_SIO_IR_S1_DELTA_DCD | \
+                                 IOC4_SIO_IR_S1_DELTA_CTS | \
+                                 IOC4_SIO_IR_S1_INT | \
+                                 IOC4_SIO_IR_S1_TX_EXPLICIT)
+#define IOC4_SIO_IR_S2          (IOC4_SIO_IR_S2_TX_MT | \
+                                 IOC4_SIO_IR_S2_RX_FULL | \
+                                 IOC4_SIO_IR_S2_RX_HIGH | \
+                                 IOC4_SIO_IR_S2_RX_TIMER | \
+                                 IOC4_SIO_IR_S2_DELTA_DCD | \
+                                 IOC4_SIO_IR_S2_DELTA_CTS | \
+                                 IOC4_SIO_IR_S2_INT | \
+                                 IOC4_SIO_IR_S2_TX_EXPLICIT)
+#define IOC4_SIO_IR_S3          (IOC4_SIO_IR_S3_TX_MT | \
+                                 IOC4_SIO_IR_S3_RX_FULL | \
+                                 IOC4_SIO_IR_S3_RX_HIGH | \
+                                 IOC4_SIO_IR_S3_RX_TIMER | \
+                                 IOC4_SIO_IR_S3_DELTA_DCD | \
+                                 IOC4_SIO_IR_S3_DELTA_CTS | \
+                                 IOC4_SIO_IR_S3_INT | \
+                                 IOC4_SIO_IR_S3_TX_EXPLICIT)
+
+/* Bitmasks for IOC4_OTHER_IR, IOC4_OTHER_IEC, and IOC4_OTHER_IES  */
+#define IOC4_OTHER_IR_ATA_INT           0x00000001  /* ATAPI intr pass-thru */
+#define IOC4_OTHER_IR_ATA_MEMERR        0x00000002  /* ATAPI DMA PCI error */
+#define IOC4_OTHER_IR_S0_MEMERR         0x00000004  /* Port 0 PCI error */
+#define IOC4_OTHER_IR_S1_MEMERR         0x00000008  /* Port 1 PCI error */
+#define IOC4_OTHER_IR_S2_MEMERR         0x00000010  /* Port 2 PCI error */
+#define IOC4_OTHER_IR_S3_MEMERR         0x00000020  /* Port 3 PCI error */
+
+/* Bitmasks for IOC4_SIO_CR */
+#define IOC4_SIO_CR_CMD_PULSE_SHIFT              0  /* byte bus strobe shift */
+#define IOC4_SIO_CR_ARB_DIAG_TX0        0x00000000
+#define IOC4_SIO_CR_ARB_DIAG_RX0        0x00000010
+#define IOC4_SIO_CR_ARB_DIAG_TX1        0x00000020
+#define IOC4_SIO_CR_ARB_DIAG_RX1        0x00000030
+#define IOC4_SIO_CR_ARB_DIAG_TX2        0x00000040
+#define IOC4_SIO_CR_ARB_DIAG_RX2        0x00000050
+#define IOC4_SIO_CR_ARB_DIAG_TX3        0x00000060
+#define IOC4_SIO_CR_ARB_DIAG_RX3        0x00000070
+#define IOC4_SIO_CR_SIO_DIAG_IDLE       0x00000080  /* 0 -> active request among
+                                                           serial ports (ro) */
+/* Defs for some of the generic I/O pins */
+#define IOC4_GPCR_UART0_MODESEL    0x10 /* Pin is output to port 0
+                                                   mode sel */
+#define IOC4_GPCR_UART1_MODESEL    0x20 /* Pin is output to port 1
+                                                   mode sel */
+#define IOC4_GPCR_UART2_MODESEL    0x40 /* Pin is output to port 2
+                                                   mode sel */
+#define IOC4_GPCR_UART3_MODESEL    0x80 /* Pin is output to port 3
+                                                   mode sel */
+
+#define IOC4_GPPR_UART0_MODESEL_PIN   4 /* GIO pin controlling
+                                           uart 0 mode select */
+#define IOC4_GPPR_UART1_MODESEL_PIN   5 /* GIO pin controlling
+                                           uart 1 mode select */
+#define IOC4_GPPR_UART2_MODESEL_PIN   6 /* GIO pin controlling
+                                           uart 2 mode select */
+#define IOC4_GPPR_UART3_MODESEL_PIN   7 /* GIO pin controlling
+                                           uart 3 mode select */
+
+/* Bitmasks for serial RX status byte */
+#define IOC4_RXSB_OVERRUN       0x01    /* Char(s) lost */
+#define IOC4_RXSB_PAR_ERR       0x02    /* Parity error */
+#define IOC4_RXSB_FRAME_ERR     0x04    /* Framing error */
+#define IOC4_RXSB_BREAK         0x08    /* Break character */
+#define IOC4_RXSB_CTS           0x10    /* State of CTS */
+#define IOC4_RXSB_DCD           0x20    /* State of DCD */
+#define IOC4_RXSB_MODEM_VALID   0x40    /* DCD, CTS, and OVERRUN are valid */
+#define IOC4_RXSB_DATA_VALID    0x80    /* Data byte, FRAME_ERR PAR_ERR
+                                         * & BREAK valid */
+
+/* Bitmasks for serial TX control byte */
+#define IOC4_TXCB_INT_WHEN_DONE 0x20    /* Interrupt after this byte is sent */
+#define IOC4_TXCB_INVALID       0x00    /* Byte is invalid */
+#define IOC4_TXCB_VALID         0x40    /* Byte is valid */
+#define IOC4_TXCB_MCR           0x80    /* Data<7:0> to modem control reg */
+#define IOC4_TXCB_DELAY         0xc0    /* Delay data<7:0> mSec */
+
+/* Bitmasks for IOC4_SBBR_L */
+#define IOC4_SBBR_L_SIZE        0x00000001  /* 0 == 1KB rings, 1 == 4KB rings */
+
+/* Bitmasks for IOC4_SSCR_<3:0> */
+#define IOC4_SSCR_RX_THRESHOLD  0x000001ff  /* Hiwater mark */
+#define IOC4_SSCR_TX_TIMER_BUSY 0x00010000  /* TX timer in progress */
+#define IOC4_SSCR_HFC_EN        0x00020000  /* Hardware flow control enabled */
+#define IOC4_SSCR_RX_RING_DCD   0x00040000  /* Post RX record on delta-DCD */
+#define IOC4_SSCR_RX_RING_CTS   0x00080000  /* Post RX record on delta-CTS */
+#define IOC4_SSCR_DIAG          0x00200000  /* Bypass clock divider for sim */
+#define IOC4_SSCR_RX_DRAIN      0x08000000  /* Drain RX buffer to memory */
+#define IOC4_SSCR_DMA_EN        0x10000000  /* Enable ring buffer DMA */
+#define IOC4_SSCR_DMA_PAUSE     0x20000000  /* Pause DMA */
+#define IOC4_SSCR_PAUSE_STATE   0x40000000  /* Sets when PAUSE takes effect */
+#define IOC4_SSCR_RESET         0x80000000  /* Reset DMA channels */
+
+/* All producer/comsumer pointers are the same bitfield */
+#define IOC4_PROD_CONS_PTR_4K   0x00000ff8      /* For 4K buffers */
+#define IOC4_PROD_CONS_PTR_1K   0x000003f8      /* For 1K buffers */
+#define IOC4_PROD_CONS_PTR_OFF           3
+
+/* Bitmasks for IOC4_SRCIR_<3:0> */
+#define IOC4_SRCIR_ARM          0x80000000      /* Arm RX timer */
+
+/* Bitmasks for IOC4_SHADOW_<3:0> */
+#define IOC4_SHADOW_DR   0x00000001     /* Data ready */
+#define IOC4_SHADOW_OE   0x00000002     /* Overrun error */
+#define IOC4_SHADOW_PE   0x00000004     /* Parity error */
+#define IOC4_SHADOW_FE   0x00000008     /* Framing error */
+#define IOC4_SHADOW_BI   0x00000010     /* Break interrupt */
+#define IOC4_SHADOW_THRE 0x00000020     /* Xmit holding register empty */
+#define IOC4_SHADOW_TEMT 0x00000040     /* Xmit shift register empty */
+#define IOC4_SHADOW_RFCE 0x00000080     /* Char in RX fifo has an error */
+#define IOC4_SHADOW_DCTS 0x00010000     /* Delta clear to send */
+#define IOC4_SHADOW_DDCD 0x00080000     /* Delta data carrier detect */
+#define IOC4_SHADOW_CTS  0x00100000     /* Clear to send */
+#define IOC4_SHADOW_DCD  0x00800000     /* Data carrier detect */
+#define IOC4_SHADOW_DTR  0x01000000     /* Data terminal ready */
+#define IOC4_SHADOW_RTS  0x02000000     /* Request to send */
+#define IOC4_SHADOW_OUT1 0x04000000     /* 16550 OUT1 bit */
+#define IOC4_SHADOW_OUT2 0x08000000     /* 16550 OUT2 bit */
+#define IOC4_SHADOW_LOOP 0x10000000     /* Loopback enabled */
+
+/* Bitmasks for IOC4_SRTR_<3:0> */
+#define IOC4_SRTR_CNT           0x00000fff      /* Reload value for RX timer */
+#define IOC4_SRTR_CNT_VAL       0x0fff0000      /* Current value of RX timer */
+#define IOC4_SRTR_CNT_VAL_SHIFT         16
+#define IOC4_SRTR_HZ                 16000      /* SRTR clock frequency */
+
+/* Serial port register map used for DMA and PIO serial I/O */
+struct ioc4_serialregs {
+        uint32_t sscr;
+        uint32_t stpir;
+        uint32_t stcir;
+        uint32_t srpir;
+        uint32_t srcir;
+        uint32_t srtr;
+        uint32_t shadow;
+};
+
+/* IOC4 UART register map */
+struct ioc4_uartregs {
+        char i4u_lcr;
+        union {
+                char iir;       /* read only */
+                char fcr;       /* write only */
+        } u3;
+        union {
+                char ier;       /* DLAB == 0 */
+                char dlm;       /* DLAB == 1 */
+        } u2;
+        union {
+                char rbr;       /* read only, DLAB == 0 */
+                char thr;       /* write only, DLAB == 0 */
+                char dll;       /* DLAB == 1 */
+        } u1;
+        char i4u_scr;
+        char i4u_msr;
+        char i4u_lsr;
+        char i4u_mcr;
+};
+
+/* short names */
+#define i4u_dll u1.dll
+#define i4u_ier u2.ier
+#define i4u_dlm u2.dlm
+#define i4u_fcr u3.fcr
+
+/* PCI memory space register map addressed using pci_bar0 */
+struct ioc4_memregs {
+        struct ioc4_mem {
+                /* Miscellaneous IOC4  registers */
+                uint32_t pci_err_addr_l;
+                uint32_t pci_err_addr_h;
+                uint32_t sio_ir;
+                uint32_t other_ir;
+
+                /* These registers are read-only for general kernel code.  */
+                uint32_t sio_ies_ro;
+                uint32_t other_ies_ro;
+                uint32_t sio_iec_ro;
+                uint32_t other_iec_ro;
+                uint32_t sio_cr;
+                uint32_t misc_fill1;
+                uint32_t int_out;
+                uint32_t misc_fill2;
+                uint32_t gpcr_s;
+                uint32_t gpcr_c;
+                uint32_t gpdr;
+                uint32_t misc_fill3;
+                uint32_t gppr_0;
+                uint32_t gppr_1;
+                uint32_t gppr_2;
+                uint32_t gppr_3;
+                uint32_t gppr_4;
+                uint32_t gppr_5;
+                uint32_t gppr_6;
+                uint32_t gppr_7;
+        } ioc4_mem;
+
+        char misc_fill4[0x100 - 0x5C - 4];
+
+        /* ATA/ATAP registers */
+        uint32_t ata_notused[9];
+        char ata_fill1[0x140 - 0x120 - 4];
+        uint32_t ata_notused1[8];
+        char ata_fill2[0x200 - 0x15C - 4];
+
+        /* Keyboard and mouse registers */
+        uint32_t km_notused[5];;
+        char km_fill1[0x300 - 0x210 - 4];
+
+        /* Serial port registers used for DMA serial I/O */
+        struct ioc4_serial {
+                uint32_t sbbr01_l;
+                uint32_t sbbr01_h;
+                uint32_t sbbr23_l;
+                uint32_t sbbr23_h;
+
+                struct ioc4_serialregs port_0;
+                struct ioc4_serialregs port_1;
+                struct ioc4_serialregs port_2;
+                struct ioc4_serialregs port_3;
+                struct ioc4_uartregs uart_0;
+                struct ioc4_uartregs uart_1;
+                struct ioc4_uartregs uart_2;
+                struct ioc4_uartregs uart_3;
+        } ioc4_serial;
+};
+
+/* UART clock speed */
+#define IOC4_SER_XIN_CLK        IOC4_SER_XIN_CLK_66
+#define IOC4_SER_XIN_CLK_66     66666667
+#define IOC4_SER_XIN_CLK_33     33333333
+
+#define IOC4_W_IES              0
+#define IOC4_W_IEC              1
+
+typedef void ioc4_intr_func_f(void *, uint32_t);
+typedef ioc4_intr_func_f *ioc4_intr_func_t;
+
+/* defining this will get you LOTS of great debug info */
+//#define DEBUG_INTERRUPTS
+#define DPRINT_CONFIG(_x...)    ;
+//#define DPRINT_CONFIG(_x...)  printk _x
+
+/* number of characters left in xmit buffer before we ask for more */
+#define WAKEUP_CHARS    256
+
+/* number of characters we want to transmit to the lower level at a time */
+#define IOC4_MAX_CHARS  128
+
+/* Device name we're using */
+#define DEVICE_NAME     "ttyIOC"
+#define DEVICE_MAJOR 204
+#define DEVICE_MINOR 50
+
+/* register offsets */
+#define IOC4_SERIAL_OFFSET      0x300
+
+/* flags for next_char_state */
+#define NCS_BREAK       0x1
+#define NCS_PARITY      0x2
+#define NCS_FRAMING     0x4
+#define NCS_OVERRUN     0x8
+
+/* cause we need SOME parameters ... */
+#define MIN_BAUD_SUPPORTED      1200
+#define MAX_BAUD_SUPPORTED      115200
+
+/* protocol types supported */
+enum sio_proto {
+        PROTO_RS232,
+        PROTO_RS422
+};
+
+/* Notification types */
+#define N_DATA_READY    0x01
+#define N_OUTPUT_LOWAT  0x02
+#define N_BREAK         0x04
+#define N_PARITY_ERROR  0x08
+#define N_FRAMING_ERROR 0x10
+#define N_OVERRUN_ERROR 0x20
+#define N_DDCD          0x40
+#define N_DCTS          0x80
+
+#define N_ALL_INPUT     (N_DATA_READY | N_BREAK |                       \
+                         N_PARITY_ERROR | N_FRAMING_ERROR |             \
+                         N_OVERRUN_ERROR | N_DDCD | N_DCTS)
+
+#define N_ALL_OUTPUT    N_OUTPUT_LOWAT
+
+#define N_ALL_ERRORS    (N_PARITY_ERROR | N_FRAMING_ERROR | N_OVERRUN_ERROR)
+
+#define N_ALL           (N_DATA_READY | N_OUTPUT_LOWAT | N_BREAK |      \
+                         N_PARITY_ERROR | N_FRAMING_ERROR |             \
+                         N_OVERRUN_ERROR | N_DDCD | N_DCTS)
+
+#define SER_DIVISOR(_x, clk)            (((clk) + (_x) * 8) / ((_x) * 16))
+#define DIVISOR_TO_BAUD(div, clk)       ((clk) / 16 / (div))
+
+/* Some masks */
+#define LCR_MASK_BITS_CHAR      (UART_LCR_WLEN5 | UART_LCR_WLEN6 \
+                                        | UART_LCR_WLEN7 | UART_LCR_WLEN8)
+#define LCR_MASK_STOP_BITS      (UART_LCR_STOP)
+
+#define PENDING(_p)     (readl(&(_p)->ip_mem->sio_ir) & _p->ip_ienb)
+#define READ_SIO_IR(_p) readl(&(_p)->ip_mem->sio_ir)
+
+/* Default to 4k buffers */
+#ifdef IOC4_1K_BUFFERS
+#define RING_BUF_SIZE 1024
+#define IOC4_BUF_SIZE_BIT 0
+#define PROD_CONS_MASK IOC4_PROD_CONS_PTR_1K
+#else
+#define RING_BUF_SIZE 4096
+#define IOC4_BUF_SIZE_BIT IOC4_SBBR_L_SIZE
+#define PROD_CONS_MASK IOC4_PROD_CONS_PTR_4K
+#endif
+
+#define TOTAL_RING_BUF_SIZE (RING_BUF_SIZE * 4)
+
+/*
+ * This is the entry saved by the driver - one per card
+ */
+struct ioc4_control {
+        int ic_irq;
+        struct {
+                /* uart ports are allocated here */
+                struct uart_port icp_uart_port;
+                /* Handy reference material */
+                struct ioc4_port *icp_port;
+        } ic_port[IOC4_NUM_SERIAL_PORTS];
+        struct ioc4_soft *ic_soft;
+};
+
+/*
+ * per-IOC4 data structure
+ */
+#define MAX_IOC4_INTR_ENTS      (8 * sizeof(uint32_t))
+struct ioc4_soft {
+        struct ioc4_mem __iomem *is_ioc4_mem_addr;
+        struct ioc4_serial __iomem *is_ioc4_serial_addr;
+
+        /* Each interrupt type has an entry in the array */
+        struct ioc4_intr_type {
+
+                /*
+                 * Each in-use entry in this array contains at least
+                 * one nonzero bit in sd_bits; no two entries in this
+                 * array have overlapping sd_bits values.
+                 */
+                struct ioc4_intr_info {
+                        uint32_t sd_bits;
+                        ioc4_intr_func_f *sd_intr;
+                        void *sd_info;
+                } is_intr_info[MAX_IOC4_INTR_ENTS];
+
+                /* Number of entries active in the above array */
+                atomic_t is_num_intrs;
+        } is_intr_type[IOC4_NUM_INTR_TYPES];
+
+        /* is_ir_lock must be held while
+         * modifying sio_ie values, so
+         * we can be sure that sio_ie is
+         * not changing when we read it
+         * along with sio_ir.
+         */
+        spinlock_t is_ir_lock;  /* SIO_IE[SC] mod lock */
+};
+
+/* Local port info for each IOC4 serial ports */
+struct ioc4_port {
+        struct uart_port *ip_port;
+        /* Back ptrs for this port */
+        struct ioc4_control *ip_control;
+        struct pci_dev *ip_pdev;
+        struct ioc4_soft *ip_ioc4_soft;
+
+        /* pci mem addresses */
+        struct ioc4_mem __iomem *ip_mem;
+        struct ioc4_serial __iomem *ip_serial;
+        struct ioc4_serialregs __iomem *ip_serial_regs;
+        struct ioc4_uartregs __iomem *ip_uart_regs;
+
+        /* Ring buffer page for this port */
+        dma_addr_t ip_dma_ringbuf;
+        /* vaddr of ring buffer */
+        struct ring_buffer *ip_cpu_ringbuf;
+
+        /* Rings for this port */
+        struct ring *ip_inring;
+        struct ring *ip_outring;
+
+        /* Hook to port specific values */
+        struct hooks *ip_hooks;
+
+        spinlock_t ip_lock;
+
+        /* Various rx/tx parameters */
+        int ip_baud;
+        int ip_tx_lowat;
+        int ip_rx_timeout;
+
+        /* Copy of notification bits */
+        int ip_notify;
+
+        /* Shadow copies of various registers so we don't need to PIO
+         * read them constantly
+         */
+        uint32_t ip_ienb;       /* Enabled interrupts */
+        uint32_t ip_sscr;
+        uint32_t ip_tx_prod;
+        uint32_t ip_rx_cons;
+        int ip_pci_bus_speed;
+        unsigned char ip_flags;
+};
+
+/* tx low water mark.  We need to notify the driver whenever tx is getting
+ * close to empty so it can refill the tx buffer and keep things going.
+ * Let's assume that if we interrupt 1 ms before the tx goes idle, we'll
+ * have no trouble getting in more chars in time (I certainly hope so).
+ */
+#define TX_LOWAT_LATENCY      1000
+#define TX_LOWAT_HZ          (1000000 / TX_LOWAT_LATENCY)
+#define TX_LOWAT_CHARS(baud) (baud / 10 / TX_LOWAT_HZ)
+
+/* Flags per port */
+#define INPUT_HIGH      0x01
+#define DCD_ON          0x02
+#define LOWAT_WRITTEN   0x04
+#define READ_ABORTED    0x08
+
+/* Since each port has different register offsets and bitmasks
+ * for everything, we'll store those that we need in tables so we
+ * don't have to be constantly checking the port we are dealing with.
+ */
+struct hooks {
+        uint32_t intr_delta_dcd;
+        uint32_t intr_delta_cts;
+        uint32_t intr_tx_mt;
+        uint32_t intr_rx_timer;
+        uint32_t intr_rx_high;
+        uint32_t intr_tx_explicit;
+        uint32_t intr_dma_error;
+        uint32_t intr_clear;
+        uint32_t intr_all;
+        char rs422_select_pin;
+};
+
+static struct hooks hooks_array[IOC4_NUM_SERIAL_PORTS] = {
+        /* Values for port 0 */
+        {
+         IOC4_SIO_IR_S0_DELTA_DCD, IOC4_SIO_IR_S0_DELTA_CTS,
+         IOC4_SIO_IR_S0_TX_MT, IOC4_SIO_IR_S0_RX_TIMER,
+         IOC4_SIO_IR_S0_RX_HIGH, IOC4_SIO_IR_S0_TX_EXPLICIT,
+         IOC4_OTHER_IR_S0_MEMERR,
+         (IOC4_SIO_IR_S0_TX_MT | IOC4_SIO_IR_S0_RX_FULL |
+          IOC4_SIO_IR_S0_RX_HIGH | IOC4_SIO_IR_S0_RX_TIMER |
+          IOC4_SIO_IR_S0_DELTA_DCD | IOC4_SIO_IR_S0_DELTA_CTS |
+          IOC4_SIO_IR_S0_INT | IOC4_SIO_IR_S0_TX_EXPLICIT),
+         IOC4_SIO_IR_S0, IOC4_GPPR_UART0_MODESEL_PIN,
+         },
+
+        /* Values for port 1 */
+        {
+         IOC4_SIO_IR_S1_DELTA_DCD, IOC4_SIO_IR_S1_DELTA_CTS,
+         IOC4_SIO_IR_S1_TX_MT, IOC4_SIO_IR_S1_RX_TIMER,
+         IOC4_SIO_IR_S1_RX_HIGH, IOC4_SIO_IR_S1_TX_EXPLICIT,
+         IOC4_OTHER_IR_S1_MEMERR,
+         (IOC4_SIO_IR_S1_TX_MT | IOC4_SIO_IR_S1_RX_FULL |
+          IOC4_SIO_IR_S1_RX_HIGH | IOC4_SIO_IR_S1_RX_TIMER |
+          IOC4_SIO_IR_S1_DELTA_DCD | IOC4_SIO_IR_S1_DELTA_CTS |
+          IOC4_SIO_IR_S1_INT | IOC4_SIO_IR_S1_TX_EXPLICIT),
+         IOC4_SIO_IR_S1, IOC4_GPPR_UART1_MODESEL_PIN,
+         },
+
+        /* Values for port 2 */
+        {
+         IOC4_SIO_IR_S2_DELTA_DCD, IOC4_SIO_IR_S2_DELTA_CTS,
+         IOC4_SIO_IR_S2_TX_MT, IOC4_SIO_IR_S2_RX_TIMER,
+         IOC4_SIO_IR_S2_RX_HIGH, IOC4_SIO_IR_S2_TX_EXPLICIT,
+         IOC4_OTHER_IR_S2_MEMERR,
+         (IOC4_SIO_IR_S2_TX_MT | IOC4_SIO_IR_S2_RX_FULL |
+          IOC4_SIO_IR_S2_RX_HIGH | IOC4_SIO_IR_S2_RX_TIMER |
+          IOC4_SIO_IR_S2_DELTA_DCD | IOC4_SIO_IR_S2_DELTA_CTS |
+          IOC4_SIO_IR_S2_INT | IOC4_SIO_IR_S2_TX_EXPLICIT),
+         IOC4_SIO_IR_S2, IOC4_GPPR_UART2_MODESEL_PIN,
+         },
+
+        /* Values for port 3 */
+        {
+         IOC4_SIO_IR_S3_DELTA_DCD, IOC4_SIO_IR_S3_DELTA_CTS,
+         IOC4_SIO_IR_S3_TX_MT, IOC4_SIO_IR_S3_RX_TIMER,
+         IOC4_SIO_IR_S3_RX_HIGH, IOC4_SIO_IR_S3_TX_EXPLICIT,
+         IOC4_OTHER_IR_S3_MEMERR,
+         (IOC4_SIO_IR_S3_TX_MT | IOC4_SIO_IR_S3_RX_FULL |
+          IOC4_SIO_IR_S3_RX_HIGH | IOC4_SIO_IR_S3_RX_TIMER |
+          IOC4_SIO_IR_S3_DELTA_DCD | IOC4_SIO_IR_S3_DELTA_CTS |
+          IOC4_SIO_IR_S3_INT | IOC4_SIO_IR_S3_TX_EXPLICIT),
+         IOC4_SIO_IR_S3, IOC4_GPPR_UART3_MODESEL_PIN,
+         }
+};
+
+/* A ring buffer entry */
+struct ring_entry {
+        union {
+                struct {
+                        uint32_t alldata;
+                        uint32_t allsc;
+                } all;
+                struct {
+                        char data[4];   /* data bytes */
+                        char sc[4];     /* status/control */
+                } s;
+        } u;
+};
+
+/* Test the valid bits in any of the 4 sc chars using "allsc" member */
+#define RING_ANY_VALID \
+        ((uint32_t)(IOC4_RXSB_MODEM_VALID | IOC4_RXSB_DATA_VALID) * 0x01010101)
+
+#define ring_sc     u.s.sc
+#define ring_data   u.s.data
+#define ring_allsc  u.all.allsc
+
+/* Number of entries per ring buffer. */
+#define ENTRIES_PER_RING (RING_BUF_SIZE / (int) sizeof(struct ring_entry))
+
+/* An individual ring */
+struct ring {
+        struct ring_entry entries[ENTRIES_PER_RING];
+};
+
+/* The whole enchilada */
+struct ring_buffer {
+        struct ring TX_0_OR_2;
+        struct ring RX_0_OR_2;
+        struct ring TX_1_OR_3;
+        struct ring RX_1_OR_3;
+};
+
+/* Get a ring from a port struct */
+#define RING(_p, _wh)   &(((struct ring_buffer *)((_p)->ip_cpu_ringbuf))->_wh)
+
+/* Infinite loop detection.
+ */
+#define MAXITER 10000000
+
+/* Prototypes */
+static void receive_chars(struct uart_port *);
+static void handle_intr(void *arg, uint32_t sio_ir);
+
+/**
+ * write_ireg - write the interrupt regs
+ * @ioc4_soft: ptr to soft struct for this port
+ * @val: value to write
+ * @which: which register
+ * @type: which ireg set
+ */
+static inline void
+write_ireg(struct ioc4_soft *ioc4_soft, uint32_t val, int which, int type)
+{
+        struct ioc4_mem __iomem *mem = ioc4_soft->is_ioc4_mem_addr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ioc4_soft->is_ir_lock, flags);
+
+        switch (type) {
+        case IOC4_SIO_INTR_TYPE:
+                switch (which) {
+                case IOC4_W_IES:
+                        writel(val, &mem->sio_ies_ro);
+                        break;
+
+                case IOC4_W_IEC:
+                        writel(val, &mem->sio_iec_ro);
+                        break;
+                }
+                break;
+
+        case IOC4_OTHER_INTR_TYPE:
+                switch (which) {
+                case IOC4_W_IES:
+                        writel(val, &mem->other_ies_ro);
+                        break;
+
+                case IOC4_W_IEC:
+                        writel(val, &mem->other_iec_ro);
+                        break;
+                }
+                break;
+
+        default:
+                break;
+        }
+        spin_unlock_irqrestore(&ioc4_soft->is_ir_lock, flags);
+}
+
+/**
+ * set_baud - Baud rate setting code
+ * @port: port to set
+ * @baud: baud rate to use
+ */
+static int set_baud(struct ioc4_port *port, int baud)
+{
+        int actual_baud;
+        int diff;
+        int lcr;
+        unsigned short divisor;
+        struct ioc4_uartregs __iomem *uart;
+
+        divisor = SER_DIVISOR(baud, port->ip_pci_bus_speed);
+        if (!divisor)
+                return 1;
+        actual_baud = DIVISOR_TO_BAUD(divisor, port->ip_pci_bus_speed);
+
+        diff = actual_baud - baud;
+        if (diff < 0)
+                diff = -diff;
+
+        /* If we're within 1%, we've found a match */
+        if (diff * 100 > actual_baud)
+                return 1;
+
+        uart = port->ip_uart_regs;
+        lcr = readb(&uart->i4u_lcr);
+        writeb(lcr | UART_LCR_DLAB, &uart->i4u_lcr);
+        writeb((unsigned char)divisor, &uart->i4u_dll);
+        writeb((unsigned char)(divisor >> 8), &uart->i4u_dlm);
+        writeb(lcr, &uart->i4u_lcr);
+        return 0;
+}
+
+
+/**
+ * get_ioc4_port - given a uart port, return the control structure
+ * @port: uart port
+ */
+static struct ioc4_port *get_ioc4_port(struct uart_port *the_port)
+{
+        struct ioc4_control *control = dev_get_drvdata(the_port->dev);
+        int ii;
+
+        if (control) {
+                for ( ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++ ) {
+                        if (!control->ic_port[ii].icp_port)
+                                continue;
+                        if (the_port == control->ic_port[ii].icp_port->ip_port)
+                                return control->ic_port[ii].icp_port;
+                }
+        }
+        return NULL;
+}
+
+/* The IOC4 hardware provides no atomic way to determine if interrupts
+ * are pending since two reads are required to do so.  The handler must
+ * read the SIO_IR and the SIO_IES, and take the logical and of the
+ * two.  When this value is zero, all interrupts have been serviced and
+ * the handler may return.
+ *
+ * This has the unfortunate "hole" that, if some other CPU or
+ * some other thread or some higher level interrupt manages to
+ * modify SIO_IE between our reads of SIO_IR and SIO_IE, we may
+ * think we have observed SIO_IR&SIO_IE==0 when in fact this
+ * condition never really occurred.
+ *
+ * To solve this, we use a simple spinlock that must be held
+ * whenever modifying SIO_IE; holding this lock while observing
+ * both SIO_IR and SIO_IE guarantees that we do not falsely
+ * conclude that no enabled interrupts are pending.
+ */
+
+static inline uint32_t
+pending_intrs(struct ioc4_soft *soft, int type)
+{
+        struct ioc4_mem __iomem *mem = soft->is_ioc4_mem_addr;
+        unsigned long flag;
+        uint32_t intrs = 0;
+
+        BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
+               || (type == IOC4_OTHER_INTR_TYPE)));
+
+        spin_lock_irqsave(&soft->is_ir_lock, flag);
+
+        switch (type) {
+        case IOC4_SIO_INTR_TYPE:
+                intrs = readl(&mem->sio_ir) & readl(&mem->sio_ies_ro);
+                break;
+
+        case IOC4_OTHER_INTR_TYPE:
+                intrs = readl(&mem->other_ir) & readl(&mem->other_ies_ro);
+
+                /* Don't process any ATA interrupte */
+                intrs &= ~(IOC4_OTHER_IR_ATA_INT | IOC4_OTHER_IR_ATA_MEMERR);
+                break;
+
+        default:
+                break;
+        }
+        spin_unlock_irqrestore(&soft->is_ir_lock, flag);
+        return intrs;
+}
+
+/**
+ * port_init - Initialize the sio and ioc4 hardware for a given port
+ *                      called per port from attach...
+ * @port: port to initialize
+ */
+static int inline port_init(struct ioc4_port *port)
+{
+        uint32_t sio_cr;
+        struct hooks *hooks = port->ip_hooks;
+        struct ioc4_uartregs __iomem *uart;
+
+        /* Idle the IOC4 serial interface */
+        writel(IOC4_SSCR_RESET, &port->ip_serial_regs->sscr);
+
+        /* Wait until any pending bus activity for this port has ceased */
+        do
+                sio_cr = readl(&port->ip_mem->sio_cr);
+        while (!(sio_cr & IOC4_SIO_CR_SIO_DIAG_IDLE));
+
+        /* Finish reset sequence */
+        writel(0, &port->ip_serial_regs->sscr);
+
+        /* Once RESET is done, reload cached tx_prod and rx_cons values
+         * and set rings to empty by making prod == cons
+         */
+        port->ip_tx_prod = readl(&port->ip_serial_regs->stcir) & PROD_CONS_MASK;
+        writel(port->ip_tx_prod, &port->ip_serial_regs->stpir);
+        port->ip_rx_cons = readl(&port->ip_serial_regs->srpir) & PROD_CONS_MASK;
+        writel(port->ip_rx_cons, &port->ip_serial_regs->srcir);
+
+        /* Disable interrupts for this 16550 */
+        uart = port->ip_uart_regs;
+        writeb(0, &uart->i4u_lcr);
+        writeb(0, &uart->i4u_ier);
+
+        /* Set the default baud */
+        set_baud(port, port->ip_baud);
+
+        /* Set line control to 8 bits no parity */
+        writeb(UART_LCR_WLEN8 | 0, &uart->i4u_lcr);
+                                        /* UART_LCR_STOP == 1 stop */
+
+        /* Enable the FIFOs */
+        writeb(UART_FCR_ENABLE_FIFO, &uart->i4u_fcr);
+        /* then reset 16550 FIFOs */
+        writeb(UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT,
+                        &uart->i4u_fcr);
+
+        /* Clear modem control register */
+        writeb(0, &uart->i4u_mcr);
+
+        /* Clear deltas in modem status register */
+        readb(&uart->i4u_msr);
+
+        /* Only do this once per port pair */
+        if (port->ip_hooks == &hooks_array[0]
+                            || port->ip_hooks == &hooks_array[2]) {
+                unsigned long ring_pci_addr;
+                uint32_t __iomem *sbbr_l;
+                uint32_t __iomem *sbbr_h;
+
+                if (port->ip_hooks == &hooks_array[0]) {
+                        sbbr_l = &port->ip_serial->sbbr01_l;
+                        sbbr_h = &port->ip_serial->sbbr01_h;
+                } else {
+                        sbbr_l = &port->ip_serial->sbbr23_l;
+                        sbbr_h = &port->ip_serial->sbbr23_h;
+                }
+
+                ring_pci_addr = (unsigned long __iomem)port->ip_dma_ringbuf;
+                DPRINT_CONFIG(("%s: ring_pci_addr 0x%lx\n",
+                                        __FUNCTION__, ring_pci_addr));
+
+                writel((unsigned int)((uint64_t)ring_pci_addr >> 32), sbbr_h);
+                writel((unsigned int)ring_pci_addr | IOC4_BUF_SIZE_BIT, sbbr_l);
+        }
+
+        /* Set the receive timeout value to 10 msec */
+        writel(IOC4_SRTR_HZ / 100, &port->ip_serial_regs->srtr);
+
+        /* Set rx threshold, enable DMA */
+        /* Set high water mark at 3/4 of full ring */
+        port->ip_sscr = (ENTRIES_PER_RING * 3 / 4);
+        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+
+        /* Disable and clear all serial related interrupt bits */
+        write_ireg(port->ip_ioc4_soft, hooks->intr_clear,
+                       IOC4_W_IEC, IOC4_SIO_INTR_TYPE);
+        port->ip_ienb &= ~hooks->intr_clear;
+        writel(hooks->intr_clear, &port->ip_mem->sio_ir);
+        return 0;
+}
+
+/**
+ * handle_dma_error_intr - service any pending DMA error interrupts for the
+ *                      given port - 2nd level called via sd_intr
+ * @arg: handler arg
+ * @other_ir: ioc4regs
+ */
+static void handle_dma_error_intr(void *arg, uint32_t other_ir)
+{
+        struct ioc4_port *port = (struct ioc4_port *)arg;
+        struct hooks *hooks = port->ip_hooks;
+        unsigned int flags;
+
+        spin_lock_irqsave(&port->ip_lock, flags);
+
+        /* ACK the interrupt */
+        writel(hooks->intr_dma_error, &port->ip_mem->other_ir);
+
+        if (readl(&port->ip_mem->pci_err_addr_l) & IOC4_PCI_ERR_ADDR_VLD) {
+                printk(KERN_ERR
+                        "PCI error address is 0x%lx, "
+                                "master is serial port %c %s\n",
+                     (((uint64_t)readl(&port->ip_mem->pci_err_addr_h)
+                                                         << 32)
+                                | readl(&port->ip_mem->pci_err_addr_l))
+                                        & IOC4_PCI_ERR_ADDR_ADDR_MSK, '1' +
+                     ((char)(readl(&port->ip_mem-> pci_err_addr_l) &
+                             IOC4_PCI_ERR_ADDR_MST_NUM_MSK) >> 1),
+                     (readl(&port->ip_mem->pci_err_addr_l)
+                                & IOC4_PCI_ERR_ADDR_MST_TYP_MSK)
+                                ? "RX" : "TX");
+
+                if (readl(&port->ip_mem->pci_err_addr_l)
+                                                & IOC4_PCI_ERR_ADDR_MUL_ERR) {
+                        printk(KERN_ERR
+                                "Multiple errors occurred\n");
+                }
+        }
+        spin_unlock_irqrestore(&port->ip_lock, flags);
+
+        /* Re-enable DMA error interrupts */
+        write_ireg(port->ip_ioc4_soft, hooks->intr_dma_error, IOC4_W_IES,
+                                                IOC4_OTHER_INTR_TYPE);
+}
+
+/**
+ * intr_connect - interrupt connect function
+ * @soft: soft struct for this card
+ * @type: interrupt type
+ * @intrbits: bit pattern to set
+ * @intr: handler function
+ * @info: handler arg
+ */
+static void
+intr_connect(struct ioc4_soft *soft, int type,
+                  uint32_t intrbits, ioc4_intr_func_f * intr, void *info)
+{
+        int i;
+        struct ioc4_intr_info *intr_ptr;
+
+        BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
+               || (type == IOC4_OTHER_INTR_TYPE)));
+
+        i = atomic_inc(&soft-> is_intr_type[type].is_num_intrs) - 1;
+        BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
+
+        /* Save off the lower level interrupt handler */
+        intr_ptr = &soft->is_intr_type[type].is_intr_info[i];
+        intr_ptr->sd_bits = intrbits;
+        intr_ptr->sd_intr = intr;
+        intr_ptr->sd_info = info;
+}
+
+/**
+ * ioc4_intr - Top level IOC4 interrupt handler.
+ * @irq: irq value
+ * @arg: handler arg
+ * @regs: registers
+ */
+static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
+{
+        struct ioc4_soft *soft;
+        uint32_t this_ir, this_mir;
+        int xx, num_intrs = 0;
+        int intr_type;
+        int handled = 0;
+        struct ioc4_intr_info *ii;
+
+        soft = arg;
+        for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
+                num_intrs = (int)atomic_read(
+                                &soft->is_intr_type[intr_type].is_num_intrs);
+
+                this_mir = this_ir = pending_intrs(soft, intr_type);
+
+                /* Farm out the interrupt to the various drivers depending on
+                 * which interrupt bits are set.
+                 */
+                for (xx = 0; xx < num_intrs; xx++) {
+                        ii = &soft->is_intr_type[intr_type].is_intr_info[xx];
+                        if ((this_mir = this_ir & ii->sd_bits)) {
+                                /* Disable owned interrupts, call handler */
+                                handled++;
+                                write_ireg(soft, ii->sd_bits, IOC4_W_IEC,
+                                                                intr_type);
+                                ii->sd_intr(ii->sd_info, this_mir);
+                                this_ir &= ~this_mir;
+                        }
+                }
+                if (this_ir) {
+                        printk(KERN_ERR
+                               "unknown IOC4 %s interrupt 0x%x, sio_ir = 0x%x,"
+                                " sio_ies = 0x%x, other_ir = 0x%x :"
+                                "other_ies = 0x%x\n",
+                               (intr_type == IOC4_SIO_INTR_TYPE) ? "sio" :
+                               "other", this_ir,
+                               readl(&soft->is_ioc4_mem_addr->sio_ir),
+                               readl(&soft->is_ioc4_mem_addr->sio_ies_ro),
+                               readl(&soft->is_ioc4_mem_addr->other_ir),
+                               readl(&soft->is_ioc4_mem_addr->other_ies_ro));
+                }
+        }
+#ifdef DEBUG_INTERRUPTS
+        {
+                struct ioc4_mem __iomem *mem = soft->is_ioc4_mem_addr;
+                spinlock_t *lp = &soft->is_ir_lock;
+                unsigned long flag;
+
+                spin_lock_irqsave(&soft->is_ir_lock, flag);
+                printk ("%s : %d : mem 0x%p sio_ir 0x%x sio_ies_ro 0x%x "
+                                "other_ir 0x%x other_ies_ro 0x%x mask 0x%x\n",
+                     __FUNCTION__, __LINE__,
+                     (void *)mem, readl(&mem->sio_ir),
+                     readl(&mem->sio_ies_ro),
+                     readl(&mem->other_ir),
+                     readl(&mem->other_ies_ro),
+                     IOC4_OTHER_IR_ATA_INT | IOC4_OTHER_IR_ATA_MEMERR);
+                spin_unlock_irqrestore(&soft->is_ir_lock, flag);
+        }
+#endif
+        return handled ? IRQ_HANDLED : IRQ_NONE;
+}
+
+/**
+ * ioc4_attach_local - Device initialization.
+ *                      Called at *_attach() time for each
+ *                      IOC4 with serial ports in the system.
+ * @control: ioc4_control ptr
+ * @pdev: PCI handle for this device
+ * @soft: soft struct for this device
+ * @ioc4: ioc4 mem space
+ */
+static int inline ioc4_attach_local(struct pci_dev *pdev,
+                        struct ioc4_control *control,
+                        struct ioc4_soft *soft, void __iomem *ioc4_mem,
+                        void __iomem *ioc4_serial)
+{
+        struct ioc4_port *port;
+        struct ioc4_port *ports[IOC4_NUM_SERIAL_PORTS];
+        int port_number;
+        uint16_t ioc4_revid_min = 62;
+        uint16_t ioc4_revid;
+
+        /* IOC4 firmware must be at least rev 62 */
+        pci_read_config_word(pdev, PCI_COMMAND_SPECIAL, &ioc4_revid);
+
+        printk(KERN_INFO "IOC4 firmware revision %d\n", ioc4_revid);
+        if (ioc4_revid < ioc4_revid_min) {
+                printk(KERN_WARNING
+                    "IOC4 serial not supported on firmware rev %d, "
+                                "please upgrade to rev %d or higher\n",
+                                ioc4_revid, ioc4_revid_min);
+                return -EPERM;
+        }
+        BUG_ON(ioc4_mem == NULL);
+        BUG_ON(ioc4_serial == NULL);
+
+        /* Create port structures for each port */
+        for (port_number = 0; port_number < IOC4_NUM_SERIAL_PORTS;
+                                                        port_number++) {
+                port = kmalloc(sizeof(struct ioc4_port), GFP_KERNEL);
+                if (!port) {
+                        printk(KERN_WARNING
+                                "IOC4 serial memory not available for port\n");
+                        return -ENOMEM;
+                }
+                memset(port, 0, sizeof(struct ioc4_port));
+
+                /* we need to remember the previous ones, to point back to
+                 * them farther down - setting up the ring buffers.
+                 */
+                ports[port_number] = port;
+
+                /* Allocate buffers and jumpstart the hardware.  */
+                control->ic_port[port_number].icp_port = port;
+                port->ip_ioc4_soft = soft;
+                port->ip_pdev = pdev;
+                port->ip_ienb = 0;
+                port->ip_pci_bus_speed = IOC4_SER_XIN_CLK;
+                port->ip_baud = 9600;
+                port->ip_control = control;
+                port->ip_mem = ioc4_mem;
+                port->ip_serial = ioc4_serial;
+
+                /* point to the right hook */
+                port->ip_hooks = &hooks_array[port_number];
+
+                /* Get direct hooks to the serial regs and uart regs
+                 * for this port
+                 */
+                switch (port_number) {
+                case 0:
+                        port->ip_serial_regs = &(port->ip_serial->port_0);
+                        port->ip_uart_regs = &(port->ip_serial->uart_0);
+                        break;
+                case 1:
+                        port->ip_serial_regs = &(port->ip_serial->port_1);
+                        port->ip_uart_regs = &(port->ip_serial->uart_1);
+                        break;
+                case 2:
+                        port->ip_serial_regs = &(port->ip_serial->port_2);
+                        port->ip_uart_regs = &(port->ip_serial->uart_2);
+                        break;
+                default:
+                case 3:
+                        port->ip_serial_regs = &(port->ip_serial->port_3);
+                        port->ip_uart_regs = &(port->ip_serial->uart_3);
+                        break;
+                }
+
+                /* ring buffers are 1 to a pair of ports */
+                if (port_number && (port_number & 1)) {
+                        /* odd use the evens buffer */
+                        port->ip_dma_ringbuf =
+                                        ports[port_number - 1]->ip_dma_ringbuf;
+                        port->ip_cpu_ringbuf =
+                                        ports[port_number - 1]->ip_cpu_ringbuf;
+                        port->ip_inring = RING(port, RX_1_OR_3);
+                        port->ip_outring = RING(port, TX_1_OR_3);
+
+                } else {
+                        if (port->ip_dma_ringbuf == 0) {
+                                port->ip_cpu_ringbuf = pci_alloc_consistent
+                                        (pdev, TOTAL_RING_BUF_SIZE,
+                                        &port->ip_dma_ringbuf);
+
+                        }
+                        BUG_ON(!((((int64_t)port->ip_dma_ringbuf) &
+                                (TOTAL_RING_BUF_SIZE - 1)) == 0));
+                        DPRINT_CONFIG(("%s : ip_cpu_ringbuf 0x%p "
+                                                "ip_dma_ringbuf 0x%p\n",
+                                        __FUNCTION__,
+                                        (void *)port->ip_cpu_ringbuf,
+                                        (void *)port->ip_dma_ringbuf));
+                        port->ip_inring = RING(port, RX_0_OR_2);
+                        port->ip_outring = RING(port, TX_0_OR_2);
+                }
+                DPRINT_CONFIG(("%s : port %d [addr 0x%p] control 0x%p",
+                                __FUNCTION__,
+                                port_number, (void *)port, (void *)control));
+                DPRINT_CONFIG((" ip_serial_regs 0x%p ip_uart_regs 0x%p\n",
+                                (void *)port->ip_serial_regs,
+                                (void *)port->ip_uart_regs));
+
+                /* Initialize the hardware for IOC4 */
+                port_init(port);
+
+                DPRINT_CONFIG(("%s: port_number %d port 0x%p inring 0x%p "
+                                                "outring 0x%p\n",
+                                __FUNCTION__,
+                                port_number, (void *)port,
+                                (void *)port->ip_inring,
+                                (void *)port->ip_outring));
+
+                /* Attach interrupt handlers */
+                intr_connect(soft, IOC4_SIO_INTR_TYPE,
+                                GET_SIO_IR(port_number),
+                                handle_intr, port);
+
+                intr_connect(soft, IOC4_OTHER_INTR_TYPE,
+                                GET_OTHER_IR(port_number),
+                                handle_dma_error_intr, port);
+        }
+        return 0;
+}
+
+/**
+ * enable_intrs - enable interrupts
+ * @port: port to enable
+ * @mask: mask to use
+ */
+static void enable_intrs(struct ioc4_port *port, uint32_t mask)
+{
+        struct hooks *hooks = port->ip_hooks;
+
+        if ((port->ip_ienb & mask) != mask) {
+                write_ireg(port->ip_ioc4_soft, mask, IOC4_W_IES,
+                                                IOC4_SIO_INTR_TYPE);
+                port->ip_ienb |= mask;
+        }
+
+        if (port->ip_ienb)
+                write_ireg(port->ip_ioc4_soft, hooks->intr_dma_error,
+                                IOC4_W_IES, IOC4_OTHER_INTR_TYPE);
+}
+
+/**
+ * local_open - local open a port
+ * @port: port to open
+ */
+static inline int local_open(struct ioc4_port *port)
+{
+        int spiniter = 0;
+
+        port->ip_flags = 0;
+
+        /* Pause the DMA interface if necessary */
+        if (port->ip_sscr & IOC4_SSCR_DMA_EN) {
+                writel(port->ip_sscr | IOC4_SSCR_DMA_PAUSE,
+                        &port->ip_serial_regs->sscr);
+                while((readl(&port->ip_serial_regs-> sscr)
+                                & IOC4_SSCR_PAUSE_STATE) == 0) {
+                        spiniter++;
+                        if (spiniter > MAXITER) {
+                                return -1;
+                        }
+                }
+        }
+
+        /* Reset the input fifo.  If the uart received chars while the port
+         * was closed and DMA is not enabled, the uart may have a bunch of
+         * chars hanging around in its rx fifo which will not be discarded
+         * by rclr in the upper layer. We must get rid of them here.
+         */
+        writeb(UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR,
+                                &port->ip_uart_regs->i4u_fcr);
+
+        writeb(UART_LCR_WLEN8, &port->ip_uart_regs->i4u_lcr);
+                                        /* UART_LCR_STOP == 1 stop */
+
+        /* Re-enable DMA, set default threshold to intr whenever there is
+         * data available.
+         */
+        port->ip_sscr &= ~IOC4_SSCR_RX_THRESHOLD;
+        port->ip_sscr |= 1;     /* default threshold */
+
+        /* Plug in the new sscr.  This implicitly clears the DMA_PAUSE
+         * flag if it was set above
+         */
+        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+        port->ip_tx_lowat = 1;
+        return 0;
+}
+
+/**
+ * set_rx_timeout - Set rx timeout and threshold values.
+ * @port: port to use
+ * @timeout: timeout value in ticks
+ */
+static inline int set_rx_timeout(struct ioc4_port *port, int timeout)
+{
+        int threshold;
+
+        port->ip_rx_timeout = timeout;
+
+        /* Timeout is in ticks.  Let's figure out how many chars we
+         * can receive at the current baud rate in that interval
+         * and set the rx threshold to that amount.  There are 4 chars
+         * per ring entry, so we'll divide the number of chars that will
+         * arrive in timeout by 4.
+         */
+        threshold = timeout * port->ip_baud / 10 / HZ / 4;
+        if (threshold == 0)
+                threshold = 1;  /* otherwise we'll intr all the time! */
+
+        if ((unsigned)threshold > (unsigned)IOC4_SSCR_RX_THRESHOLD)
+                return 1;
+
+        port->ip_sscr &= ~IOC4_SSCR_RX_THRESHOLD;
+        port->ip_sscr |= threshold;
+
+        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+
+        /* Now set the rx timeout to the given value */
+        timeout = timeout * IOC4_SRTR_HZ / HZ;
+        if (timeout > IOC4_SRTR_CNT)
+                timeout = IOC4_SRTR_CNT;
+
+        writel(timeout, &port->ip_serial_regs->srtr);
+        return 0;
+}
+
+/**
+ * config_port - config the hardware
+ * @port: port to config
+ * @baud: baud rate for the port
+ * @byte_size: data size
+ * @stop_bits: number of stop bits
+ * @parenb: parity enable ?
+ * @parodd: odd parity ?
+ */
+static inline int
+config_port(struct ioc4_port *port,
+            int baud, int byte_size, int stop_bits, int parenb, int parodd)
+{
+        char lcr, sizebits;
+        int spiniter = 0;
+
+        DPRINT_CONFIG(("%s: baud %d byte_size %d stop %d parenb %d parodd %d\n",
+                __FUNCTION__, baud, byte_size, stop_bits, parenb, parodd));
+
+        if (set_baud(port, baud))
+                return 1;
+
+        switch (byte_size) {
+        case 5:
+                sizebits = UART_LCR_WLEN5;
+                break;
+        case 6:
+                sizebits = UART_LCR_WLEN6;
+                break;
+        case 7:
+                sizebits = UART_LCR_WLEN7;
+                break;
+        case 8:
+                sizebits = UART_LCR_WLEN8;
+                break;
+        default:
+                return 1;
+        }
+
+        /* Pause the DMA interface if necessary */
+        if (port->ip_sscr & IOC4_SSCR_DMA_EN) {
+                writel(port->ip_sscr | IOC4_SSCR_DMA_PAUSE,
+                        &port->ip_serial_regs->sscr);
+                while((readl(&port->ip_serial_regs->sscr)
+                                                & IOC4_SSCR_PAUSE_STATE) == 0) {
+                        spiniter++;
+                        if (spiniter > MAXITER)
+                                return -1;
+                }
+        }
+
+        /* Clear relevant fields in lcr */
+        lcr = readb(&port->ip_uart_regs->i4u_lcr);
+        lcr &= ~(LCR_MASK_BITS_CHAR | UART_LCR_EPAR |
+                 UART_LCR_PARITY | LCR_MASK_STOP_BITS);
+
+        /* Set byte size in lcr */
+        lcr |= sizebits;
+
+        /* Set parity */
+        if (parenb) {
+                lcr |= UART_LCR_PARITY;
+                if (!parodd)
+                        lcr |= UART_LCR_EPAR;
+        }
+
+        /* Set stop bits */
+        if (stop_bits)
+                lcr |= UART_LCR_STOP /* 2 stop bits */ ;
+
+        writeb(lcr, &port->ip_uart_regs->i4u_lcr);
+
+        /* Re-enable the DMA interface if necessary */
+        if (port->ip_sscr & IOC4_SSCR_DMA_EN) {
+                writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+        }
+        port->ip_baud = baud;
+
+        /* When we get within this number of ring entries of filling the
+         * entire ring on tx, place an EXPLICIT intr to generate a lowat
+         * notification when output has drained.
+         */
+        port->ip_tx_lowat = (TX_LOWAT_CHARS(baud) + 3) / 4;
+        if (port->ip_tx_lowat == 0)
+                port->ip_tx_lowat = 1;
+
+        set_rx_timeout(port, port->ip_rx_timeout);
+
+        return 0;
+}
+
+/**
+ * do_write - Write bytes to the port.  Returns the number of bytes
+ *                      actually written. Called from transmit_chars
+ * @port: port to use
+ * @buf: the stuff to write
+ * @len: how many bytes in 'buf'
+ */
+static inline int do_write(struct ioc4_port *port, char *buf, int len)
+{
+        int prod_ptr, cons_ptr, total = 0;
+        struct ring *outring;
+        struct ring_entry *entry;
+        struct hooks *hooks = port->ip_hooks;
+
+        BUG_ON(!(len >= 0));
+
+        prod_ptr = port->ip_tx_prod;
+        cons_ptr = readl(&port->ip_serial_regs->stcir) & PROD_CONS_MASK;
+        outring = port->ip_outring;
+
+        /* Maintain a 1-entry red-zone.  The ring buffer is full when
+         * (cons - prod) % ring_size is 1.  Rather than do this subtraction
+         * in the body of the loop, I'll do it now.
+         */
+        cons_ptr = (cons_ptr - (int)sizeof(struct ring_entry)) & PROD_CONS_MASK;
+
+        /* Stuff the bytes into the output */
+        while ((prod_ptr != cons_ptr) && (len > 0)) {
+                int xx;
+
+                /* Get 4 bytes (one ring entry) at a time */
+                entry = (struct ring_entry *)((caddr_t) outring + prod_ptr);
+
+                /* Invalidate all entries */
+                entry->ring_allsc = 0;
+
+                /* Copy in some bytes */
+                for (xx = 0; (xx < 4) && (len > 0); xx++) {
+                        entry->ring_data[xx] = *buf++;
+                        entry->ring_sc[xx] = IOC4_TXCB_VALID;
+                        len--;
+                        total++;
+                }
+
+                /* If we are within some small threshold of filling up the
+                 * entire ring buffer, we must place an EXPLICIT intr here
+                 * to generate a lowat interrupt in case we subsequently
+                 * really do fill up the ring and the caller goes to sleep.
+                 * No need to place more than one though.
+                 */
+                if (!(port->ip_flags & LOWAT_WRITTEN) &&
+                        ((cons_ptr - prod_ptr) & PROD_CONS_MASK)
+                                <= port->ip_tx_lowat
+                                        * (int)sizeof(struct ring_entry)) {
+                        port->ip_flags |= LOWAT_WRITTEN;
+                        entry->ring_sc[0] |= IOC4_TXCB_INT_WHEN_DONE;
+                }
+
+                /* Go on to next entry */
+                prod_ptr += sizeof(struct ring_entry);
+                prod_ptr &= PROD_CONS_MASK;
+        }
+
+        /* If we sent something, start DMA if necessary */
+        if (total > 0 && !(port->ip_sscr & IOC4_SSCR_DMA_EN)) {
+                port->ip_sscr |= IOC4_SSCR_DMA_EN;
+                writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+        }
+
+        /* Store the new producer pointer.  If tx is disabled, we stuff the
+         * data into the ring buffer, but we don't actually start tx.
+         */
+        if (!uart_tx_stopped(port->ip_port)) {
+                writel(prod_ptr, &port->ip_serial_regs->stpir);
+
+                /* If we are now transmitting, enable tx_mt interrupt so we
+                 * can disable DMA if necessary when the tx finishes.
+                 */
+                if (total > 0)
+                        enable_intrs(port, hooks->intr_tx_mt);
+        }
+        port->ip_tx_prod = prod_ptr;
+        return total;
+}
+
+/**
+ * disable_intrs - disable interrupts
+ * @port: port to enable
+ * @mask: mask to use
+ */
+static void disable_intrs(struct ioc4_port *port, uint32_t mask)
+{
+        struct hooks *hooks = port->ip_hooks;
+
+        if (port->ip_ienb & mask) {
+                write_ireg(port->ip_ioc4_soft, mask, IOC4_W_IEC,
+                                        IOC4_SIO_INTR_TYPE);
+                port->ip_ienb &= ~mask;
+        }
+
+        if (!port->ip_ienb)
+                write_ireg(port->ip_ioc4_soft, hooks->intr_dma_error,
+                                IOC4_W_IEC, IOC4_OTHER_INTR_TYPE);
+}
+
+/**
+ * set_notification - Modify event notification
+ * @port: port to use
+ * @mask: events mask
+ * @set_on: set ?
+ */
+static int set_notification(struct ioc4_port *port, int mask, int set_on)
+{
+        struct hooks *hooks = port->ip_hooks;
+        uint32_t intrbits, sscrbits;
+
+        BUG_ON(!mask);
+
+        intrbits = sscrbits = 0;
+
+        if (mask & N_DATA_READY)
+                intrbits |= (hooks->intr_rx_timer | hooks->intr_rx_high);
+        if (mask & N_OUTPUT_LOWAT)
+                intrbits |= hooks->intr_tx_explicit;
+        if (mask & N_DDCD) {
+                intrbits |= hooks->intr_delta_dcd;
+                sscrbits |= IOC4_SSCR_RX_RING_DCD;
+        }
+        if (mask & N_DCTS)
+                intrbits |= hooks->intr_delta_cts;
+
+        if (set_on) {
+                enable_intrs(port, intrbits);
+                port->ip_notify |= mask;
+                port->ip_sscr |= sscrbits;
+        } else {
+                disable_intrs(port, intrbits);
+                port->ip_notify &= ~mask;
+                port->ip_sscr &= ~sscrbits;
+        }
+
+        /* We require DMA if either DATA_READY or DDCD notification is
+         * currently requested. If neither of these is requested and
+         * there is currently no tx in progress, DMA may be disabled.
+         */
+        if (port->ip_notify & (N_DATA_READY | N_DDCD))
+                port->ip_sscr |= IOC4_SSCR_DMA_EN;
+        else if (!(port->ip_ienb & hooks->intr_tx_mt))
+                port->ip_sscr &= ~IOC4_SSCR_DMA_EN;
+
+        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+        return 0;
+}
+
+/**
+ * set_mcr - set the master control reg
+ * @the_port: port to use
+ * @set: set ?
+ * @mask1: mcr mask
+ * @mask2: shadow mask
+ */
+static inline int set_mcr(struct uart_port *the_port, int set,
+                int mask1, int mask2)
+{
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        uint32_t shadow;
+        int spiniter = 0;
+        char mcr;
+
+        if (!port)
+                return -1;
+
+        /* Pause the DMA interface if necessary */
+        if (port->ip_sscr & IOC4_SSCR_DMA_EN) {
+                writel(port->ip_sscr | IOC4_SSCR_DMA_PAUSE,
+                        &port->ip_serial_regs->sscr);
+                while ((readl(&port->ip_serial_regs->sscr)
+                                        & IOC4_SSCR_PAUSE_STATE) == 0) {
+                        spiniter++;
+                        if (spiniter > MAXITER)
+                                return -1;
+                }
+        }
+        shadow = readl(&port->ip_serial_regs->shadow);
+        mcr = (shadow & 0xff000000) >> 24;
+
+        /* Set new value */
+        if (set) {
+                mcr |= mask1;
+                shadow |= mask2;
+        } else {
+                mcr &= ~mask1;
+                shadow &= ~mask2;
+        }
+        writeb(mcr, &port->ip_uart_regs->i4u_mcr);
+        writel(shadow, &port->ip_serial_regs->shadow);
+
+        /* Re-enable the DMA interface if necessary */
+        if (port->ip_sscr & IOC4_SSCR_DMA_EN) {
+                writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+        }
+        return 0;
+}
+
+/**
+ * ioc4_set_proto - set the protocol for the port
+ * @port: port to use
+ * @proto: protocol to use
+ */
+static int ioc4_set_proto(struct ioc4_port *port, enum sio_proto proto)
+{
+        struct hooks *hooks = port->ip_hooks;
+
+        switch (proto) {
+        case PROTO_RS232:
+                /* Clear the appropriate GIO pin */
+                writel(0, (&port->ip_mem->gppr_0 +
+                                  hooks->rs422_select_pin));
+                break;
+
+        case PROTO_RS422:
+                /* Set the appropriate GIO pin */
+                writel(1, (&port->ip_mem->gppr_0 +
+                                  hooks->rs422_select_pin));
+                break;
+
+        default:
+                return 1;
+        }
+        return 0;
+}
+
+/**
+ * transmit_chars - upper level write, called with ip_lock
+ * @the_port: port to write
+ */
+static void transmit_chars(struct uart_port *the_port)
+{
+        int xmit_count, tail, head;
+        int result;
+        char *start;
+        struct tty_struct *tty;
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct uart_info *info;
+
+        if (!the_port)
+                return;
+        if (!port)
+                return;
+
+        info = the_port->info;
+        tty = info->tty;
+
+        if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
+                /* Nothing to do or hw stopped */
+                set_notification(port, N_ALL_OUTPUT, 0);
+                return;
+        }
+
+        head = info->xmit.head;
+        tail = info->xmit.tail;
+        start = (char *)&info->xmit.buf[tail];
+
+        /* write out all the data or until the end of the buffer */
+        xmit_count = (head < tail) ? (UART_XMIT_SIZE - tail) : (head - tail);
+        if (xmit_count > 0) {
+                result = do_write(port, start, xmit_count);
+                if (result > 0) {
+                        /* booking */
+                        xmit_count -= result;
+                        the_port->icount.tx += result;
+                        /* advance the pointers */
+                        tail += result;
+                        tail &= UART_XMIT_SIZE - 1;
+                        info->xmit.tail = tail;
+                        start = (char *)&info->xmit.buf[tail];
+                }
+        }
+        if (uart_circ_chars_pending(&info->xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(the_port);
+
+        if (uart_circ_empty(&info->xmit)) {
+                set_notification(port, N_OUTPUT_LOWAT, 0);
+        } else {
+                set_notification(port, N_OUTPUT_LOWAT, 1);
+        }
+}
+
+/**
+ * ioc4_change_speed - change the speed of the port
+ * @the_port: port to change
+ * @new_termios: new termios settings
+ * @old_termios: old termios settings
+ */
+static void
+ioc4_change_speed(struct uart_port *the_port,
+                  struct termios *new_termios, struct termios *old_termios)
+{
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        int baud, bits;
+        unsigned cflag, cval;
+        int new_parity = 0, new_parity_enable = 0, new_stop = 1, new_data = 8;
+        struct uart_info *info = the_port->info;
+
+        cflag = new_termios->c_cflag;
+
+        switch (cflag & CSIZE) {
+        case CS5:
+                new_data = 5;
+                cval = 0x00;
+                bits = 7;
+                break;
+        case CS6:
+                new_data = 6;
+                cval = 0x01;
+                bits = 8;
+                break;
+        case CS7:
+                new_data = 7;
+                cval = 0x02;
+                bits = 9;
+                break;
+        case CS8:
+                new_data = 8;
+                cval = 0x03;
+                bits = 10;
+                break;
+        default:
+                /* cuz we always need a default ... */
+                new_data = 5;
+                cval = 0x00;
+                bits = 7;
+                break;
+        }
+        if (cflag & CSTOPB) {
+                cval |= 0x04;
+                bits++;
+                new_stop = 1;
+        }
+        if (cflag & PARENB) {
+                cval |= UART_LCR_PARITY;
+                bits++;
+                new_parity_enable = 1;
+        }
+        if (cflag & PARODD) {
+                cval |= UART_LCR_EPAR;
+                new_parity = 1;
+        }
+        if (cflag & IGNPAR) {
+                cval &= ~UART_LCR_PARITY;
+                new_parity_enable = 0;
+        }
+        baud = uart_get_baud_rate(the_port, new_termios, old_termios,
+                                MIN_BAUD_SUPPORTED, MAX_BAUD_SUPPORTED);
+        DPRINT_CONFIG(("%s: returned baud %d\n", __FUNCTION__, baud));
+
+        /* default is 9600 */
+        if (!baud)
+                baud = 9600;
+
+        if (!the_port->fifosize)
+                the_port->fifosize = IOC4_MAX_CHARS;
+        the_port->timeout = ((the_port->fifosize * HZ * bits) / (baud / 10));
+        the_port->timeout += HZ / 50;   /* Add .02 seconds of slop */
+
+        the_port->ignore_status_mask = N_ALL_INPUT;
+
+        if (I_IGNPAR(info->tty))
+                the_port->ignore_status_mask &= ~(N_PARITY_ERROR
+                                                | N_FRAMING_ERROR);
+        if (I_IGNBRK(info->tty)) {
+                the_port->ignore_status_mask &= ~N_BREAK;
+                if (I_IGNPAR(info->tty))
+                        the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
+        }
+        if (!(cflag & CREAD)) {
+                /* ignore everything */
+                the_port->ignore_status_mask &= ~N_DATA_READY;
+        }
+
+        if (cflag & CRTSCTS)
+                info->flags |= ASYNC_CTS_FLOW;
+        else
+                info->flags &= ~ASYNC_CTS_FLOW;
+
+        /* Set the configuration and proper notification call */
+        DPRINT_CONFIG(("%s : port 0x%p cflag 0%o "
+                "config_port(baud %d data %d stop %d p enable %d parity %d),"
+                " notification 0x%x\n",
+             __FUNCTION__, (void *)port, cflag, baud, new_data, new_stop,
+             new_parity_enable, new_parity, the_port->ignore_status_mask));
+
+        if ((config_port(port, baud,            /* baud */
+                         new_data,              /* byte size */
+                         new_stop,              /* stop bits */
+                         new_parity_enable,     /* set parity */
+                         new_parity)) >= 0) {   /* parity 1==odd */
+                set_notification(port, the_port->ignore_status_mask, 1);
+        }
+}
+
+/**
+ * ic4_startup_local - Start up the serial port - returns >= 0 if no errors
+ * @the_port: Port to operate on
+ */
+static inline int ic4_startup_local(struct uart_port *the_port)
+{
+        int retval = 0;
+        struct ioc4_port *port;
+        struct uart_info *info;
+
+        if (!the_port)
+                return -1;
+
+        port = get_ioc4_port(the_port);
+        if (!port)
+                return -1;
+
+        info = the_port->info;
+        if (info->flags & UIF_INITIALIZED) {
+                return retval;
+        }
+
+        if (info->tty) {
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                        info->tty->alt_speed = 57600;
+                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                        info->tty->alt_speed = 115200;
+                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                        info->tty->alt_speed = 230400;
+                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                        info->tty->alt_speed = 460800;
+        }
+        local_open(port);
+
+        /* set the speed of the serial port */
+        ioc4_change_speed(the_port, info->tty->termios, (struct termios *)0);
+
+        /* enable hardware flow control - after ioc4_change_speed because
+         * ASYNC_CTS_FLOW is set there */
+        if (info->flags & ASYNC_CTS_FLOW) {
+                port->ip_sscr |= IOC4_SSCR_HFC_EN;
+                writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+        }
+        info->flags |= UIF_INITIALIZED;
+        return 0;
+}
+
+/*
+ * ioc4_cb_output_lowat - called when the output low water mark is hit
+ * @port: port to output
+ */
+static void ioc4_cb_output_lowat(struct ioc4_port *port)
+{
+        /* ip_lock is set on the call here */
+        if (port->ip_port) {
+                transmit_chars(port->ip_port);
+        }
+}
+
+
+/**
+ * handle_intr - service any interrupts for the given port - 2nd level
+ *                      called via sd_intr
+ * @arg: handler arg
+ * @sio_ir: ioc4regs
+ */
+static void handle_intr(void *arg, uint32_t sio_ir)
+{
+        struct ioc4_port *port = (struct ioc4_port *)arg;
+        struct hooks *hooks = port->ip_hooks;
+        unsigned int rx_high_rd_aborted = 0;
+        unsigned int flags;
+        struct uart_port *the_port;
+        int loop_counter;
+
+        /* Possible race condition here: The tx_mt interrupt bit may be
+         * cleared without the intervention of the interrupt handler,
+         * e.g. by a write.  If the top level interrupt handler reads a
+         * tx_mt, then some other processor does a write, starting up
+         * output, then we come in here, see the tx_mt and stop DMA, the
+         * output started by the other processor will hang.  Thus we can
+         * only rely on tx_mt being legitimate if it is read while the
+         * port lock is held.  Therefore this bit must be ignored in the
+         * passed in interrupt mask which was read by the top level
+         * interrupt handler since the port lock was not held at the time
+         * it was read.  We can only rely on this bit being accurate if it
+         * is read while the port lock is held.  So we'll clear it for now,
+         * and reload it later once we have the port lock.
+         */
+        sio_ir &= ~(hooks->intr_tx_mt);
+
+        spin_lock_irqsave(&port->ip_lock, flags);
+
+        loop_counter = MAXITER; /* to avoid hangs */
+
+        do {
+                uint32_t shadow;
+
+                if ( loop_counter-- <= 0 ) {
+                        printk(KERN_WARNING "IOC4 serial: "
+                                        "possible hang condition/"
+                                        "port stuck on interrupt.\n");
+                        break;
+                }
+
+                /* Handle a DCD change */
+                if (sio_ir & hooks->intr_delta_dcd) {
+                        /* ACK the interrupt */
+                        writel(hooks->intr_delta_dcd,
+                                &port->ip_mem->sio_ir);
+
+                        shadow = readl(&port->ip_serial_regs->shadow);
+
+                        if ((port->ip_notify & N_DDCD)
+                                        && (shadow & IOC4_SHADOW_DCD)
+                                        && (port->ip_port)) {
+                                the_port = port->ip_port;
+                                the_port->icount.dcd = 1;
+                                wake_up_interruptible
+                                            (&the_port-> info->delta_msr_wait);
+                        } else if ((port->ip_notify & N_DDCD)
+                                        && !(shadow & IOC4_SHADOW_DCD)) {
+                                /* Flag delta DCD/no DCD */
+                                port->ip_flags |= DCD_ON;
+                        }
+                }
+
+                /* Handle a CTS change */
+                if (sio_ir & hooks->intr_delta_cts) {
+                        /* ACK the interrupt */
+                        writel(hooks->intr_delta_cts,
+                                        &port->ip_mem->sio_ir);
+
+                        shadow = readl(&port->ip_serial_regs->shadow);
+
+                        if ((port->ip_notify & N_DCTS)
+                                        && (port->ip_port)) {
+                                the_port = port->ip_port;
+                                the_port->icount.cts =
+                                        (shadow & IOC4_SHADOW_CTS) ? 1 : 0;
+                                wake_up_interruptible
+                                        (&the_port->info->delta_msr_wait);
+                        }
+                }
+
+                /* rx timeout interrupt.  Must be some data available.  Put this
+                 * before the check for rx_high since servicing this condition
+                 * may cause that condition to clear.
+                 */
+                if (sio_ir & hooks->intr_rx_timer) {
+                        /* ACK the interrupt */
+                        writel(hooks->intr_rx_timer,
+                                &port->ip_mem->sio_ir);
+
+                        if ((port->ip_notify & N_DATA_READY)
+                                        && (port->ip_port)) {
+                                /* ip_lock is set on call here */
+                                receive_chars(port->ip_port);
+                        }
+                }
+
+                /* rx high interrupt. Must be after rx_timer.  */
+                else if (sio_ir & hooks->intr_rx_high) {
+                        /* Data available, notify upper layer */
+                        if ((port->ip_notify & N_DATA_READY)
+                                                && port->ip_port) {
+                                /* ip_lock is set on call here */
+                                receive_chars(port->ip_port);
+                        }
+
+                        /* We can't ACK this interrupt.  If receive_chars didn't
+                         * cause the condition to clear, we'll have to disable
+                         * the interrupt until the data is drained.
+                         * If the read was aborted, don't disable the interrupt
+                         * as this may cause us to hang indefinitely.  An
+                         * aborted read generally means that this interrupt
+                         * hasn't been delivered to the cpu yet anyway, even
+                         * though we see it as asserted when we read the sio_ir.
+                         */
+                        if ((sio_ir = PENDING(port)) & hooks->intr_rx_high) {
+                                if ((port->ip_flags & READ_ABORTED) == 0) {
+                                        port->ip_ienb &= ~hooks->intr_rx_high;
+                                        port->ip_flags |= INPUT_HIGH;
+                                } else {
+                                        rx_high_rd_aborted++;
+                                }
+                        }
+                }
+
+                /* We got a low water interrupt: notify upper layer to
+                 * send more data.  Must come before tx_mt since servicing
+                 * this condition may cause that condition to clear.
+                 */
+                if (sio_ir & hooks->intr_tx_explicit) {
+                        port->ip_flags &= ~LOWAT_WRITTEN;
+
+                        /* ACK the interrupt */
+                        writel(hooks->intr_tx_explicit,
+                                        &port->ip_mem->sio_ir);
+
+                        if (port->ip_notify & N_OUTPUT_LOWAT)
+                                ioc4_cb_output_lowat(port);
+                }
+
+                /* Handle tx_mt.  Must come after tx_explicit.  */
+                else if (sio_ir & hooks->intr_tx_mt) {
+                        /* If we are expecting a lowat notification
+                         * and we get to this point it probably means that for
+                         * some reason the tx_explicit didn't work as expected
+                         * (that can legitimately happen if the output buffer is
+                         * filled up in just the right way).
+                         * So send the notification now.
+                         */
+                        if (port->ip_notify & N_OUTPUT_LOWAT) {
+                                ioc4_cb_output_lowat(port);
+
+                                /* We need to reload the sio_ir since the lowat
+                                 * call may have caused another write to occur,
+                                 * clearing the tx_mt condition.
+                                 */
+                                sio_ir = PENDING(port);
+                        }
+
+                        /* If the tx_mt condition still persists even after the
+                         * lowat call, we've got some work to do.
+                         */
+                        if (sio_ir & hooks->intr_tx_mt) {
+
+                                /* If we are not currently expecting DMA input,
+                                 * and the transmitter has just gone idle,
+                                 * there is no longer any reason for DMA, so
+                                 * disable it.
+                                 */
+                                if (!(port->ip_notify
+                                                & (N_DATA_READY | N_DDCD))) {
+                                        BUG_ON(!(port->ip_sscr
+                                                        & IOC4_SSCR_DMA_EN));
+                                        port->ip_sscr &= ~IOC4_SSCR_DMA_EN;
+                                        writel(port->ip_sscr,
+                                           &port->ip_serial_regs->sscr);
+                                }
+
+                                /* Prevent infinite tx_mt interrupt */
+                                port->ip_ienb &= ~hooks->intr_tx_mt;
+                        }
+                }
+                sio_ir = PENDING(port);
+
+                /* if the read was aborted and only hooks->intr_rx_high,
+                 * clear hooks->intr_rx_high, so we do not loop forever.
+                 */
+
+                if (rx_high_rd_aborted && (sio_ir == hooks->intr_rx_high)) {
+                        sio_ir &= ~hooks->intr_rx_high;
+                }
+        } while (sio_ir & hooks->intr_all);
+
+        spin_unlock_irqrestore(&port->ip_lock, flags);
+
+        /* Re-enable interrupts before returning from interrupt handler.
+         * Getting interrupted here is okay.  It'll just v() our semaphore, and
+         * we'll come through the loop again.
+         */
+
+        write_ireg(port->ip_ioc4_soft, port->ip_ienb, IOC4_W_IES,
+                                                        IOC4_SIO_INTR_TYPE);
+}
+
+/*
+ * ioc4_cb_post_ncs - called for some basic errors
+ * @port: port to use
+ * @ncs: event
+ */
+static void ioc4_cb_post_ncs(struct uart_port *the_port, int ncs)
+{
+        struct uart_icount *icount;
+
+        icount = &the_port->icount;
+
+        if (ncs & NCS_BREAK)
+                icount->brk++;
+        if (ncs & NCS_FRAMING)
+                icount->frame++;
+        if (ncs & NCS_OVERRUN)
+                icount->overrun++;
+        if (ncs & NCS_PARITY)
+                icount->parity++;
+}
+
+/**
+ * do_read - Read in bytes from the port.  Return the number of bytes
+ *                      actually read.
+ * @the_port: port to use
+ * @buf: place to put the stuff we read
+ * @len: how big 'buf' is
+ */
+
+static inline int do_read(struct uart_port *the_port, unsigned char *buf,
+                                int len)
+{
+        int prod_ptr, cons_ptr, total;
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        struct ring *inring;
+        struct ring_entry *entry;
+        struct hooks *hooks = port->ip_hooks;
+        int byte_num;
+        char *sc;
+        int loop_counter;
+
+        BUG_ON(!(len >= 0));
+        BUG_ON(!port);
+
+        /* There is a nasty timing issue in the IOC4. When the rx_timer
+         * expires or the rx_high condition arises, we take an interrupt.
+         * At some point while servicing the interrupt, we read bytes from
+         * the ring buffer and re-arm the rx_timer.  However the rx_timer is
+         * not started until the first byte is received *after* it is armed,
+         * and any bytes pending in the rx construction buffers are not drained
+         * to memory until either there are 4 bytes available or the rx_timer
+         * expires.  This leads to a potential situation where data is left
+         * in the construction buffers forever - 1 to 3 bytes were received
+         * after the interrupt was generated but before the rx_timer was
+         * re-armed. At that point as long as no subsequent bytes are received
+         * the timer will never be started and the bytes will remain in the
+         * construction buffer forever.  The solution is to execute a DRAIN
+         * command after rearming the timer.  This way any bytes received before
+         * the DRAIN will be drained to memory, and any bytes received after
+         * the DRAIN will start the TIMER and be drained when it expires.
+         * Luckily, this only needs to be done when the DMA buffer is empty
+         * since there is no requirement that this function return all
+         * available data as long as it returns some.
+         */
+        /* Re-arm the timer */
+        writel(port->ip_rx_cons | IOC4_SRCIR_ARM,
+                        &port->ip_serial_regs->srcir);
+
+        prod_ptr = readl(&port->ip_serial_regs->srpir) & PROD_CONS_MASK;
+        cons_ptr = port->ip_rx_cons;
+
+        if (prod_ptr == cons_ptr) {
+                int reset_dma = 0;
+
+                /* Input buffer appears empty, do a flush. */
+
+                /* DMA must be enabled for this to work. */
+                if (!(port->ip_sscr & IOC4_SSCR_DMA_EN)) {
+                        port->ip_sscr |= IOC4_SSCR_DMA_EN;
+                        reset_dma = 1;
+                }
+
+                /* Potential race condition: we must reload the srpir after
+                 * issuing the drain command, otherwise we could think the rx
+                 * buffer is empty, then take a very long interrupt, and when
+                 * we come back it's full and we wait forever for the drain to
+                 * complete.
+                 */
+                writel(port->ip_sscr | IOC4_SSCR_RX_DRAIN,
+                                &port->ip_serial_regs->sscr);
+                prod_ptr = readl(&port->ip_serial_regs->srpir)
+                                & PROD_CONS_MASK;
+
+                /* We must not wait for the DRAIN to complete unless there are
+                 * at least 8 bytes (2 ring entries) available to receive the
+                 * data otherwise the DRAIN will never complete and we'll
+                 * deadlock here.
+                 * In fact, to make things easier, I'll just ignore the flush if
+                 * there is any data at all now available.
+                 */
+                if (prod_ptr == cons_ptr) {
+                        loop_counter = 0;
+                        while (readl(&port->ip_serial_regs->sscr) &
+                                                IOC4_SSCR_RX_DRAIN) {
+                                loop_counter++;
+                                if (loop_counter > MAXITER)
+                                        return -1;
+                        }
+
+                        /* SIGH. We have to reload the prod_ptr *again* since
+                         * the drain may have caused it to change
+                         */
+                        prod_ptr = readl(&port->ip_serial_regs->srpir)
+                                                        & PROD_CONS_MASK;
+                }
+                if (reset_dma) {
+                        port->ip_sscr &= ~IOC4_SSCR_DMA_EN;
+                        writel(port->ip_sscr, &port->ip_serial_regs->sscr);
+                }
+        }
+        inring = port->ip_inring;
+        port->ip_flags &= ~READ_ABORTED;
+
+        total = 0;
+        loop_counter = 0xfffff; /* to avoid hangs */
+
+        /* Grab bytes from the hardware */
+        while ((prod_ptr != cons_ptr) && (len > 0)) {
+                entry = (struct ring_entry *)((caddr_t)inring + cons_ptr);
+
+                if ( loop_counter-- <= 0 ) {
+                        printk(KERN_WARNING "IOC4 serial: "
+                                        "possible hang condition/"
+                                        "port stuck on read.\n");
+                        break;
+                }
+
+                /* According to the producer pointer, this ring entry
+                 * must contain some data.  But if the PIO happened faster
+                 * than the DMA, the data may not be available yet, so let's
+                 * wait until it arrives.
+                 */
+                if ((entry->ring_allsc & RING_ANY_VALID) == 0) {
+                        /* Indicate the read is aborted so we don't disable
+                         * the interrupt thinking that the consumer is
+                         * congested.
+                         */
+                        port->ip_flags |= READ_ABORTED;
+                        len = 0;
+                        break;
+                }
+
+                /* Load the bytes/status out of the ring entry */
+                for (byte_num = 0; byte_num < 4 && len > 0; byte_num++) {
+                        sc = &(entry->ring_sc[byte_num]);
+
+                        /* Check for change in modem state or overrun */
+                        if ((*sc & IOC4_RXSB_MODEM_VALID)
+                                                && (port->ip_notify & N_DDCD)) {
+                                /* Notify upper layer if DCD dropped */
+
+                                if ((port->ip_flags & DCD_ON)
+                                                && !(*sc & IOC4_RXSB_DCD)) {
+
+                                        /* If we have already copied some data,
+                                         * return it.  We'll pick up the carrier
+                                         * drop on the next pass.  That way we
+                                         * don't throw away the data that has
+                                         * already been copied back to
+                                         * the caller's buffer.
+                                         */
+                                        if (total > 0) {
+                                                len = 0;
+                                                break;
+                                        }
+                                        port->ip_flags &= ~DCD_ON;
+
+                                        /* Turn off this notification so the
+                                         * carrier drop protocol won't see it
+                                         * again when it does a read.
+                                         */
+                                        *sc &= ~IOC4_RXSB_MODEM_VALID;
+
+                                        /* To keep things consistent, we need
+                                         * to update the consumer pointer so
+                                         * the next reader won't come in and
+                                         * try to read the same ring entries
+                                         * again. This must be done here before
+                                         * the dcd change.
+                                         */
+
+                                        if ((entry->ring_allsc & RING_ANY_VALID)
+                                                                        == 0) {
+                                                cons_ptr += (int)sizeof
+                                                        (struct ring_entry);
+                                                cons_ptr &= PROD_CONS_MASK;
+                                        }
+                                        writel(cons_ptr,
+                                                &port->ip_serial_regs->srcir);
+                                        port->ip_rx_cons = cons_ptr;
+
+                                        /* Notify upper layer of carrier drop */
+                                        if ((port->ip_notify & N_DDCD)
+                                                   && port->ip_port) {
+                                                the_port->icount.dcd = 0;
+                                                wake_up_interruptible
+                                                    (&the_port->info->
+                                                        delta_msr_wait);
+                                        }
+
+                                        /* If we had any data to return, we
+                                         * would have returned it above.
+                                         */
+                                        return 0;
+                                }
+                        }
+                        if (*sc & IOC4_RXSB_MODEM_VALID) {
+                                /* Notify that an input overrun occurred */
+                                if ((*sc & IOC4_RXSB_OVERRUN)
+                                    && (port->ip_notify & N_OVERRUN_ERROR)) {
+                                        ioc4_cb_post_ncs(the_port, NCS_OVERRUN);
+                                }
+                                /* Don't look at this byte again */
+                                *sc &= ~IOC4_RXSB_MODEM_VALID;
+                        }
+
+                        /* Check for valid data or RX errors */
+                        if ((*sc & IOC4_RXSB_DATA_VALID) &&
+                                        ((*sc & (IOC4_RXSB_PAR_ERR
+                                                        | IOC4_RXSB_FRAME_ERR
+                                                        | IOC4_RXSB_BREAK))
+                                        && (port->ip_notify & (N_PARITY_ERROR
+                                                        | N_FRAMING_ERROR
+                                                        | N_BREAK)))) {
+                                /* There is an error condition on the next byte.
+                                 * If we have already transferred some bytes,
+                                 * we'll stop here. Otherwise if this is the
+                                 * first byte to be read, we'll just transfer
+                                 * it alone after notifying the
+                                 * upper layer of its status.
+                                 */
+                                if (total > 0) {
+                                        len = 0;
+                                        break;
+                                } else {
+                                        if ((*sc & IOC4_RXSB_PAR_ERR) &&
+                                           (port->ip_notify & N_PARITY_ERROR)) {
+                                                ioc4_cb_post_ncs(the_port,
+                                                                NCS_PARITY);
+                                        }
+                                        if ((*sc & IOC4_RXSB_FRAME_ERR) &&
+                                           (port->ip_notify & N_FRAMING_ERROR)){
+                                                ioc4_cb_post_ncs(the_port,
+                                                                NCS_FRAMING);
+                                        }
+                                        if ((*sc & IOC4_RXSB_BREAK)
+                                            && (port->ip_notify & N_BREAK)) {
+                                                        ioc4_cb_post_ncs
+                                                                    (the_port,
+                                                                     NCS_BREAK);
+                                        }
+                                        len = 1;
+                                }
+                        }
+                        if (*sc & IOC4_RXSB_DATA_VALID) {
+                                *sc &= ~IOC4_RXSB_DATA_VALID;
+                                *buf = entry->ring_data[byte_num];
+                                buf++;
+                                len--;
+                                total++;
+                        }
+                }
+
+                /* If we used up this entry entirely, go on to the next one,
+                 * otherwise we must have run out of buffer space, so
+                 * leave the consumer pointer here for the next read in case
+                 * there are still unread bytes in this entry.
+                 */
+                if ((entry->ring_allsc & RING_ANY_VALID) == 0) {
+                        cons_ptr += (int)sizeof(struct ring_entry);
+                        cons_ptr &= PROD_CONS_MASK;
+                }
+        }
+
+        /* Update consumer pointer and re-arm rx timer interrupt */
+        writel(cons_ptr, &port->ip_serial_regs->srcir);
+        port->ip_rx_cons = cons_ptr;
+
+        /* If we have now dipped below the rx high water mark and we have
+         * rx_high interrupt turned off, we can now turn it back on again.
+         */
+        if ((port->ip_flags & INPUT_HIGH) && (((prod_ptr - cons_ptr)
+                        & PROD_CONS_MASK) < ((port->ip_sscr &
+                                IOC4_SSCR_RX_THRESHOLD)
+                                        << IOC4_PROD_CONS_PTR_OFF))) {
+                port->ip_flags &= ~INPUT_HIGH;
+                enable_intrs(port, hooks->intr_rx_high);
+        }
+        return total;
+}
+/**
+ * receive_chars - upper level read. Called with ip_lock.
+ * @the_port: port to read from
+ */
+static void receive_chars(struct uart_port *the_port)
+{
+        struct tty_struct *tty;
+        unsigned char ch[IOC4_MAX_CHARS];
+        int read_count, request_count;
+        struct uart_icount *icount;
+        struct uart_info *info = the_port->info;
+
+        /* Make sure all the pointers are "good" ones */
+        if (!info)
+                return;
+        if (!info->tty)
+                return;
+
+        tty = info->tty;
+
+        request_count = TTY_FLIPBUF_SIZE - tty->flip.count - 1;
+
+        if (request_count > 0) {
+                if (request_count > IOC4_MAX_CHARS - 2)
+                        request_count = IOC4_MAX_CHARS - 2;
+                icount = &the_port->icount;
+                read_count = do_read(the_port, ch, request_count);
+                if (read_count > 0) {
+                        memcpy(tty->flip.char_buf_ptr, ch, read_count);
+                        memset(tty->flip.flag_buf_ptr, TTY_NORMAL, read_count);
+                        tty->flip.char_buf_ptr += read_count;
+                        tty->flip.flag_buf_ptr += read_count;
+                        tty->flip.count += read_count;
+                        icount->rx += read_count;
+                }
+        }
+        tty_flip_buffer_push(tty);
+}
+
+/**
+ * ic4_type - What type of console are we?
+ * @port: Port to operate with (we ignore since we only have one port)
+ *
+ */
+static const char *ic4_type(struct uart_port *the_port)
+{
+        return "SGI IOC4 Serial";
+}
+
+/**
+ * ic4_tx_empty - Is the transmitter empty?  We pretend we're always empty
+ * @port: Port to operate on (we ignore since we always return 1)
+ *
+ */
+static unsigned int ic4_tx_empty(struct uart_port *the_port)
+{
+        return 1;
+}
+
+/**
+ * ic4_stop_tx - stop the transmitter
+ * @port: Port to operate on
+ * @tty_stop: Set to 1 if called via uart_stop
+ *
+ */
+static void ic4_stop_tx(struct uart_port *the_port, unsigned int tty_stop)
+{
+}
+
+/**
+ * null_void_function -
+ * @port: Port to operate on
+ *
+ */
+static void null_void_function(struct uart_port *the_port)
+{
+}
+
+/**
+ * ic4_shutdown - shut down the port - free irq and disable
+ * @port: Port to shut down
+ *
+ */
+static void ic4_shutdown(struct uart_port *the_port)
+{
+        unsigned long port_flags;
+        struct ioc4_port *port;
+        struct uart_info *info;
+
+        port = get_ioc4_port(the_port);
+        if (!port)
+                return;
+
+        info = the_port->info;
+
+        if (!(info->flags & UIF_INITIALIZED))
+                return;
+
+        wake_up_interruptible(&info->delta_msr_wait);
+
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        spin_lock_irqsave(&port->ip_lock, port_flags);
+        set_notification(port, N_ALL, 0);
+        info->flags &= ~UIF_INITIALIZED;
+        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+}
+
+/**
+ * ic4_set_mctrl - set control lines (dtr, rts, etc)
+ * @port: Port to operate on
+ * @mctrl: Lines to set/unset
+ *
+ */
+static void ic4_set_mctrl(struct uart_port *the_port, unsigned int mctrl)
+{
+        unsigned char mcr = 0;
+
+        if (mctrl & TIOCM_RTS)
+                mcr |= UART_MCR_RTS;
+        if (mctrl & TIOCM_DTR)
+                mcr |= UART_MCR_DTR;
+        if (mctrl & TIOCM_OUT1)
+                mcr |= UART_MCR_OUT1;
+        if (mctrl & TIOCM_OUT2)
+                mcr |= UART_MCR_OUT2;
+        if (mctrl & TIOCM_LOOP)
+                mcr |= UART_MCR_LOOP;
+
+        set_mcr(the_port, 1, mcr, IOC4_SHADOW_DTR);
+}
+
+/**
+ * ic4_get_mctrl - get control line info
+ * @port: port to operate on
+ *
+ */
+static unsigned int ic4_get_mctrl(struct uart_port *the_port)
+{
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        uint32_t shadow;
+        unsigned int ret = 0;
+
+        if (!port)
+                return 0;
+
+        shadow = readl(&port->ip_serial_regs->shadow);
+        if (shadow & IOC4_SHADOW_DCD)
+                ret |= TIOCM_CAR;
+        if (shadow & IOC4_SHADOW_DR)
+                ret |= TIOCM_DSR;
+        if (shadow & IOC4_SHADOW_CTS)
+                ret |= TIOCM_CTS;
+        return ret;
+}
+
+/**
+ * ic4_start_tx - Start transmitter, flush any output
+ * @port: Port to operate on
+ * @tty_stop: Set to 1 if called via uart_start
+ *
+ */
+static void ic4_start_tx(struct uart_port *the_port, unsigned int tty_stop)
+{
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        unsigned long flags;
+
+        if (port) {
+                spin_lock_irqsave(&port->ip_lock, flags);
+                transmit_chars(the_port);
+                spin_unlock_irqrestore(&port->ip_lock, flags);
+        }
+}
+
+/**
+ * ic4_break_ctl - handle breaks
+ * @port: Port to operate on
+ * @break_state: Break state
+ *
+ */
+static void ic4_break_ctl(struct uart_port *the_port, int break_state)
+{
+}
+
+/**
+ * ic4_startup - Start up the serial port - always return 0 (We're always on)
+ * @port: Port to operate on
+ *
+ */
+static int ic4_startup(struct uart_port *the_port)
+{
+        int retval;
+        struct ioc4_port *port;
+        struct ioc4_control *control;
+        struct uart_info *info;
+        unsigned long port_flags;
+
+        if (!the_port) {
+                return -ENODEV;
+        }
+        port = get_ioc4_port(the_port);
+        if (!port) {
+                return -ENODEV;
+        }
+        info = the_port->info;
+
+        control = port->ip_control;
+        if (!control) {
+                return -ENODEV;
+        }
+
+        /* Start up the serial port */
+        spin_lock_irqsave(&port->ip_lock, port_flags);
+        retval = ic4_startup_local(the_port);
+        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+        return retval;
+}
+
+/**
+ * ic4_set_termios - set termios stuff
+ * @port: port to operate on
+ * @termios: New settings
+ * @termios: Old
+ *
+ */
+static void
+ic4_set_termios(struct uart_port *the_port,
+                struct termios *termios, struct termios *old_termios)
+{
+        struct ioc4_port *port = get_ioc4_port(the_port);
+        unsigned long port_flags;
+
+        spin_lock_irqsave(&port->ip_lock, port_flags);
+        ioc4_change_speed(the_port, termios, old_termios);
+        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+}
+
+/**
+ * ic4_request_port - allocate resources for port - no op....
+ * @port: port to operate on
+ *
+ */
+static int ic4_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/* Associate the uart functions above - given to serial core */
+
+static struct uart_ops ioc4_ops = {
+        .tx_empty       = ic4_tx_empty,
+        .set_mctrl      = ic4_set_mctrl,
+        .get_mctrl      = ic4_get_mctrl,
+        .stop_tx        = ic4_stop_tx,
+        .start_tx       = ic4_start_tx,
+        .stop_rx        = null_void_function,
+        .enable_ms      = null_void_function,
+        .break_ctl      = ic4_break_ctl,
+        .startup        = ic4_startup,
+        .shutdown       = ic4_shutdown,
+        .set_termios    = ic4_set_termios,
+        .type           = ic4_type,
+        .release_port   = null_void_function,
+        .request_port   = ic4_request_port,
+};
+
+/*
+ * Boot-time initialization code
+ */
+
+static struct uart_driver ioc4_uart = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "ioc4_serial",
+        .dev_name       = DEVICE_NAME,
+        .major          = DEVICE_MAJOR,
+        .minor          = DEVICE_MINOR,
+        .nr             = IOC4_NUM_CARDS * IOC4_NUM_SERIAL_PORTS,
+};
+
+/**
+ * ioc4_serial_core_attach - register with serial core
+ *              This is done during pci probing
+ * @pdev: handle for this card
+ */
+static inline int
+ioc4_serial_core_attach(struct pci_dev *pdev)
+{
+        struct ioc4_port *port;
+        struct uart_port *the_port;
+        struct ioc4_control *control = pci_get_drvdata(pdev);
+        int ii;
+
+        DPRINT_CONFIG(("%s: attach pdev 0x%p - control 0x%p\n",
+                        __FUNCTION__, pdev, (void *)control));
+
+        if (!control)
+                return -ENODEV;
+
+        /* once around for each port on this card */
+        for (ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++) {
+                the_port = &control->ic_port[ii].icp_uart_port;
+                port = control->ic_port[ii].icp_port;
+                port->ip_port = the_port;
+
+                DPRINT_CONFIG(("%s: attach the_port 0x%p / port 0x%p\n",
+                                __FUNCTION__, (void *)the_port,
+                                (void *)port));
+
+                spin_lock_init(&the_port->lock);
+                /* membase, iobase and mapbase just need to be non-0 */
+                the_port->membase = (unsigned char __iomem *)1;
+                the_port->line = the_port->iobase = ii;
+                the_port->mapbase = 1;
+                the_port->type = PORT_16550A;
+                the_port->fifosize = IOC4_MAX_CHARS;
+                the_port->ops = &ioc4_ops;
+                the_port->irq = control->ic_irq;
+                the_port->dev = &pdev->dev;
+                if (uart_add_one_port(&ioc4_uart, the_port) < 0) {
+                        printk(KERN_WARNING
+                                       "%s: unable to add port %d\n",
+                                       __FUNCTION__, the_port->line);
+                } else {
+                        DPRINT_CONFIG(
+                                    ("IOC4 serial driver port %d irq = %d\n",
+                                       the_port->line, the_port->irq));
+                }
+                /* all ports are rs232 for now */
+                ioc4_set_proto(port, PROTO_RS232);
+        }
+        return 0;
+}
+
+/**
+ * ioc4_serial_attach_one - register attach function
+ *              called per card found from ioc4_serial_detect as part
+ *              of module_init().
+ * @pdev: handle for this card
+ * @pci_id: pci id for this card
+ */
+int
+ioc4_serial_attach_one(struct pci_dev *pdev, const struct pci_device_id *pci_id)
+{
+        struct ioc4_mem __iomem *mem;
+        unsigned long tmp_addr, tmp_addr1;
+        struct ioc4_serial __iomem *serial;
+        struct ioc4_soft *soft;
+        struct ioc4_control *control;
+        int tmp, ret = 0;
+
+
+        DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, pdev, pci_id));
+
+        /* Map in the ioc4 memory */
+        tmp_addr = pci_resource_start(pdev, 0);
+        if (!tmp_addr) {
+                printk(KERN_WARNING
+                         "ioc4 (%p) : unable to get PIO mapping for "
+                                "MEM space\n", (void *)pdev);
+                return -ENODEV;
+        }
+        if (!request_region(tmp_addr, sizeof(struct ioc4_mem), "sioc4_mem")) {
+                printk(KERN_ALERT
+                        "ioc4 (%p): unable to get request region for "
+                        "MEM space\n", (void *)pdev);
+                return -ENODEV;
+        }
+        mem = ioremap(tmp_addr, sizeof(struct ioc4_mem));
+        if (!mem) {
+                printk(KERN_WARNING
+                         "ioc4 (%p) : unable to remap ioc4 memory\n",
+                                (void *)pdev);
+                ret = -ENODEV;
+                goto out1;
+        }
+
+        /* request serial registers */
+        tmp_addr1 = pci_resource_start(pdev, 0) + IOC4_SERIAL_OFFSET;
+
+        if (!request_region(tmp_addr1, sizeof(struct ioc4_serial),
+                                        "sioc4_uart")) {
+                printk(KERN_WARNING
+                        "ioc4 (%p): unable to get request region for "
+                                "uart space\n", (void *)pdev);
+                ret = -ENODEV;
+                goto out1;
+        }
+        serial = ioremap(tmp_addr1, sizeof(struct ioc4_serial));
+        if (!serial) {
+                printk(KERN_WARNING
+                         "ioc4 (%p) : unable to remap ioc4 serial register\n",
+                                (void *)pdev);
+                ret = -ENODEV;
+                goto out2;
+        }
+        DPRINT_CONFIG(("%s : mem 0x%p, serial 0x%p\n",
+                                __FUNCTION__, (void *)mem, (void *)serial));
+
+        /* Get memory for the new card */
+        control = kmalloc(sizeof(struct ioc4_control) * IOC4_NUM_SERIAL_PORTS,
+                                                GFP_KERNEL);
+
+        if (!control) {
+                printk(KERN_WARNING "ioc4_attach_one"
+                       ": unable to get memory for the IOC4\n");
+                ret = -ENOMEM;
+                goto out2;
+        }
+        memset(control, 0, sizeof(struct ioc4_control));
+        pci_set_drvdata(pdev, control);
+
+        /* Allocate the soft structure */
+        soft = kmalloc(sizeof(struct ioc4_soft), GFP_KERNEL);
+        if (!soft) {
+                printk(KERN_WARNING
+                       "ioc4 (%p): unable to get memory for the soft struct\n",
+                       (void *)pdev);
+                ret = -ENOMEM;
+                goto out3;
+        }
+        memset(soft, 0, sizeof(struct ioc4_soft));
+
+        spin_lock_init(&soft->is_ir_lock);
+        soft->is_ioc4_mem_addr = mem;
+        soft->is_ioc4_serial_addr = serial;
+
+        /* Init the IOC4 */
+        pci_read_config_dword(pdev, PCI_COMMAND, &tmp);
+        pci_write_config_dword(pdev, PCI_COMMAND,
+                               tmp | PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
+
+        writel(0xf << IOC4_SIO_CR_CMD_PULSE_SHIFT, &mem->sio_cr);
+
+        /* Enable serial port mode select generic PIO pins as outputs */
+        writel(IOC4_GPCR_UART0_MODESEL | IOC4_GPCR_UART1_MODESEL
+                | IOC4_GPCR_UART2_MODESEL | IOC4_GPCR_UART3_MODESEL,
+                &mem->gpcr_s);
+
+        /* Clear and disable all interrupts */
+        write_ireg(soft, ~0, IOC4_W_IEC, IOC4_SIO_INTR_TYPE);
+        writel(~0, &mem->sio_ir);
+        write_ireg(soft, ~(IOC4_OTHER_IR_ATA_INT | IOC4_OTHER_IR_ATA_MEMERR),
+                        IOC4_W_IEC, IOC4_OTHER_INTR_TYPE);
+        writel(~(IOC4_OTHER_IR_ATA_MEMERR | IOC4_OTHER_IR_ATA_MEMERR),
+                                        &mem->other_ir);
+        control->ic_soft = soft;
+        if (!request_irq(pdev->irq, ioc4_intr, SA_SHIRQ,
+                                "sgi-ioc4serial", (void *)soft)) {
+                control->ic_irq = pdev->irq;
+        } else {
+                printk(KERN_WARNING
+                    "%s : request_irq fails for IRQ 0x%x\n ",
+                        __FUNCTION__, pdev->irq);
+        }
+        if ((ret = ioc4_attach_local(pdev, control, soft,
+                                soft->is_ioc4_mem_addr,
+                                soft->is_ioc4_serial_addr)))
+                goto out4;
+
+        /* register port with the serial core */
+
+        if ((ret = ioc4_serial_core_attach(pdev)))
+                goto out4;
+
+        return ret;
+
+        /* error exits that give back resources */
+out4:
+        kfree(soft);
+out3:
+        kfree(control);
+out2:
+        release_region(tmp_addr1, sizeof(struct ioc4_serial));
+out1:
+        release_region(tmp_addr, sizeof(struct ioc4_mem));
+
+        return ret;
+}
+
+
+/**
+ * ioc4_serial_remove_one - detach function
+ *
+ * @pdev: handle for this card
+ */
+
+#if 0
+void ioc4_serial_remove_one(struct pci_dev *pdev)
+{
+        int ii;
+        struct ioc4_control *control;
+        struct uart_port *the_port;
+        struct ioc4_port *port;
+        struct ioc4_soft *soft;
+
+        control = pci_get_drvdata(pdev);
+
+        for (ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++) {
+                the_port = &control->ic_port[ii].icp_uart_port;
+                if (the_port) {
+                        uart_remove_one_port(&ioc4_uart, the_port);
+                }
+                port = control->ic_port[ii].icp_port;
+                if (!(ii & 1) && port) {
+                        pci_free_consistent(port->ip_pdev,
+                                        TOTAL_RING_BUF_SIZE,
+                                        (void *)port->ip_cpu_ringbuf,
+                                        port->ip_dma_ringbuf);
+                        kfree(port);
+                }
+        }
+        soft = control->ic_soft;
+        if (soft) {
+                free_irq(control->ic_irq, (void *)soft);
+                if (soft->is_ioc4_serial_addr) {
+                        release_region((unsigned long)
+                             soft->is_ioc4_serial_addr,
+                                sizeof(struct ioc4_serial));
+                }
+                kfree(soft);
+        }
+        kfree(control);
+        pci_set_drvdata(pdev, NULL);
+        uart_unregister_driver(&ioc4_uart);
+}
+#endif
+
+/**
+ * ioc4_serial_init - module init
+ */
+int ioc4_serial_init(void)
+{
+        int ret;
+
+        /* register with serial core */
+        if ((ret = uart_register_driver(&ioc4_uart)) < 0) {
+                printk(KERN_WARNING
+                        "%s: Couldn't register IOC4 serial driver\n",
+                        __FUNCTION__);
+                return ret;
+        }
+        return 0;
+}
+
+MODULE_AUTHOR("Pat Gefre - Silicon Graphics Inc. (SGI) <pfg@sgi.com>");
+MODULE_DESCRIPTION("Serial PCI driver module for SGI IOC4 Base-IO Card");
+MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(ioc4_serial_init);
+EXPORT_SYMBOL(ioc4_serial_attach_one);
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
new file mode 100644
index 000000000000..3ea46c069f6f
--- /dev/null
+++ b/drivers/serial/ip22zilog.c
@@ -0,0 +1,1271 @@
+/*
+ * Driver for Zilog serial chips found on SGI workstations and
+ * servers.  This driver could actually be made more generic.
+ *
+ * This is based on the drivers/serial/sunzilog.c code as of 2.6.0-test7 and the
+ * old drivers/sgi/char/sgiserial.c code which itself is based of the original
+ * drivers/sbus/char/zs.c code.  A lot of code has been simply moved over
+ * directly from there but much has been rewritten.  Credits therefore go out
+ * to David S. Miller, Eddie C. Dost, Pete Zaitcev, Ted Ts'o and Alex Buell
+ * for their work there.
+ *
+ *  Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org)
+ *  Copyright (C) 2002 David S. Miller (davem@redhat.com)
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/ptrace.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/circ_buf.h>
+#include <linux/serial.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#include <linux/spinlock.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/sgialib.h>
+#include <asm/sgi/ioc.h>
+#include <asm/sgi/hpc3.h>
+#include <asm/sgi/ip22.h>
+
+#if defined(CONFIG_SERIAL_IP22_ZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+#include "ip22zilog.h"
+
+void ip22_do_break(void);
+
+/*
+ * On IP22 we need to delay after register accesses but we do not need to
+ * flush writes.
+ */
+#define ZSDELAY()               udelay(5)
+#define ZSDELAY_LONG()          udelay(20)
+#define ZS_WSYNC(channel)       do { } while (0)
+
+#define NUM_IP22ZILOG           1
+#define NUM_CHANNELS            (NUM_IP22ZILOG * 2)
+
+#define ZS_CLOCK                3672000 /* Zilog input clock rate. */
+#define ZS_CLOCK_DIVISOR        16      /* Divisor this driver uses. */
+
+/*
+ * We wrap our port structure around the generic uart_port.
+ */
+struct uart_ip22zilog_port {
+        struct uart_port                port;
+
+        /* IRQ servicing chain.  */
+        struct uart_ip22zilog_port      *next;
+
+        /* Current values of Zilog write registers.  */
+        unsigned char                   curregs[NUM_ZSREGS];
+
+        unsigned int                    flags;
+#define IP22ZILOG_FLAG_IS_CONS          0x00000004
+#define IP22ZILOG_FLAG_IS_KGDB          0x00000008
+#define IP22ZILOG_FLAG_MODEM_STATUS     0x00000010
+#define IP22ZILOG_FLAG_IS_CHANNEL_A     0x00000020
+#define IP22ZILOG_FLAG_REGS_HELD        0x00000040
+#define IP22ZILOG_FLAG_TX_STOPPED       0x00000080
+#define IP22ZILOG_FLAG_TX_ACTIVE        0x00000100
+
+        unsigned int                    cflag;
+
+        /* L1-A keyboard break state.  */
+        int                             kbd_id;
+        int                             l1_down;
+
+        unsigned char                   parity_mask;
+        unsigned char                   prev_status;
+};
+
+#define ZILOG_CHANNEL_FROM_PORT(PORT)   ((struct zilog_channel *)((PORT)->membase))
+#define UART_ZILOG(PORT)                ((struct uart_ip22zilog_port *)(PORT))
+#define IP22ZILOG_GET_CURR_REG(PORT, REGNUM)            \
+        (UART_ZILOG(PORT)->curregs[REGNUM])
+#define IP22ZILOG_SET_CURR_REG(PORT, REGNUM, REGVAL)    \
+        ((UART_ZILOG(PORT)->curregs[REGNUM]) = (REGVAL))
+#define ZS_IS_CONS(UP)  ((UP)->flags & IP22ZILOG_FLAG_IS_CONS)
+#define ZS_IS_KGDB(UP)  ((UP)->flags & IP22ZILOG_FLAG_IS_KGDB)
+#define ZS_WANTS_MODEM_STATUS(UP)       ((UP)->flags & IP22ZILOG_FLAG_MODEM_STATUS)
+#define ZS_IS_CHANNEL_A(UP)     ((UP)->flags & IP22ZILOG_FLAG_IS_CHANNEL_A)
+#define ZS_REGS_HELD(UP)        ((UP)->flags & IP22ZILOG_FLAG_REGS_HELD)
+#define ZS_TX_STOPPED(UP)       ((UP)->flags & IP22ZILOG_FLAG_TX_STOPPED)
+#define ZS_TX_ACTIVE(UP)        ((UP)->flags & IP22ZILOG_FLAG_TX_ACTIVE)
+
+/* Reading and writing Zilog8530 registers.  The delays are to make this
+ * driver work on the IP22 which needs a settling delay after each chip
+ * register access, other machines handle this in hardware via auxiliary
+ * flip-flops which implement the settle time we do in software.
+ *
+ * The port lock must be held and local IRQs must be disabled
+ * when {read,write}_zsreg is invoked.
+ */
+static unsigned char read_zsreg(struct zilog_channel *channel,
+                                unsigned char reg)
+{
+        unsigned char retval;
+
+        writeb(reg, &channel->control);
+        ZSDELAY();
+        retval = readb(&channel->control);
+        ZSDELAY();
+
+        return retval;
+}
+
+static void write_zsreg(struct zilog_channel *channel,
+                        unsigned char reg, unsigned char value)
+{
+        writeb(reg, &channel->control);
+        ZSDELAY();
+        writeb(value, &channel->control);
+        ZSDELAY();
+}
+
+static void ip22zilog_clear_fifo(struct zilog_channel *channel)
+{
+        int i;
+
+        for (i = 0; i < 32; i++) {
+                unsigned char regval;
+
+                regval = readb(&channel->control);
+                ZSDELAY();
+                if (regval & Rx_CH_AV)
+                        break;
+
+                regval = read_zsreg(channel, R1);
+                readb(&channel->data);
+                ZSDELAY();
+
+                if (regval & (PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        writeb(ERR_RES, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+                }
+        }
+}
+
+/* This function must only be called when the TX is not busy.  The UART
+ * port lock must be held and local interrupts disabled.
+ */
+static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs)
+{
+        int i;
+
+        /* Let pending transmits finish.  */
+        for (i = 0; i < 1000; i++) {
+                unsigned char stat = read_zsreg(channel, R1);
+                if (stat & ALL_SNT)
+                        break;
+                udelay(100);
+        }
+
+        writeb(ERR_RES, &channel->control);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+
+        ip22zilog_clear_fifo(channel);
+
+        /* Disable all interrupts.  */
+        write_zsreg(channel, R1,
+                    regs[R1] & ~(RxINT_MASK | TxINT_ENAB | EXT_INT_ENAB));
+
+        /* Set parity, sync config, stop bits, and clock divisor.  */
+        write_zsreg(channel, R4, regs[R4]);
+
+        /* Set misc. TX/RX control bits.  */
+        write_zsreg(channel, R10, regs[R10]);
+
+        /* Set TX/RX controls sans the enable bits.  */
+        write_zsreg(channel, R3, regs[R3] & ~RxENAB);
+        write_zsreg(channel, R5, regs[R5] & ~TxENAB);
+
+        /* Synchronous mode config.  */
+        write_zsreg(channel, R6, regs[R6]);
+        write_zsreg(channel, R7, regs[R7]);
+
+        /* Don't mess with the interrupt vector (R2, unused by us) and
+         * master interrupt control (R9).  We make sure this is setup
+         * properly at probe time then never touch it again.
+         */
+
+        /* Disable baud generator.  */
+        write_zsreg(channel, R14, regs[R14] & ~BRENAB);
+
+        /* Clock mode control.  */
+        write_zsreg(channel, R11, regs[R11]);
+
+        /* Lower and upper byte of baud rate generator divisor.  */
+        write_zsreg(channel, R12, regs[R12]);
+        write_zsreg(channel, R13, regs[R13]);
+        
+        /* Now rewrite R14, with BRENAB (if set).  */
+        write_zsreg(channel, R14, regs[R14]);
+
+        /* External status interrupt control.  */
+        write_zsreg(channel, R15, regs[R15]);
+
+        /* Reset external status interrupts.  */
+        write_zsreg(channel, R0, RES_EXT_INT);
+        write_zsreg(channel, R0, RES_EXT_INT);
+
+        /* Rewrite R3/R5, this time without enables masked.  */
+        write_zsreg(channel, R3, regs[R3]);
+        write_zsreg(channel, R5, regs[R5]);
+
+        /* Rewrite R1, this time without IRQ enabled masked.  */
+        write_zsreg(channel, R1, regs[R1]);
+}
+
+/* Reprogram the Zilog channel HW registers with the copies found in the
+ * software state struct.  If the transmitter is busy, we defer this update
+ * until the next TX complete interrupt.  Else, we do it right now.
+ *
+ * The UART port lock must be held and local interrupts disabled.
+ */
+static void ip22zilog_maybe_update_regs(struct uart_ip22zilog_port *up,
+                                       struct zilog_channel *channel)
+{
+        if (!ZS_REGS_HELD(up)) {
+                if (ZS_TX_ACTIVE(up)) {
+                        up->flags |= IP22ZILOG_FLAG_REGS_HELD;
+                } else {
+                        __load_zsregs(channel, up->curregs);
+                }
+        }
+}
+
+static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up,
+                                   struct zilog_channel *channel,
+                                   struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;    /* XXX info==NULL? */
+
+        while (1) {
+                unsigned char ch, r1;
+
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        tty->flip.work.func((void *)tty);
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                return;         /* XXX Ignores SysRq when we need it most. Fix. */
+                }
+
+                r1 = read_zsreg(channel, R1);
+                if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        writeb(ERR_RES, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+                }
+
+                ch = readb(&channel->control);
+                ZSDELAY();
+
+                /* This funny hack depends upon BRK_ABRT not interfering
+                 * with the other bits we care about in R1.
+                 */
+                if (ch & BRK_ABRT)
+                        r1 |= BRK_ABRT;
+
+                ch = readb(&channel->data);
+                ZSDELAY();
+
+                ch &= up->parity_mask;
+
+                if (ZS_IS_CONS(up) && (r1 & BRK_ABRT)) {
+                        /* Wait for BREAK to deassert to avoid potentially
+                         * confusing the PROM.
+                         */
+                        while (1) {
+                                ch = readb(&channel->control);
+                                ZSDELAY();
+                                if (!(ch & BRK_ABRT))
+                                        break;
+                        }
+                        ip22_do_break();
+                        return;
+                }
+
+                /* A real serial line, record the character and status.  */
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                up->port.icount.rx++;
+                if (r1 & (BRK_ABRT | PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        if (r1 & BRK_ABRT) {
+                                r1 &= ~(PAR_ERR | CRC_ERR);
+                                up->port.icount.brk++;
+                                if (uart_handle_break(&up->port))
+                                        goto next_char;
+                        }
+                        else if (r1 & PAR_ERR)
+                                up->port.icount.parity++;
+                        else if (r1 & CRC_ERR)
+                                up->port.icount.frame++;
+                        if (r1 & Rx_OVR)
+                                up->port.icount.overrun++;
+                        r1 &= up->port.read_status_mask;
+                        if (r1 & BRK_ABRT)
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        else if (r1 & PAR_ERR)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (r1 & CRC_ERR)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto next_char;
+
+                if (up->port.ignore_status_mask == 0xff ||
+                    (r1 & up->port.ignore_status_mask) == 0) {
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((r1 & Rx_OVR) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        next_char:
+                ch = readb(&channel->control);
+                ZSDELAY();
+                if (!(ch & Rx_CH_AV))
+                        break;
+        }
+
+        tty_flip_buffer_push(tty);
+}
+
+static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
+                                   struct zilog_channel *channel,
+                                   struct pt_regs *regs)
+{
+        unsigned char status;
+
+        status = readb(&channel->control);
+        ZSDELAY();
+
+        writeb(RES_EXT_INT, &channel->control);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+
+        if (ZS_WANTS_MODEM_STATUS(up)) {
+                if (status & SYNC)
+                        up->port.icount.dsr++;
+
+                /* The Zilog just gives us an interrupt when DCD/CTS/etc. change.
+                 * But it does not tell us which bit has changed, we have to keep
+                 * track of this ourselves.
+                 */
+                if ((status & DCD) ^ up->prev_status)
+                        uart_handle_dcd_change(&up->port,
+                                               (status & DCD));
+                if ((status & CTS) ^ up->prev_status)
+                        uart_handle_cts_change(&up->port,
+                                               (status & CTS));
+
+                wake_up_interruptible(&up->port.info->delta_msr_wait);
+        }
+
+        up->prev_status = status;
+}
+
+static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
+                                    struct zilog_channel *channel)
+{
+        struct circ_buf *xmit;
+
+        if (ZS_IS_CONS(up)) {
+                unsigned char status = readb(&channel->control);
+                ZSDELAY();
+
+                /* TX still busy?  Just wait for the next TX done interrupt.
+                 *
+                 * It can occur because of how we do serial console writes.  It would
+                 * be nice to transmit console writes just like we normally would for
+                 * a TTY line. (ie. buffered and TX interrupt driven).  That is not
+                 * easy because console writes cannot sleep.  One solution might be
+                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 */
+                if (!(status & Tx_BUF_EMP))
+                        return;
+        }
+
+        up->flags &= ~IP22ZILOG_FLAG_TX_ACTIVE;
+
+        if (ZS_REGS_HELD(up)) {
+                __load_zsregs(channel, up->curregs);
+                up->flags &= ~IP22ZILOG_FLAG_REGS_HELD;
+        }
+
+        if (ZS_TX_STOPPED(up)) {
+                up->flags &= ~IP22ZILOG_FLAG_TX_STOPPED;
+                goto ack_tx_int;
+        }
+
+        if (up->port.x_char) {
+                up->flags |= IP22ZILOG_FLAG_TX_ACTIVE;
+                writeb(up->port.x_char, &channel->data);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+
+        if (up->port.info == NULL)
+                goto ack_tx_int;
+        xmit = &up->port.info->xmit;
+        if (uart_circ_empty(xmit)) {
+                uart_write_wakeup(&up->port);
+                goto ack_tx_int;
+        }
+        if (uart_tx_stopped(&up->port))
+                goto ack_tx_int;
+
+        up->flags |= IP22ZILOG_FLAG_TX_ACTIVE;
+        writeb(xmit->buf[xmit->tail], &channel->data);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+
+        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+        up->port.icount.tx++;
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        return;
+
+ack_tx_int:
+        writeb(RES_Tx_P, &channel->control);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+}
+
+static irqreturn_t ip22zilog_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_ip22zilog_port *up = dev_id;
+
+        while (up) {
+                struct zilog_channel *channel
+                        = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                unsigned char r3;
+
+                spin_lock(&up->port.lock);
+                r3 = read_zsreg(channel, R3);
+
+                /* Channel A */
+                if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
+                        writeb(RES_H_IUS, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+
+                        if (r3 & CHARxIP)
+                                ip22zilog_receive_chars(up, channel, regs);
+                        if (r3 & CHAEXT)
+                                ip22zilog_status_handle(up, channel, regs);
+                        if (r3 & CHATxIP)
+                                ip22zilog_transmit_chars(up, channel);
+                }
+                spin_unlock(&up->port.lock);
+
+                /* Channel B */
+                up = up->next;
+                channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+
+                spin_lock(&up->port.lock);
+                if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) {
+                        writeb(RES_H_IUS, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+
+                        if (r3 & CHBRxIP)
+                                ip22zilog_receive_chars(up, channel, regs);
+                        if (r3 & CHBEXT)
+                                ip22zilog_status_handle(up, channel, regs);
+                        if (r3 & CHBTxIP)
+                                ip22zilog_transmit_chars(up, channel);
+                }
+                spin_unlock(&up->port.lock);
+
+                up = up->next;
+        }
+
+        return IRQ_HANDLED;
+}
+
+/* A convenient way to quickly get R0 status.  The caller must _not_ hold the
+ * port lock, it is acquired here.
+ */
+static __inline__ unsigned char ip22zilog_read_channel_status(struct uart_port *port)
+{
+        struct zilog_channel *channel;
+        unsigned long flags;
+        unsigned char status;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        channel = ZILOG_CHANNEL_FROM_PORT(port);
+        status = readb(&channel->control);
+        ZSDELAY();
+
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        return status;
+}
+
+/* The port lock is not held.  */
+static unsigned int ip22zilog_tx_empty(struct uart_port *port)
+{
+        unsigned char status;
+        unsigned int ret;
+
+        status = ip22zilog_read_channel_status(port);
+        if (status & Tx_BUF_EMP)
+                ret = TIOCSER_TEMT;
+        else
+                ret = 0;
+
+        return ret;
+}
+
+/* The port lock is not held.  */
+static unsigned int ip22zilog_get_mctrl(struct uart_port *port)
+{
+        unsigned char status;
+        unsigned int ret;
+
+        status = ip22zilog_read_channel_status(port);
+
+        ret = 0;
+        if (status & DCD)
+                ret |= TIOCM_CAR;
+        if (status & SYNC)
+                ret |= TIOCM_DSR;
+        if (status & CTS)
+                ret |= TIOCM_CTS;
+
+        return ret;
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char set_bits, clear_bits;
+
+        set_bits = clear_bits = 0;
+
+        if (mctrl & TIOCM_RTS)
+                set_bits |= RTS;
+        else
+                clear_bits |= RTS;
+        if (mctrl & TIOCM_DTR)
+                set_bits |= DTR;
+        else
+                clear_bits |= DTR;
+
+        /* NOTE: Not subject to 'transmitter active' rule.  */ 
+        up->curregs[R5] |= set_bits;
+        up->curregs[R5] &= ~clear_bits;
+        write_zsreg(channel, R5, up->curregs[R5]);
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void ip22zilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+
+        up->flags |= IP22ZILOG_FLAG_TX_STOPPED;
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void ip22zilog_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char status;
+
+        up->flags |= IP22ZILOG_FLAG_TX_ACTIVE;
+        up->flags &= ~IP22ZILOG_FLAG_TX_STOPPED;
+
+        status = readb(&channel->control);
+        ZSDELAY();
+
+        /* TX busy?  Just wait for the TX done interrupt.  */
+        if (!(status & Tx_BUF_EMP))
+                return;
+
+        /* Send the first character to jump-start the TX done
+         * IRQ sending engine.
+         */
+        if (port->x_char) {
+                writeb(port->x_char, &channel->data);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+
+                port->icount.tx++;
+                port->x_char = 0;
+        } else {
+                struct circ_buf *xmit = &port->info->xmit;
+
+                writeb(xmit->buf[xmit->tail], &channel->data);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+
+                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                        uart_write_wakeup(&up->port);
+        }
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void ip22zilog_stop_rx(struct uart_port *port)
+{
+        struct uart_ip22zilog_port *up = UART_ZILOG(port);
+        struct zilog_channel *channel;
+
+        if (ZS_IS_CONS(up))
+                return;
+
+        channel = ZILOG_CHANNEL_FROM_PORT(port);
+
+        /* Disable all RX interrupts.  */
+        up->curregs[R1] &= ~RxINT_MASK;
+        ip22zilog_maybe_update_regs(up, channel);
+}
+
+/* The port lock is held.  */
+static void ip22zilog_enable_ms(struct uart_port *port)
+{
+        struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char new_reg;
+
+        new_reg = up->curregs[R15] | (DCDIE | SYNCIE | CTSIE);
+        if (new_reg != up->curregs[R15]) {
+                up->curregs[R15] = new_reg;
+
+                /* NOTE: Not subject to 'transmitter active' rule.  */ 
+                write_zsreg(channel, R15, up->curregs[R15]);
+        }
+}
+
+/* The port lock is not held.  */
+static void ip22zilog_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char set_bits, clear_bits, new_reg;
+        unsigned long flags;
+
+        set_bits = clear_bits = 0;
+
+        if (break_state)
+                set_bits |= SND_BRK;
+        else
+                clear_bits |= SND_BRK;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        new_reg = (up->curregs[R5] | set_bits) & ~clear_bits;
+        if (new_reg != up->curregs[R5]) {
+                up->curregs[R5] = new_reg;
+
+                /* NOTE: Not subject to 'transmitter active' rule.  */ 
+                write_zsreg(channel, R5, up->curregs[R5]);
+        }
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void __ip22zilog_startup(struct uart_ip22zilog_port *up)
+{
+        struct zilog_channel *channel;
+
+        channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+        up->prev_status = readb(&channel->control);
+
+        /* Enable receiver and transmitter.  */
+        up->curregs[R3] |= RxENAB;
+        up->curregs[R5] |= TxENAB;
+
+        up->curregs[R1] |= EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;
+        ip22zilog_maybe_update_regs(up, channel);
+}
+
+static int ip22zilog_startup(struct uart_port *port)
+{
+        struct uart_ip22zilog_port *up = UART_ZILOG(port);
+        unsigned long flags;
+
+        if (ZS_IS_CONS(up))
+                return 0;
+
+        spin_lock_irqsave(&port->lock, flags);
+        __ip22zilog_startup(up);
+        spin_unlock_irqrestore(&port->lock, flags);
+        return 0;
+}
+
+/*
+ * The test for ZS_IS_CONS is explained by the following e-mail:
+ *****
+ * From: Russell King <rmk@arm.linux.org.uk>
+ * Date: Sun, 8 Dec 2002 10:18:38 +0000
+ *
+ * On Sun, Dec 08, 2002 at 02:43:36AM -0500, Pete Zaitcev wrote:
+ * > I boot my 2.5 boxes using "console=ttyS0,9600" argument,
+ * > and I noticed that something is not right with reference
+ * > counting in this case. It seems that when the console
+ * > is open by kernel initially, this is not accounted
+ * > as an open, and uart_startup is not called.
+ *
+ * That is correct.  We are unable to call uart_startup when the serial
+ * console is initialised because it may need to allocate memory (as
+ * request_irq does) and the memory allocators may not have been
+ * initialised.
+ *
+ * 1. initialise the port into a state where it can send characters in the
+ *    console write method.
+ *
+ * 2. don't do the actual hardware shutdown in your shutdown() method (but
+ *    do the normal software shutdown - ie, free irqs etc)
+ *****
+ */
+static void ip22zilog_shutdown(struct uart_port *port)
+{
+        struct uart_ip22zilog_port *up = UART_ZILOG(port);
+        struct zilog_channel *channel;
+        unsigned long flags;
+
+        if (ZS_IS_CONS(up))
+                return;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        channel = ZILOG_CHANNEL_FROM_PORT(port);
+
+        /* Disable receiver and transmitter.  */
+        up->curregs[R3] &= ~RxENAB;
+        up->curregs[R5] &= ~TxENAB;
+
+        /* Disable all interrupts and BRK assertion.  */
+        up->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+        up->curregs[R5] &= ~SND_BRK;
+        ip22zilog_maybe_update_regs(up, channel);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+/* Shared by TTY driver and serial console setup.  The port lock is held
+ * and local interrupts are disabled.
+ */
+static void
+ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag,
+                       unsigned int iflag, int brg)
+{
+
+        up->curregs[R10] = NRZ;
+        up->curregs[R11] = TCBR | RCBR;
+
+        /* Program BAUD and clock source. */
+        up->curregs[R4] &= ~XCLK_MASK;
+        up->curregs[R4] |= X16CLK;
+        up->curregs[R12] = brg & 0xff;
+        up->curregs[R13] = (brg >> 8) & 0xff;
+        up->curregs[R14] = BRENAB;
+
+        /* Character size, stop bits, and parity. */
+        up->curregs[3] &= ~RxN_MASK;
+        up->curregs[5] &= ~TxN_MASK;
+        switch (cflag & CSIZE) {
+        case CS5:
+                up->curregs[3] |= Rx5;
+                up->curregs[5] |= Tx5;
+                up->parity_mask = 0x1f;
+                break;
+        case CS6:
+                up->curregs[3] |= Rx6;
+                up->curregs[5] |= Tx6;
+                up->parity_mask = 0x3f;
+                break;
+        case CS7:
+                up->curregs[3] |= Rx7;
+                up->curregs[5] |= Tx7;
+                up->parity_mask = 0x7f;
+                break;
+        case CS8:
+        default:
+                up->curregs[3] |= Rx8;
+                up->curregs[5] |= Tx8;
+                up->parity_mask = 0xff;
+                break;
+        };
+        up->curregs[4] &= ~0x0c;
+        if (cflag & CSTOPB)
+                up->curregs[4] |= SB2;
+        else
+                up->curregs[4] |= SB1;
+        if (cflag & PARENB)
+                up->curregs[4] |= PAR_ENAB;
+        else
+                up->curregs[4] &= ~PAR_ENAB;
+        if (!(cflag & PARODD))
+                up->curregs[4] |= PAR_EVEN;
+        else
+                up->curregs[4] &= ~PAR_EVEN;
+
+        up->port.read_status_mask = Rx_OVR;
+        if (iflag & INPCK)
+                up->port.read_status_mask |= CRC_ERR | PAR_ERR;
+        if (iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= BRK_ABRT;
+
+        up->port.ignore_status_mask = 0;
+        if (iflag & IGNPAR)
+                up->port.ignore_status_mask |= CRC_ERR | PAR_ERR;
+        if (iflag & IGNBRK) {
+                up->port.ignore_status_mask |= BRK_ABRT;
+                if (iflag & IGNPAR)
+                        up->port.ignore_status_mask |= Rx_OVR;
+        }
+
+        if ((cflag & CREAD) == 0)
+                up->port.ignore_status_mask = 0xff;
+}
+
+/* The port lock is not held.  */
+static void
+ip22zilog_set_termios(struct uart_port *port, struct termios *termios,
+                      struct termios *old)
+{
+        struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+        unsigned long flags;
+        int baud, brg;
+
+        baud = uart_get_baud_rate(port, termios, old, 1200, 76800);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+
+        ip22zilog_convert_to_zs(up, termios->c_cflag, termios->c_iflag, brg);
+
+        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+                up->flags |= IP22ZILOG_FLAG_MODEM_STATUS;
+        else
+                up->flags &= ~IP22ZILOG_FLAG_MODEM_STATUS;
+
+        up->cflag = termios->c_cflag;
+
+        ip22zilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(port));
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static const char *ip22zilog_type(struct uart_port *port)
+{
+        return "IP22-Zilog";
+}
+
+/* We do not request/release mappings of the registers here, this
+ * happens at early serial probe time.
+ */
+static void ip22zilog_release_port(struct uart_port *port)
+{
+}
+
+static int ip22zilog_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/* These do not need to do anything interesting either.  */
+static void ip22zilog_config_port(struct uart_port *port, int flags)
+{
+}
+
+/* We do not support letting the user mess with the divisor, IRQ, etc. */
+static int ip22zilog_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        return -EINVAL;
+}
+
+static struct uart_ops ip22zilog_pops = {
+        .tx_empty       =       ip22zilog_tx_empty,
+        .set_mctrl      =       ip22zilog_set_mctrl,
+        .get_mctrl      =       ip22zilog_get_mctrl,
+        .stop_tx        =       ip22zilog_stop_tx,
+        .start_tx       =       ip22zilog_start_tx,
+        .stop_rx        =       ip22zilog_stop_rx,
+        .enable_ms      =       ip22zilog_enable_ms,
+        .break_ctl      =       ip22zilog_break_ctl,
+        .startup        =       ip22zilog_startup,
+        .shutdown       =       ip22zilog_shutdown,
+        .set_termios    =       ip22zilog_set_termios,
+        .type           =       ip22zilog_type,
+        .release_port   =       ip22zilog_release_port,
+        .request_port   =       ip22zilog_request_port,
+        .config_port    =       ip22zilog_config_port,
+        .verify_port    =       ip22zilog_verify_port,
+};
+
+static struct uart_ip22zilog_port *ip22zilog_port_table;
+static struct zilog_layout **ip22zilog_chip_regs;
+
+static struct uart_ip22zilog_port *ip22zilog_irq_chain;
+static int zilog_irq = -1;
+
+static void * __init alloc_one_table(unsigned long size)
+{
+        void *ret;
+
+        ret = kmalloc(size, GFP_KERNEL);
+        if (ret != NULL)
+                memset(ret, 0, size);
+
+        return ret;
+}
+
+static void __init ip22zilog_alloc_tables(void)
+{
+        ip22zilog_port_table = (struct uart_ip22zilog_port *)
+                alloc_one_table(NUM_CHANNELS * sizeof(struct uart_ip22zilog_port));
+        ip22zilog_chip_regs = (struct zilog_layout **)
+                alloc_one_table(NUM_IP22ZILOG * sizeof(struct zilog_layout *));
+
+        if (ip22zilog_port_table == NULL || ip22zilog_chip_regs == NULL) {
+                panic("IP22-Zilog: Cannot allocate IP22-Zilog tables.");
+        }
+}
+
+/* Get the address of the registers for IP22-Zilog instance CHIP.  */
+static struct zilog_layout * __init get_zs(int chip)
+{
+        unsigned long base;
+
+        if (chip < 0 || chip >= NUM_IP22ZILOG) {
+                panic("IP22-Zilog: Illegal chip number %d in get_zs.", chip);
+        }
+
+        /* Not probe-able, hard code it. */
+        base = (unsigned long) &sgioc->uart;
+
+        zilog_irq = SGI_SERIAL_IRQ;
+        request_mem_region(base, 8, "IP22-Zilog");
+
+        return (struct zilog_layout *) base;
+}
+
+#define ZS_PUT_CHAR_MAX_DELAY   2000    /* 10 ms */
+
+#ifdef CONFIG_SERIAL_IP22_ZILOG_CONSOLE
+static void ip22zilog_put_char(struct zilog_channel *channel, unsigned char ch)
+{
+        int loops = ZS_PUT_CHAR_MAX_DELAY;
+
+        /* This is a timed polling loop so do not switch the explicit
+         * udelay with ZSDELAY as that is a NOP on some platforms.  -DaveM
+         */
+        do {
+                unsigned char val = readb(&channel->control);
+                if (val & Tx_BUF_EMP) {
+                        ZSDELAY();
+                        break;
+                }
+                udelay(5);
+        } while (--loops);
+
+        writeb(ch, &channel->data);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+}
+
+static void
+ip22zilog_console_write(struct console *con, const char *s, unsigned int count)
+{
+        struct uart_ip22zilog_port *up = &ip22zilog_port_table[con->index];
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        for (i = 0; i < count; i++, s++) {
+                ip22zilog_put_char(channel, *s);
+                if (*s == 10)
+                        ip22zilog_put_char(channel, 13);
+        }
+        udelay(2);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+void
+ip22serial_console_termios(struct console *con, char *options)
+{
+        int baud = 9600, bits = 8, cflag;
+        int parity = 'n';
+        int flow = 'n';
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        cflag = CREAD | HUPCL | CLOCAL;
+
+        switch (baud) {
+                case 150: cflag |= B150; break;
+                case 300: cflag |= B300; break;
+                case 600: cflag |= B600; break;
+                case 1200: cflag |= B1200; break;
+                case 2400: cflag |= B2400; break;
+                case 4800: cflag |= B4800; break;
+                case 9600: cflag |= B9600; break;
+                case 19200: cflag |= B19200; break;
+                case 38400: cflag |= B38400; break;
+                default: baud = 9600; cflag |= B9600; break;
+        }
+
+        con->cflag = cflag | CS8;                       /* 8N1 */
+}
+
+static int __init ip22zilog_console_setup(struct console *con, char *options)
+{
+        struct uart_ip22zilog_port *up = &ip22zilog_port_table[con->index];
+        unsigned long flags;
+        int baud, brg;
+
+        printk("Console: ttyS%d (IP22-Zilog)\n", con->index);
+
+        /* Get firmware console settings.  */
+        ip22serial_console_termios(con, options);
+
+        /* Firmware console speed is limited to 150-->38400 baud so
+         * this hackish cflag thing is OK.
+         */
+        switch (con->cflag & CBAUD) {
+        case B150: baud = 150; break;
+        case B300: baud = 300; break;
+        case B600: baud = 600; break;
+        case B1200: baud = 1200; break;
+        case B2400: baud = 2400; break;
+        case B4800: baud = 4800; break;
+        default: case B9600: baud = 9600; break;
+        case B19200: baud = 19200; break;
+        case B38400: baud = 38400; break;
+        };
+
+        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        up->curregs[R15] = BRKIE;
+        ip22zilog_convert_to_zs(up, con->cflag, 0, brg);
+
+        __ip22zilog_startup(up);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return 0;
+}
+
+static struct uart_driver ip22zilog_reg;
+
+static struct console ip22zilog_console = {
+        .name   =       "ttyS",
+        .write  =       ip22zilog_console_write,
+        .device =       uart_console_device,
+        .setup  =       ip22zilog_console_setup,
+        .flags  =       CON_PRINTBUFFER,
+        .index  =       -1,
+        .data   =       &ip22zilog_reg,
+};
+#endif /* CONFIG_SERIAL_IP22_ZILOG_CONSOLE */
+
+static struct uart_driver ip22zilog_reg = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "serial",
+        .devfs_name     = "tts/",
+        .dev_name       = "ttyS",
+        .major          = TTY_MAJOR,
+        .minor          = 64,
+        .nr             = NUM_CHANNELS,
+#ifdef CONFIG_SERIAL_IP22_ZILOG_CONSOLE
+        .cons           = &ip22zilog_console,
+#endif
+};
+
+static void __init ip22zilog_prepare(void)
+{
+        struct uart_ip22zilog_port *up;
+        struct zilog_layout *rp;
+        int channel, chip;
+
+        /*
+         * Temporary fix.
+         */
+        for (channel = 0; channel < NUM_CHANNELS; channel++)
+                spin_lock_init(&ip22zilog_port_table[channel].port.lock);
+
+        ip22zilog_irq_chain = &ip22zilog_port_table[NUM_CHANNELS - 1];
+        up = &ip22zilog_port_table[0];
+        for (channel = NUM_CHANNELS - 1 ; channel > 0; channel--)
+                up[channel].next = &up[channel - 1];
+        up[channel].next = NULL;
+
+        for (chip = 0; chip < NUM_IP22ZILOG; chip++) {
+                if (!ip22zilog_chip_regs[chip]) {
+                        ip22zilog_chip_regs[chip] = rp = get_zs(chip);
+
+                        up[(chip * 2) + 0].port.membase = (char *) &rp->channelB;
+                        up[(chip * 2) + 1].port.membase = (char *) &rp->channelA;
+
+                        /* In theory mapbase is the physical address ...  */
+                        up[(chip * 2) + 0].port.mapbase =
+                                (unsigned long) ioremap((unsigned long) &rp->channelB, 8);
+                        up[(chip * 2) + 1].port.mapbase =
+                                (unsigned long) ioremap((unsigned long) &rp->channelA, 8);
+                }
+
+                /* Channel A */
+                up[(chip * 2) + 0].port.iotype = UPIO_MEM;
+                up[(chip * 2) + 0].port.irq = zilog_irq;
+                up[(chip * 2) + 0].port.uartclk = ZS_CLOCK;
+                up[(chip * 2) + 0].port.fifosize = 1;
+                up[(chip * 2) + 0].port.ops = &ip22zilog_pops;
+                up[(chip * 2) + 0].port.type = PORT_IP22ZILOG;
+                up[(chip * 2) + 0].port.flags = 0;
+                up[(chip * 2) + 0].port.line = (chip * 2) + 0;
+                up[(chip * 2) + 0].flags = 0;
+
+                /* Channel B */
+                up[(chip * 2) + 1].port.iotype = UPIO_MEM;
+                up[(chip * 2) + 1].port.irq = zilog_irq;
+                up[(chip * 2) + 1].port.uartclk = ZS_CLOCK;
+                up[(chip * 2) + 1].port.fifosize = 1;
+                up[(chip * 2) + 1].port.ops = &ip22zilog_pops;
+                up[(chip * 2) + 1].port.type = PORT_IP22ZILOG;
+                up[(chip * 2) + 1].port.flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;
+                up[(chip * 2) + 1].port.line = (chip * 2) + 1;
+                up[(chip * 2) + 1].flags = 0;
+        }
+}
+
+static void __init ip22zilog_init_hw(void)
+{
+        int i;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                struct uart_ip22zilog_port *up = &ip22zilog_port_table[i];
+                struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                unsigned long flags;
+                int baud, brg;
+
+                spin_lock_irqsave(&up->port.lock, flags);
+
+                if (ZS_IS_CHANNEL_A(up)) {
+                        write_zsreg(channel, R9, FHWRES);
+                        ZSDELAY_LONG();
+                        (void) read_zsreg(channel, R0);
+                }
+
+                /* Normal serial TTY. */
+                up->parity_mask = 0xff;
+                up->curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;
+                up->curregs[R4] = PAR_EVEN | X16CLK | SB1;
+                up->curregs[R3] = RxENAB | Rx8;
+                up->curregs[R5] = TxENAB | Tx8;
+                up->curregs[R9] = NV | MIE;
+                up->curregs[R10] = NRZ;
+                up->curregs[R11] = TCBR | RCBR;
+                baud = 9600;
+                brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+                up->curregs[R12] = (brg & 0xff);
+                up->curregs[R13] = (brg >> 8) & 0xff;
+                up->curregs[R14] = BRENAB;
+                __load_zsregs(channel, up->curregs);
+                /* set master interrupt enable */
+                write_zsreg(channel, R9, up->curregs[R9]);
+
+                spin_unlock_irqrestore(&up->port.lock, flags);
+        }
+}
+
+static int __init ip22zilog_ports_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Serial: IP22 Zilog driver (%d chips).\n", NUM_IP22ZILOG);
+
+        ip22zilog_prepare();
+
+        if (request_irq(zilog_irq, ip22zilog_interrupt, 0,
+                        "IP22-Zilog", ip22zilog_irq_chain)) {
+                panic("IP22-Zilog: Unable to register zs interrupt handler.\n");
+        }
+
+        ip22zilog_init_hw();
+
+        ret = uart_register_driver(&ip22zilog_reg);
+        if (ret == 0) {
+                int i;
+
+                for (i = 0; i < NUM_CHANNELS; i++) {
+                        struct uart_ip22zilog_port *up = &ip22zilog_port_table[i];
+
+                        uart_add_one_port(&ip22zilog_reg, &up->port);
+                }
+        }
+
+        return ret;
+}
+
+static int __init ip22zilog_init(void)
+{
+        /* IP22 Zilog setup is hard coded, no probing to do.  */
+        ip22zilog_alloc_tables();
+        ip22zilog_ports_init();
+
+        return 0;
+}
+
+static void __exit ip22zilog_exit(void)
+{
+        int i;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                struct uart_ip22zilog_port *up = &ip22zilog_port_table[i];
+
+                uart_remove_one_port(&ip22zilog_reg, &up->port);
+        }
+
+        uart_unregister_driver(&ip22zilog_reg);
+}
+
+module_init(ip22zilog_init);
+module_exit(ip22zilog_exit);
+
+/* David wrote it but I'm to blame for the bugs ...  */
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_DESCRIPTION("SGI Zilog serial port driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/ip22zilog.h b/drivers/serial/ip22zilog.h
new file mode 100644
index 000000000000..a59a9a8341d2
--- /dev/null
+++ b/drivers/serial/ip22zilog.h
@@ -0,0 +1,281 @@
+#ifndef _IP22_ZILOG_H
+#define _IP22_ZILOG_H
+
+#include <asm/byteorder.h>
+
+struct zilog_channel {
+#ifdef __BIG_ENDIAN
+        volatile unsigned char unused0[3];
+        volatile unsigned char control;
+        volatile unsigned char unused1[3];
+        volatile unsigned char data;
+#else /* __LITTLE_ENDIAN */
+        volatile unsigned char control;
+        volatile unsigned char unused0[3];
+        volatile unsigned char data;
+        volatile unsigned char unused1[3];
+#endif
+};
+
+struct zilog_layout {
+        struct zilog_channel channelB;
+        struct zilog_channel channelA;
+};
+
+#define NUM_ZSREGS    16
+
+/* Conversion routines to/from brg time constants from/to bits
+ * per second.
+ */
+#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2))
+#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2)
+
+/* The Zilog register set */
+
+#define FLAG    0x7e
+
+/* Write Register 0 */
+#define R0      0               /* Register selects */
+#define R1      1
+#define R2      2
+#define R3      3
+#define R4      4
+#define R5      5
+#define R6      6
+#define R7      7
+#define R8      8
+#define R9      9
+#define R10     10
+#define R11     11
+#define R12     12
+#define R13     13
+#define R14     14
+#define R15     15
+
+#define NULLCODE        0       /* Null Code */
+#define POINT_HIGH      0x8     /* Select upper half of registers */
+#define RES_EXT_INT     0x10    /* Reset Ext. Status Interrupts */
+#define SEND_ABORT      0x18    /* HDLC Abort */
+#define RES_RxINT_FC    0x20    /* Reset RxINT on First Character */
+#define RES_Tx_P        0x28    /* Reset TxINT Pending */
+#define ERR_RES         0x30    /* Error Reset */
+#define RES_H_IUS       0x38    /* Reset highest IUS */
+
+#define RES_Rx_CRC      0x40    /* Reset Rx CRC Checker */
+#define RES_Tx_CRC      0x80    /* Reset Tx CRC Checker */
+#define RES_EOM_L       0xC0    /* Reset EOM latch */
+
+/* Write Register 1 */
+
+#define EXT_INT_ENAB    0x1     /* Ext Int Enable */
+#define TxINT_ENAB      0x2     /* Tx Int Enable */
+#define PAR_SPEC        0x4     /* Parity is special condition */
+
+#define RxINT_DISAB     0       /* Rx Int Disable */
+#define RxINT_FCERR     0x8     /* Rx Int on First Character Only or Error */
+#define INT_ALL_Rx      0x10    /* Int on all Rx Characters or error */
+#define INT_ERR_Rx      0x18    /* Int on error only */
+#define RxINT_MASK      0x18
+
+#define WT_RDY_RT       0x20    /* Wait/Ready on R/T */
+#define WT_FN_RDYFN     0x40    /* Wait/FN/Ready FN */
+#define WT_RDY_ENAB     0x80    /* Wait/Ready Enable */
+
+/* Write Register #2 (Interrupt Vector) */
+
+/* Write Register 3 */
+
+#define RxENAB          0x1     /* Rx Enable */
+#define SYNC_L_INH      0x2     /* Sync Character Load Inhibit */
+#define ADD_SM          0x4     /* Address Search Mode (SDLC) */
+#define RxCRC_ENAB      0x8     /* Rx CRC Enable */
+#define ENT_HM          0x10    /* Enter Hunt Mode */
+#define AUTO_ENAB       0x20    /* Auto Enables */
+#define Rx5             0x0     /* Rx 5 Bits/Character */
+#define Rx7             0x40    /* Rx 7 Bits/Character */
+#define Rx6             0x80    /* Rx 6 Bits/Character */
+#define Rx8             0xc0    /* Rx 8 Bits/Character */
+#define RxN_MASK        0xc0
+
+/* Write Register 4 */
+
+#define PAR_ENAB        0x1     /* Parity Enable */
+#define PAR_EVEN        0x2     /* Parity Even/Odd* */
+
+#define SYNC_ENAB       0       /* Sync Modes Enable */
+#define SB1             0x4     /* 1 stop bit/char */
+#define SB15            0x8     /* 1.5 stop bits/char */
+#define SB2             0xc     /* 2 stop bits/char */
+
+#define MONSYNC         0       /* 8 Bit Sync character */
+#define BISYNC          0x10    /* 16 bit sync character */
+#define SDLC            0x20    /* SDLC Mode (01111110 Sync Flag) */
+#define EXTSYNC         0x30    /* External Sync Mode */
+
+#define X1CLK           0x0     /* x1 clock mode */
+#define X16CLK          0x40    /* x16 clock mode */
+#define X32CLK          0x80    /* x32 clock mode */
+#define X64CLK          0xC0    /* x64 clock mode */
+#define XCLK_MASK       0xC0
+
+/* Write Register 5 */
+
+#define TxCRC_ENAB      0x1     /* Tx CRC Enable */
+#define RTS             0x2     /* RTS */
+#define SDLC_CRC        0x4     /* SDLC/CRC-16 */
+#define TxENAB          0x8     /* Tx Enable */
+#define SND_BRK         0x10    /* Send Break */
+#define Tx5             0x0     /* Tx 5 bits (or less)/character */
+#define Tx7             0x20    /* Tx 7 bits/character */
+#define Tx6             0x40    /* Tx 6 bits/character */
+#define Tx8             0x60    /* Tx 8 bits/character */
+#define TxN_MASK        0x60
+#define DTR             0x80    /* DTR */
+
+/* Write Register 6 (Sync bits 0-7/SDLC Address Field) */
+
+/* Write Register 7 (Sync bits 8-15/SDLC 01111110) */
+
+/* Write Register 8 (transmit buffer) */
+
+/* Write Register 9 (Master interrupt control) */
+#define VIS     1       /* Vector Includes Status */
+#define NV      2       /* No Vector */
+#define DLC     4       /* Disable Lower Chain */
+#define MIE     8       /* Master Interrupt Enable */
+#define STATHI  0x10    /* Status high */
+#define NORESET 0       /* No reset on write to R9 */
+#define CHRB    0x40    /* Reset channel B */
+#define CHRA    0x80    /* Reset channel A */
+#define FHWRES  0xc0    /* Force hardware reset */
+
+/* Write Register 10 (misc control bits) */
+#define BIT6    1       /* 6 bit/8bit sync */
+#define LOOPMODE 2      /* SDLC Loop mode */
+#define ABUNDER 4       /* Abort/flag on SDLC xmit underrun */
+#define MARKIDLE 8      /* Mark/flag on idle */
+#define GAOP    0x10    /* Go active on poll */
+#define NRZ     0       /* NRZ mode */
+#define NRZI    0x20    /* NRZI mode */
+#define FM1     0x40    /* FM1 (transition = 1) */
+#define FM0     0x60    /* FM0 (transition = 0) */
+#define CRCPS   0x80    /* CRC Preset I/O */
+
+/* Write Register 11 (Clock Mode control) */
+#define TRxCXT  0       /* TRxC = Xtal output */
+#define TRxCTC  1       /* TRxC = Transmit clock */
+#define TRxCBR  2       /* TRxC = BR Generator Output */
+#define TRxCDP  3       /* TRxC = DPLL output */
+#define TRxCOI  4       /* TRxC O/I */
+#define TCRTxCP 0       /* Transmit clock = RTxC pin */
+#define TCTRxCP 8       /* Transmit clock = TRxC pin */
+#define TCBR    0x10    /* Transmit clock = BR Generator output */
+#define TCDPLL  0x18    /* Transmit clock = DPLL output */
+#define RCRTxCP 0       /* Receive clock = RTxC pin */
+#define RCTRxCP 0x20    /* Receive clock = TRxC pin */
+#define RCBR    0x40    /* Receive clock = BR Generator output */
+#define RCDPLL  0x60    /* Receive clock = DPLL output */
+#define RTxCX   0x80    /* RTxC Xtal/No Xtal */
+
+/* Write Register 12 (lower byte of baud rate generator time constant) */
+
+/* Write Register 13 (upper byte of baud rate generator time constant) */
+
+/* Write Register 14 (Misc control bits) */
+#define BRENAB  1       /* Baud rate generator enable */
+#define BRSRC   2       /* Baud rate generator source */
+#define DTRREQ  4       /* DTR/Request function */
+#define AUTOECHO 8      /* Auto Echo */
+#define LOOPBAK 0x10    /* Local loopback */
+#define SEARCH  0x20    /* Enter search mode */
+#define RMC     0x40    /* Reset missing clock */
+#define DISDPLL 0x60    /* Disable DPLL */
+#define SSBR    0x80    /* Set DPLL source = BR generator */
+#define SSRTxC  0xa0    /* Set DPLL source = RTxC */
+#define SFMM    0xc0    /* Set FM mode */
+#define SNRZI   0xe0    /* Set NRZI mode */
+
+/* Write Register 15 (external/status interrupt control) */
+#define ZCIE    2       /* Zero count IE */
+#define DCDIE   8       /* DCD IE */
+#define SYNCIE  0x10    /* Sync/hunt IE */
+#define CTSIE   0x20    /* CTS IE */
+#define TxUIE   0x40    /* Tx Underrun/EOM IE */
+#define BRKIE   0x80    /* Break/Abort IE */
+
+
+/* Read Register 0 */
+#define Rx_CH_AV        0x1     /* Rx Character Available */
+#define ZCOUNT          0x2     /* Zero count */
+#define Tx_BUF_EMP      0x4     /* Tx Buffer empty */
+#define DCD             0x8     /* DCD */
+#define SYNC            0x10    /* Sync/hunt */
+#define CTS             0x20    /* CTS */
+#define TxEOM           0x40    /* Tx underrun */
+#define BRK_ABRT        0x80    /* Break/Abort */
+
+/* Read Register 1 */
+#define ALL_SNT         0x1     /* All sent */
+/* Residue Data for 8 Rx bits/char programmed */
+#define RES3            0x8     /* 0/3 */
+#define RES4            0x4     /* 0/4 */
+#define RES5            0xc     /* 0/5 */
+#define RES6            0x2     /* 0/6 */
+#define RES7            0xa     /* 0/7 */
+#define RES8            0x6     /* 0/8 */
+#define RES18           0xe     /* 1/8 */
+#define RES28           0x0     /* 2/8 */
+/* Special Rx Condition Interrupts */
+#define PAR_ERR         0x10    /* Parity error */
+#define Rx_OVR          0x20    /* Rx Overrun Error */
+#define CRC_ERR         0x40    /* CRC/Framing Error */
+#define END_FR          0x80    /* End of Frame (SDLC) */
+
+/* Read Register 2 (channel b only) - Interrupt vector */
+#define CHB_Tx_EMPTY    0x00
+#define CHB_EXT_STAT    0x02
+#define CHB_Rx_AVAIL    0x04
+#define CHB_SPECIAL     0x06
+#define CHA_Tx_EMPTY    0x08
+#define CHA_EXT_STAT    0x0a
+#define CHA_Rx_AVAIL    0x0c
+#define CHA_SPECIAL     0x0e
+#define STATUS_MASK     0x0e
+
+/* Read Register 3 (interrupt pending register) ch a only */
+#define CHBEXT  0x1             /* Channel B Ext/Stat IP */
+#define CHBTxIP 0x2             /* Channel B Tx IP */
+#define CHBRxIP 0x4             /* Channel B Rx IP */
+#define CHAEXT  0x8             /* Channel A Ext/Stat IP */
+#define CHATxIP 0x10            /* Channel A Tx IP */
+#define CHARxIP 0x20            /* Channel A Rx IP */
+
+/* Read Register 8 (receive data register) */
+
+/* Read Register 10  (misc status bits) */
+#define ONLOOP  2               /* On loop */
+#define LOOPSEND 0x10           /* Loop sending */
+#define CLK2MIS 0x40            /* Two clocks missing */
+#define CLK1MIS 0x80            /* One clock missing */
+
+/* Read Register 12 (lower byte of baud rate generator constant) */
+
+/* Read Register 13 (upper byte of baud rate generator constant) */
+
+/* Read Register 15 (value of WR 15) */
+
+/* Misc macros */
+#define ZS_CLEARERR(channel)    do { writeb(ERR_RES, &channel->control); \
+                                     udelay(5); } while(0)
+
+#define ZS_CLEARSTAT(channel)   do { writeb(RES_EXT_INT, &channel->control); \
+                                     udelay(5); } while(0)
+
+#define ZS_CLEARFIFO(channel)   do { readb(&channel->data); \
+                                     udelay(2); \
+                                     readb(&channel->data); \
+                                     udelay(2); \
+                                     readb(&channel->data); \
+                                     udelay(2); } while(0)
+
+#endif /* _IP22_ZILOG_H */
diff --git a/drivers/serial/jsm/Makefile b/drivers/serial/jsm/Makefile
new file mode 100644
index 000000000000..e46b6e0f8b18
--- /dev/null
+++ b/drivers/serial/jsm/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for Jasmine adapter
+#
+
+obj-$(CONFIG_SERIAL_JSM) += jsm.o
+
+jsm-objs :=    jsm_driver.o jsm_neo.o jsm_tty.o
+
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h
new file mode 100644
index 000000000000..b12ee02a0f7c
--- /dev/null
+++ b/drivers/serial/jsm/jsm.h
@@ -0,0 +1,437 @@
+/************************************************************************
+ * Copyright 2003 Digi International (www.digi.com)
+ *
+ * Copyright (C) 2004 IBM Corporation. All rights reserved.
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 * Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ *
+ * Contact Information:
+ * Scott H Kilau <Scott_Kilau@digi.com>
+ * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
+ *
+ ***********************************************************************/
+
+#ifndef __JSM_DRIVER_H
+#define __JSM_DRIVER_H
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/types.h>        /* To pick up the varions Linux types */
+#include <linux/tty.h>
+#include <linux/serial_core.h>
+#include <linux/device.h>
+
+/*
+ * Debugging levels can be set using debug insmod variable
+ * They can also be compiled out completely.
+ */
+enum {
+        DBG_INIT        = 0x01,
+        DBG_BASIC       = 0x02,
+        DBG_CORE        = 0x04,
+        DBG_OPEN        = 0x08,
+        DBG_CLOSE       = 0x10,
+        DBG_READ        = 0x20,
+        DBG_WRITE       = 0x40,
+        DBG_IOCTL       = 0x80,
+        DBG_PROC        = 0x100,
+        DBG_PARAM       = 0x200,
+        DBG_PSCAN       = 0x400,
+        DBG_EVENT       = 0x800,
+        DBG_DRAIN       = 0x1000,
+        DBG_MSIGS       = 0x2000,
+        DBG_MGMT        = 0x4000,
+        DBG_INTR        = 0x8000,
+        DBG_CARR        = 0x10000,
+};
+
+#define jsm_printk(nlevel, klevel, pdev, fmt, args...)  \
+        if ((DBG_##nlevel & jsm_debug))                 \
+        dev_printk(KERN_##klevel, pdev->dev, fmt, ## args)
+
+#define MAXPORTS        8
+#define MAX_STOPS_SENT  5
+
+/* Board type definitions */
+
+#define T_NEO           0000
+#define T_CLASSIC       0001
+#define T_PCIBUS        0400
+
+/* Board State Definitions */
+
+#define BD_RUNNING      0x0
+#define BD_REASON       0x7f
+#define BD_NOTFOUND     0x1
+#define BD_NOIOPORT     0x2
+#define BD_NOMEM        0x3
+#define BD_NOBIOS       0x4
+#define BD_NOFEP        0x5
+#define BD_FAILED       0x6
+#define BD_ALLOCATED    0x7
+#define BD_TRIBOOT      0x8
+#define BD_BADKME       0x80
+
+
+/* 4 extra for alignment play space */
+#define WRITEBUFLEN     ((4096) + 4)
+#define MYFLIPLEN       N_TTY_BUF_SIZE
+
+#define JSM_VERSION     "jsm: 1.1-1-INKERNEL"
+#define JSM_PARTNUM     "40002438_A-INKERNEL"
+
+/*
+ * All the possible states the driver can be while being loaded.
+ */
+enum {
+        DRIVER_INITIALIZED = 0,
+        DRIVER_READY
+};
+
+/*
+ * All the possible states the board can be while booting up.
+ */
+enum {
+        BOARD_FAILED = 0,
+        BOARD_FOUND,
+        BOARD_READY
+};
+
+struct board_id {
+        u8 *name;
+        u32 maxports;
+};
+
+struct jsm_board;
+struct jsm_channel;
+
+/************************************************************************
+ * Per board operations structure                                       *
+ ************************************************************************/
+struct board_ops {
+        irqreturn_t (*intr) (int irq, void *voidbrd, struct pt_regs *regs);
+        void (*uart_init) (struct jsm_channel *ch);
+        void (*uart_off) (struct jsm_channel *ch);
+        void (*param) (struct jsm_channel *ch);
+        void (*assert_modem_signals) (struct jsm_channel *ch);
+        void (*flush_uart_write) (struct jsm_channel *ch);
+        void (*flush_uart_read) (struct jsm_channel *ch);
+        void (*disable_receiver) (struct jsm_channel *ch);
+        void (*enable_receiver) (struct jsm_channel *ch);
+        void (*send_break) (struct jsm_channel *ch);
+        void (*clear_break) (struct jsm_channel *ch, int);
+        void (*send_start_character) (struct jsm_channel *ch);
+        void (*send_stop_character) (struct jsm_channel *ch);
+        void (*copy_data_from_queue_to_uart) (struct jsm_channel *ch);
+        u32 (*get_uart_bytes_left) (struct jsm_channel *ch);
+        void (*send_immediate_char) (struct jsm_channel *ch, unsigned char);
+};
+
+
+/*
+ *      Per-board information
+ */
+struct jsm_board
+{
+        int             boardnum;       /* Board number: 0-32 */
+
+        int             type;           /* Type of board */
+        char            *name;          /* Product Name */
+        u8              rev;            /* PCI revision ID */
+        struct pci_dev  *pci_dev;
+        u32             maxports;       /* MAX ports this board can handle */
+
+        spinlock_t      bd_lock;        /* Used to protect board */
+
+        spinlock_t      bd_intr_lock;   /* Used to protect the poller tasklet and
+                                         * the interrupt routine from each other.
+                                         */
+
+        u32             state;          /* State of card. */
+        wait_queue_head_t state_wait;   /* Place to sleep on for state change */
+
+        u32             nasync;         /* Number of ports on card */
+
+        u32             irq;            /* Interrupt request number */
+        u64             intr_count;     /* Count of interrupts */
+
+        u64             membase;        /* Start of base memory of the card */
+        u64             membase_end;    /* End of base memory of the card */
+
+        u8      __iomem *re_map_membase;/* Remapped memory of the card */
+
+        u64             iobase;         /* Start of io base of the card */
+        u64             iobase_end;     /* End of io base of the card */
+
+        u32             bd_uart_offset; /* Space between each UART */
+
+        struct jsm_channel *channels[MAXPORTS]; /* array of pointers to our channels. */
+        char            *flipbuf;       /* Our flip buffer, alloced if board is found */
+
+        u16             dpatype;        /* The board "type", as defined by DPA */
+        u16             dpastatus;      /* The board "status", as defined by DPA */
+
+        u32             bd_dividend;    /* Board/UARTs specific dividend */
+
+        struct board_ops *bd_ops;
+
+        struct list_head jsm_board_entry;
+};
+
+/************************************************************************
+ * Device flag definitions for ch_flags.
+ ************************************************************************/
+#define CH_PRON         0x0001          /* Printer on string            */
+#define CH_STOP         0x0002          /* Output is stopped            */
+#define CH_STOPI        0x0004          /* Input is stopped             */
+#define CH_CD           0x0008          /* Carrier is present           */
+#define CH_FCAR         0x0010          /* Carrier forced on            */
+#define CH_HANGUP       0x0020          /* Hangup received              */
+
+#define CH_RECEIVER_OFF 0x0040          /* Receiver is off              */
+#define CH_OPENING      0x0080          /* Port in fragile open state   */
+#define CH_CLOSING      0x0100          /* Port in fragile close state  */
+#define CH_FIFO_ENABLED 0x0200          /* Port has FIFOs enabled       */
+#define CH_TX_FIFO_EMPTY 0x0400         /* TX Fifo is completely empty  */
+#define CH_TX_FIFO_LWM  0x0800          /* TX Fifo is below Low Water   */
+#define CH_BREAK_SENDING 0x1000         /* Break is being sent          */
+#define CH_LOOPBACK 0x2000              /* Channel is in lookback mode  */
+#define CH_FLIPBUF_IN_USE 0x4000        /* Channel's flipbuf is in use  */
+#define CH_BAUD0        0x08000         /* Used for checking B0 transitions */
+
+/* Our Read/Error/Write queue sizes */
+#define RQUEUEMASK      0x1FFF          /* 8 K - 1 */
+#define EQUEUEMASK      0x1FFF          /* 8 K - 1 */
+#define WQUEUEMASK      0x0FFF          /* 4 K - 1 */
+#define RQUEUESIZE      (RQUEUEMASK + 1)
+#define EQUEUESIZE      RQUEUESIZE
+#define WQUEUESIZE      (WQUEUEMASK + 1)
+
+
+/************************************************************************
+ * Channel information structure.
+ ************************************************************************/
+struct jsm_channel {
+        struct uart_port uart_port;
+        struct jsm_board        *ch_bd;         /* Board structure pointer      */
+
+        spinlock_t      ch_lock;        /* provide for serialization */
+        wait_queue_head_t ch_flags_wait;
+
+        u32             ch_portnum;     /* Port number, 0 offset.       */
+        u32             ch_open_count;  /* open count                   */
+        u32             ch_flags;       /* Channel flags                */
+
+        u64             ch_close_delay; /* How long we should drop RTS/DTR for */
+
+        u64             ch_cpstime;     /* Time for CPS calculations    */
+
+        tcflag_t        ch_c_iflag;     /* channel iflags               */
+        tcflag_t        ch_c_cflag;     /* channel cflags               */
+        tcflag_t        ch_c_oflag;     /* channel oflags               */
+        tcflag_t        ch_c_lflag;     /* channel lflags               */
+        u8              ch_stopc;       /* Stop character               */
+        u8              ch_startc;      /* Start character              */
+
+        u32             ch_old_baud;    /* Cache of the current baud */
+        u32             ch_custom_speed;/* Custom baud, if set */
+
+        u32             ch_wopen;       /* Waiting for open process cnt */
+
+        u8              ch_mostat;      /* FEP output modem status      */
+        u8              ch_mistat;      /* FEP input modem status       */
+
+        struct neo_uart_struct __iomem *ch_neo_uart;    /* Pointer to the "mapped" UART struct */
+        u8              ch_cached_lsr;  /* Cached value of the LSR register */
+
+        u8              *ch_rqueue;     /* Our read queue buffer - malloc'ed */
+        u16             ch_r_head;      /* Head location of the read queue */
+        u16             ch_r_tail;      /* Tail location of the read queue */
+
+        u8              *ch_equeue;     /* Our error queue buffer - malloc'ed */
+        u16             ch_e_head;      /* Head location of the error queue */
+        u16             ch_e_tail;      /* Tail location of the error queue */
+
+        u8              *ch_wqueue;     /* Our write queue buffer - malloc'ed */
+        u16             ch_w_head;      /* Head location of the write queue */
+        u16             ch_w_tail;      /* Tail location of the write queue */
+
+        u64             ch_rxcount;     /* total of data received so far */
+        u64             ch_txcount;     /* total of data transmitted so far */
+
+        u8              ch_r_tlevel;    /* Receive Trigger level */
+        u8              ch_t_tlevel;    /* Transmit Trigger level */
+
+        u8              ch_r_watermark; /* Receive Watermark */
+
+
+        u32             ch_stops_sent;  /* How many times I have sent a stop character
+                                         * to try to stop the other guy sending.
+                                         */
+        u64             ch_err_parity;  /* Count of parity errors on channel */
+        u64             ch_err_frame;   /* Count of framing errors on channel */
+        u64             ch_err_break;   /* Count of breaks on channel */
+        u64             ch_err_overrun; /* Count of overruns on channel */
+
+        u64             ch_xon_sends;   /* Count of xons transmitted */
+        u64             ch_xoff_sends;  /* Count of xoffs transmitted */
+};
+
+
+/************************************************************************
+ * Per channel/port NEO UART structure                                  *
+ ************************************************************************
+ *              Base Structure Entries Usage Meanings to Host           *
+ *                                                                      *
+ *      W = read write          R = read only                           *
+ *                      U = Unused.                                     *
+ ************************************************************************/
+
+struct neo_uart_struct {
+         u8 txrx;               /* WR   RHR/THR - Holding Reg */
+         u8 ier;                /* WR   IER - Interrupt Enable Reg */
+         u8 isr_fcr;            /* WR   ISR/FCR - Interrupt Status Reg/Fifo Control Reg */
+         u8 lcr;                /* WR   LCR - Line Control Reg */
+         u8 mcr;                /* WR   MCR - Modem Control Reg */
+         u8 lsr;                /* WR   LSR - Line Status Reg */
+         u8 msr;                /* WR   MSR - Modem Status Reg */
+         u8 spr;                /* WR   SPR - Scratch Pad Reg */
+         u8 fctr;               /* WR   FCTR - Feature Control Reg */
+         u8 efr;                /* WR   EFR - Enhanced Function Reg */
+         u8 tfifo;              /* WR   TXCNT/TXTRG - Transmit FIFO Reg */
+         u8 rfifo;              /* WR   RXCNT/RXTRG - Recieve FIFO Reg */
+         u8 xoffchar1;  /* WR   XOFF 1 - XOff Character 1 Reg */
+         u8 xoffchar2;  /* WR   XOFF 2 - XOff Character 2 Reg */
+         u8 xonchar1;   /* WR   XON 1 - Xon Character 1 Reg */
+         u8 xonchar2;   /* WR   XON 2 - XOn Character 2 Reg */
+
+         u8 reserved1[0x2ff - 0x200]; /* U      Reserved by Exar */
+         u8 txrxburst[64];      /* RW   64 bytes of RX/TX FIFO Data */
+         u8 reserved2[0x37f - 0x340]; /* U      Reserved by Exar */
+         u8 rxburst_with_errors[64];    /* R    64 bytes of RX FIFO Data + LSR */
+};
+
+/* Where to read the extended interrupt register (32bits instead of 8bits) */
+#define UART_17158_POLL_ADDR_OFFSET     0x80
+
+/*
+ * These are the redefinitions for the FCTR on the XR17C158, since
+ * Exar made them different than their earlier design. (XR16C854)
+ */
+
+/* These are only applicable when table D is selected */
+#define UART_17158_FCTR_RTS_NODELAY     0x00
+#define UART_17158_FCTR_RTS_4DELAY      0x01
+#define UART_17158_FCTR_RTS_6DELAY      0x02
+#define UART_17158_FCTR_RTS_8DELAY      0x03
+#define UART_17158_FCTR_RTS_12DELAY     0x12
+#define UART_17158_FCTR_RTS_16DELAY     0x05
+#define UART_17158_FCTR_RTS_20DELAY     0x13
+#define UART_17158_FCTR_RTS_24DELAY     0x06
+#define UART_17158_FCTR_RTS_28DELAY     0x14
+#define UART_17158_FCTR_RTS_32DELAY     0x07
+#define UART_17158_FCTR_RTS_36DELAY     0x16
+#define UART_17158_FCTR_RTS_40DELAY     0x08
+#define UART_17158_FCTR_RTS_44DELAY     0x09
+#define UART_17158_FCTR_RTS_48DELAY     0x10
+#define UART_17158_FCTR_RTS_52DELAY     0x11
+
+#define UART_17158_FCTR_RTS_IRDA        0x10
+#define UART_17158_FCTR_RS485           0x20
+#define UART_17158_FCTR_TRGA            0x00
+#define UART_17158_FCTR_TRGB            0x40
+#define UART_17158_FCTR_TRGC            0x80
+#define UART_17158_FCTR_TRGD            0xC0
+
+/* 17158 trigger table selects.. */
+#define UART_17158_FCTR_BIT6            0x40
+#define UART_17158_FCTR_BIT7            0x80
+
+/* 17158 TX/RX memmapped buffer offsets */
+#define UART_17158_RX_FIFOSIZE          64
+#define UART_17158_TX_FIFOSIZE          64
+
+/* 17158 Extended IIR's */
+#define UART_17158_IIR_RDI_TIMEOUT      0x0C    /* Receiver data TIMEOUT */
+#define UART_17158_IIR_XONXOFF          0x10    /* Received an XON/XOFF char */
+#define UART_17158_IIR_HWFLOW_STATE_CHANGE 0x20 /* CTS/DSR or RTS/DTR state change */
+#define UART_17158_IIR_FIFO_ENABLED     0xC0    /* 16550 FIFOs are Enabled */
+
+/*
+ * These are the extended interrupts that get sent
+ * back to us from the UART's 32bit interrupt register
+ */
+#define UART_17158_RX_LINE_STATUS       0x1     /* RX Ready */
+#define UART_17158_RXRDY_TIMEOUT        0x2     /* RX Ready Timeout */
+#define UART_17158_TXRDY                0x3     /* TX Ready */
+#define UART_17158_MSR                  0x4     /* Modem State Change */
+#define UART_17158_TX_AND_FIFO_CLR      0x40    /* Transmitter Holding Reg Empty */
+#define UART_17158_RX_FIFO_DATA_ERROR   0x80    /* UART detected an RX FIFO Data error */
+
+/*
+ * These are the EXTENDED definitions for the 17C158's Interrupt
+ * Enable Register.
+ */
+#define UART_17158_EFR_ECB      0x10    /* Enhanced control bit */
+#define UART_17158_EFR_IXON     0x2     /* Receiver compares Xon1/Xoff1 */
+#define UART_17158_EFR_IXOFF    0x8     /* Transmit Xon1/Xoff1 */
+#define UART_17158_EFR_RTSDTR   0x40    /* Auto RTS/DTR Flow Control Enable */
+#define UART_17158_EFR_CTSDSR   0x80    /* Auto CTS/DSR Flow COntrol Enable */
+
+#define UART_17158_XOFF_DETECT  0x1     /* Indicates whether chip saw an incoming XOFF char */
+#define UART_17158_XON_DETECT   0x2     /* Indicates whether chip saw an incoming XON char */
+
+#define UART_17158_IER_RSVD1    0x10    /* Reserved by Exar */
+#define UART_17158_IER_XOFF     0x20    /* Xoff Interrupt Enable */
+#define UART_17158_IER_RTSDTR   0x40    /* Output Interrupt Enable */
+#define UART_17158_IER_CTSDSR   0x80    /* Input Interrupt Enable */
+
+#define PCI_DEVICE_NEO_2DB9_PCI_NAME            "Neo 2 - DB9 Universal PCI"
+#define PCI_DEVICE_NEO_2DB9PRI_PCI_NAME         "Neo 2 - DB9 Universal PCI - Powered Ring Indicator"
+#define PCI_DEVICE_NEO_2RJ45_PCI_NAME           "Neo 2 - RJ45 Universal PCI"
+#define PCI_DEVICE_NEO_2RJ45PRI_PCI_NAME        "Neo 2 - RJ45 Universal PCI - Powered Ring Indicator"
+
+/*
+ * Our Global Variables.
+ */
+extern struct   uart_driver jsm_uart_driver;
+extern struct   board_ops jsm_neo_ops;
+extern int      jsm_debug;
+extern int      jsm_rawreadok;
+
+extern int      jsm_driver_state;       /* The state of the driver      */
+extern char     *jsm_driver_state_text[];/* Array of driver state text */
+
+extern spinlock_t jsm_board_head_lock;
+extern struct list_head jsm_board_head;
+
+/*************************************************************************
+ *
+ * Prototypes for non-static functions used in more than one module
+ *
+ *************************************************************************/
+int jsm_tty_write(struct uart_port *port);
+int jsm_tty_init(struct jsm_board *);
+int jsm_uart_port_init(struct jsm_board *);
+int jsm_remove_uart_port(struct jsm_board *);
+void jsm_input(struct jsm_channel *ch);
+void jsm_carrier(struct jsm_channel *ch);
+void jsm_check_queue_flow_control(struct jsm_channel *ch);
+
+void jsm_create_driver_sysfiles(struct device_driver *);
+void jsm_remove_driver_sysfiles(struct device_driver *);
+
+#endif
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
new file mode 100644
index 000000000000..d4847d4f1473
--- /dev/null
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -0,0 +1,404 @@
+/************************************************************************
+ * Copyright 2003 Digi International (www.digi.com)
+ *
+ * Copyright (C) 2004 IBM Corporation. All rights reserved.
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 * Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ *
+ * Contact Information:
+ * Scott H Kilau <Scott_Kilau@digi.com>
+ * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
+ *
+ ***********************************************************************/
+#include <linux/moduleparam.h>
+#include <linux/pci.h>
+
+#include "jsm.h"
+
+MODULE_AUTHOR("Digi International, http://www.digi.com");
+MODULE_DESCRIPTION("Driver for the Digi International Neo PCI based product line");
+MODULE_SUPPORTED_DEVICE("jsm");
+
+#define JSM_DRIVER_NAME "jsm"
+#define NR_PORTS        32
+#define JSM_MINOR_START 0
+
+struct uart_driver jsm_uart_driver = {
+        .owner          = THIS_MODULE,
+        .driver_name    = JSM_DRIVER_NAME,
+        .dev_name       = "ttyn",
+        .major          = 253,
+        .minor          = JSM_MINOR_START,
+        .nr             = NR_PORTS,
+        .cons           = NULL,
+};
+
+int jsm_debug;
+int jsm_rawreadok;
+module_param(jsm_debug, int, 0);
+module_param(jsm_rawreadok, int, 0);
+MODULE_PARM_DESC(jsm_debug, "Driver debugging level");
+MODULE_PARM_DESC(jsm_rawreadok, "Bypass flip buffers on input");
+
+/*
+ * Globals
+ */
+int             jsm_driver_state = DRIVER_INITIALIZED;
+spinlock_t      jsm_board_head_lock = SPIN_LOCK_UNLOCKED;
+LIST_HEAD(jsm_board_head);
+
+static struct pci_device_id jsm_pci_tbl[] = {
+        { PCI_DEVICE (PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9),      0,      0,      0 },
+        { PCI_DEVICE (PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9PRI),   0,      0,      1 },
+        { PCI_DEVICE (PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45),     0,      0,      2 },
+        { PCI_DEVICE (PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45PRI),  0,      0,      3 },
+        { 0,}                                           /* 0 terminated list. */
+};
+MODULE_DEVICE_TABLE(pci, jsm_pci_tbl);
+
+static struct board_id jsm_Ids[] = {
+        { PCI_DEVICE_NEO_2DB9_PCI_NAME,         2 },
+        { PCI_DEVICE_NEO_2DB9PRI_PCI_NAME,      2 },
+        { PCI_DEVICE_NEO_2RJ45_PCI_NAME,        2 },
+        { PCI_DEVICE_NEO_2RJ45PRI_PCI_NAME,     2 },
+        { NULL,                                 0 }
+};
+
+char *jsm_driver_state_text[] = {
+        "Driver Initialized",
+        "Driver Ready."
+};
+
+static int jsm_finalize_board_init(struct jsm_board *brd)
+{
+        int rc = 0;
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+
+        if (brd->irq) {
+                rc = request_irq(brd->irq, brd->bd_ops->intr, SA_INTERRUPT|SA_SHIRQ, "JSM", brd);
+
+                if (rc) {
+                        printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
+                        brd->state = BOARD_FAILED;
+                        brd->dpastatus = BD_NOFEP;
+                        rc = -ENODEV;
+                } else
+                        jsm_printk(INIT, INFO, &brd->pci_dev,
+                                "Requested and received usage of IRQ %d\n", brd->irq);
+        }
+        return rc;
+}
+
+/*
+ * jsm_found_board()
+ *
+ * A board has been found, init it.
+ */
+static int jsm_found_board(struct pci_dev *pdev, int id)
+{
+        struct jsm_board *brd;
+        int i = 0;
+        int rc = 0;
+        struct list_head *tmp;
+        struct jsm_board *cur_board_entry;
+        unsigned long lock_flags;
+        int adapter_count = 0;
+        int retval;
+
+        brd = kmalloc(sizeof(struct jsm_board), GFP_KERNEL);
+        if (!brd) {
+                dev_err(&pdev->dev, "memory allocation for board structure failed\n");
+                return -ENOMEM;
+        }
+        memset(brd, 0, sizeof(struct jsm_board));
+
+        spin_lock_irqsave(&jsm_board_head_lock, lock_flags);
+        list_for_each(tmp, &jsm_board_head) {
+                cur_board_entry =
+                        list_entry(tmp, struct jsm_board,
+                                jsm_board_entry);
+                if (cur_board_entry->boardnum != adapter_count) {
+                        break;
+                }
+                adapter_count++;
+        }
+
+        list_add_tail(&brd->jsm_board_entry, &jsm_board_head);
+        spin_unlock_irqrestore(&jsm_board_head_lock, lock_flags);
+
+        /* store the info for the board we've found */
+        brd->boardnum = adapter_count;
+        brd->pci_dev = pdev;
+        brd->name = jsm_Ids[id].name;
+        brd->maxports = jsm_Ids[id].maxports;
+        brd->dpastatus = BD_NOFEP;
+        init_waitqueue_head(&brd->state_wait);
+
+        spin_lock_init(&brd->bd_lock);
+        spin_lock_init(&brd->bd_intr_lock);
+
+        brd->state = BOARD_FOUND;
+
+        for (i = 0; i < brd->maxports; i++)
+                brd->channels[i] = NULL;
+
+        /* store which revision we have */
+        pci_read_config_byte(pdev, PCI_REVISION_ID, &brd->rev);
+
+        brd->irq = pdev->irq;
+
+        switch(brd->pci_dev->device) {
+
+        case PCI_DEVICE_ID_NEO_2DB9:
+        case PCI_DEVICE_ID_NEO_2DB9PRI:
+        case PCI_DEVICE_ID_NEO_2RJ45:
+        case PCI_DEVICE_ID_NEO_2RJ45PRI:
+
+                /*
+                 * This chip is set up 100% when we get to it.
+                 * No need to enable global interrupts or anything.
+                 */
+                brd->dpatype = T_NEO | T_PCIBUS;
+
+                jsm_printk(INIT, INFO, &brd->pci_dev,
+                        "jsm_found_board - NEO adapter\n");
+
+                /* get the PCI Base Address Registers */
+                brd->membase    = pci_resource_start(pdev, 0);
+                brd->membase_end = pci_resource_end(pdev, 0);
+
+                if (brd->membase & 1)
+                        brd->membase &= ~3;
+                else
+                        brd->membase &= ~15;
+
+                /* Assign the board_ops struct */
+                brd->bd_ops = &jsm_neo_ops;
+
+                brd->bd_uart_offset = 0x200;
+                brd->bd_dividend = 921600;
+
+                brd->re_map_membase = ioremap(brd->membase, 0x1000);
+                jsm_printk(INIT, INFO, &brd->pci_dev,
+                        "remapped mem: 0x%p\n", brd->re_map_membase);
+                if (!brd->re_map_membase) {
+                        kfree(brd);
+                        dev_err(&pdev->dev, "card has no PCI Memory resources, failing board.\n");
+                        return -ENOMEM;
+                }
+                break;
+
+        default:
+                dev_err(&pdev->dev, "Did not find any compatible Neo or Classic PCI boards in system.\n");
+                kfree(brd);
+                return -ENXIO;
+        }
+
+        /*
+         * Do tty device initialization.
+         */
+        rc = jsm_finalize_board_init(brd);
+        if (rc < 0) {
+                dev_err(&pdev->dev, "Can't finalize board init (%d)\n", rc);
+                brd->state = BOARD_FAILED;
+                retval = -ENXIO;
+                goto failed0;
+        }
+
+        rc = jsm_tty_init(brd);
+        if (rc < 0) {
+                dev_err(&pdev->dev, "Can't init tty devices (%d)\n", rc);
+                brd->state = BOARD_FAILED;
+                retval = -ENXIO;
+                goto failed1;
+        }
+
+        rc = jsm_uart_port_init(brd);
+        if (rc < 0) {
+                dev_err(&pdev->dev, "Can't init uart port (%d)\n", rc);
+                brd->state = BOARD_FAILED;
+                retval = -ENXIO;
+                goto failed1;
+        }
+
+        brd->state = BOARD_READY;
+        brd->dpastatus = BD_RUNNING;
+
+        /* Log the information about the board */
+        dev_info(&pdev->dev, "board %d: %s (rev %d), irq %d\n",adapter_count, brd->name, brd->rev, brd->irq);
+
+        /*
+         * allocate flip buffer for board.
+         *
+         * Okay to malloc with GFP_KERNEL, we are not at interrupt
+         * context, and there are no locks held.
+         */
+        brd->flipbuf = kmalloc(MYFLIPLEN, GFP_KERNEL);
+        if (!brd->flipbuf) {
+                dev_err(&pdev->dev, "memory allocation for flipbuf failed\n");
+                brd->state = BOARD_FAILED;
+                retval = -ENOMEM;
+                goto failed1;
+        }
+        memset(brd->flipbuf, 0, MYFLIPLEN);
+
+        jsm_create_driver_sysfiles(pdev->dev.driver);
+
+        wake_up_interruptible(&brd->state_wait);
+        return 0;
+failed1:
+        free_irq(brd->irq, brd);
+failed0:
+        kfree(brd);
+        iounmap(brd->re_map_membase);
+        return retval;
+}
+
+/* returns count (>= 0), or negative on error */
+static int jsm_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int rc;
+
+        rc = pci_enable_device(pdev);
+        if (rc) {
+                dev_err(&pdev->dev, "Device enable FAILED\n");
+                return rc;
+        }
+
+        if ((rc = pci_request_regions(pdev, "jsm"))) {
+        dev_err(&pdev->dev, "pci_request_region FAILED\n");
+                pci_disable_device(pdev);
+                return rc;
+        }
+
+        if ((rc = jsm_found_board(pdev, ent->driver_data))) {
+                dev_err(&pdev->dev, "jsm_found_board FAILED\n");
+                pci_release_regions(pdev);
+                pci_disable_device(pdev);
+                return rc;
+        }
+        return rc;
+}
+
+
+/*
+ * jsm_cleanup_board()
+ *
+ * Free all the memory associated with a board
+ */
+static void jsm_cleanup_board(struct jsm_board *brd)
+{
+        int i = 0;
+
+        free_irq(brd->irq, brd);
+        iounmap(brd->re_map_membase);
+
+        /* Free all allocated channels structs */
+        for (i = 0; i < brd->maxports; i++) {
+                if (brd->channels[i]) {
+                        if (brd->channels[i]->ch_rqueue)
+                                kfree(brd->channels[i]->ch_rqueue);
+                        if (brd->channels[i]->ch_equeue)
+                                kfree(brd->channels[i]->ch_equeue);
+                        if (brd->channels[i]->ch_wqueue)
+                                kfree(brd->channels[i]->ch_wqueue);
+                        kfree(brd->channels[i]);
+                }
+        }
+
+        pci_release_regions(brd->pci_dev);
+        pci_disable_device(brd->pci_dev);
+        kfree(brd->flipbuf);
+        kfree(brd);
+}
+
+static void jsm_remove_one(struct pci_dev *dev)
+{
+        unsigned long lock_flags;
+        struct list_head *tmp;
+        struct jsm_board *brd;
+
+        spin_lock_irqsave(&jsm_board_head_lock, lock_flags);
+        list_for_each(tmp, &jsm_board_head) {
+                brd = list_entry(tmp, struct jsm_board,
+                                        jsm_board_entry);
+                if ( brd != NULL && brd->pci_dev == dev) {
+                        jsm_remove_uart_port(brd);
+                        jsm_cleanup_board(brd);
+                        list_del(&brd->jsm_board_entry);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&jsm_board_head_lock, lock_flags);
+        return;
+}
+
+struct pci_driver jsm_driver = {
+        .name           = "jsm",
+        .probe          = jsm_init_one,
+        .id_table       = jsm_pci_tbl,
+        .remove         = __devexit_p(jsm_remove_one),
+};
+
+/*
+ * jsm_init_module()
+ *
+ * Module load.  This is where it all starts.
+ */
+static int __init jsm_init_module(void)
+{
+        int rc = 0;
+
+        printk(KERN_INFO "%s, Digi International Part Number %s\n",
+                        JSM_VERSION, JSM_VERSION);
+
+        /*
+         * Initialize global stuff
+         */
+
+        rc = uart_register_driver(&jsm_uart_driver);
+        if (rc < 0) {
+                return rc;
+        }
+
+        rc = pci_register_driver(&jsm_driver);
+        if (rc < 0) {
+                uart_unregister_driver(&jsm_uart_driver);
+                return rc;
+        }
+        jsm_driver_state = DRIVER_READY;
+
+        return rc;
+}
+
+module_init(jsm_init_module);
+
+/*
+ * jsm_exit_module()
+ *
+ * Module unload.  This is where it all ends.
+ */
+static void __exit jsm_exit_module(void)
+{
+        jsm_remove_driver_sysfiles(&jsm_driver.driver);
+
+        pci_unregister_driver(&jsm_driver);
+
+        uart_unregister_driver(&jsm_uart_driver);
+}
+module_exit(jsm_exit_module);
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
new file mode 100644
index 000000000000..9b79c1ff6c72
--- /dev/null
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -0,0 +1,1427 @@
+/************************************************************************
+ * Copyright 2003 Digi International (www.digi.com)
+ *
+ * Copyright (C) 2004 IBM Corporation. All rights reserved.
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 * Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ *
+ * Contact Information:
+ * Scott H Kilau <Scott_Kilau@digi.com>
+ * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
+ *
+ ***********************************************************************/
+#include <linux/delay.h>        /* For udelay */
+#include <linux/serial_reg.h>   /* For the various UART offsets */
+#include <linux/tty.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+#include "jsm.h"                /* Driver main header file */
+
+static u32 jsm_offset_table[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 };
+
+/*
+ * This function allows calls to ensure that all outstanding
+ * PCI writes have been completed, by doing a PCI read against
+ * a non-destructive, read-only location on the Neo card.
+ *
+ * In this case, we are reading the DVID (Read-only Device Identification)
+ * value of the Neo card.
+ */
+static inline void neo_pci_posting_flush(struct jsm_board *bd)
+{
+      readb(bd->re_map_membase + 0x8D);
+}
+
+static void neo_set_cts_flow_control(struct jsm_channel *ch)
+{
+        u8 ier = readb(&ch->ch_neo_uart->ier);
+        u8 efr = readb(&ch->ch_neo_uart->efr);
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
+
+        /* Turn on auto CTS flow control */
+        ier |= (UART_17158_IER_CTSDSR);
+        efr |= (UART_17158_EFR_ECB | UART_17158_EFR_CTSDSR);
+
+        /* Turn off auto Xon flow control */
+        efr &= ~(UART_17158_EFR_IXON);
+
+        /* Why? Becuz Exar's spec says we have to zero it out before setting it */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Turn on UART enhanced bits */
+        writeb(efr, &ch->ch_neo_uart->efr);
+
+        /* Turn on table D, with 8 char hi/low watermarks */
+        writeb((UART_17158_FCTR_TRGD | UART_17158_FCTR_RTS_4DELAY), &ch->ch_neo_uart->fctr);
+
+        /* Feed the UART our trigger levels */
+        writeb(8, &ch->ch_neo_uart->tfifo);
+        ch->ch_t_tlevel = 8;
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+}
+
+static void neo_set_rts_flow_control(struct jsm_channel *ch)
+{
+        u8 ier = readb(&ch->ch_neo_uart->ier);
+        u8 efr = readb(&ch->ch_neo_uart->efr);
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
+
+        /* Turn on auto RTS flow control */
+        ier |= (UART_17158_IER_RTSDTR);
+        efr |= (UART_17158_EFR_ECB | UART_17158_EFR_RTSDTR);
+
+        /* Turn off auto Xoff flow control */
+        ier &= ~(UART_17158_IER_XOFF);
+        efr &= ~(UART_17158_EFR_IXOFF);
+
+        /* Why? Becuz Exar's spec says we have to zero it out before setting it */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Turn on UART enhanced bits */
+        writeb(efr, &ch->ch_neo_uart->efr);
+
+        writeb((UART_17158_FCTR_TRGD | UART_17158_FCTR_RTS_4DELAY), &ch->ch_neo_uart->fctr);
+        ch->ch_r_watermark = 4;
+
+        writeb(56, &ch->ch_neo_uart->rfifo);
+        ch->ch_r_tlevel = 56;
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+
+        /*
+         * From the Neo UART spec sheet:
+         * The auto RTS/DTR function must be started by asserting
+         * RTS/DTR# output pin (MCR bit-0 or 1 to logic 1 after
+         * it is enabled.
+         */
+        ch->ch_mostat |= (UART_MCR_RTS);
+}
+
+
+static void neo_set_ixon_flow_control(struct jsm_channel *ch)
+{
+        u8 ier = readb(&ch->ch_neo_uart->ier);
+        u8 efr = readb(&ch->ch_neo_uart->efr);
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
+
+        /* Turn off auto CTS flow control */
+        ier &= ~(UART_17158_IER_CTSDSR);
+        efr &= ~(UART_17158_EFR_CTSDSR);
+
+        /* Turn on auto Xon flow control */
+        efr |= (UART_17158_EFR_ECB | UART_17158_EFR_IXON);
+
+        /* Why? Becuz Exar's spec says we have to zero it out before setting it */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Turn on UART enhanced bits */
+        writeb(efr, &ch->ch_neo_uart->efr);
+
+        writeb((UART_17158_FCTR_TRGD | UART_17158_FCTR_RTS_8DELAY), &ch->ch_neo_uart->fctr);
+        ch->ch_r_watermark = 4;
+
+        writeb(32, &ch->ch_neo_uart->rfifo);
+        ch->ch_r_tlevel = 32;
+
+        /* Tell UART what start/stop chars it should be looking for */
+        writeb(ch->ch_startc, &ch->ch_neo_uart->xonchar1);
+        writeb(0, &ch->ch_neo_uart->xonchar2);
+
+        writeb(ch->ch_stopc, &ch->ch_neo_uart->xoffchar1);
+        writeb(0, &ch->ch_neo_uart->xoffchar2);
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+}
+
+static void neo_set_ixoff_flow_control(struct jsm_channel *ch)
+{
+        u8 ier = readb(&ch->ch_neo_uart->ier);
+        u8 efr = readb(&ch->ch_neo_uart->efr);
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
+
+        /* Turn off auto RTS flow control */
+        ier &= ~(UART_17158_IER_RTSDTR);
+        efr &= ~(UART_17158_EFR_RTSDTR);
+
+        /* Turn on auto Xoff flow control */
+        ier |= (UART_17158_IER_XOFF);
+        efr |= (UART_17158_EFR_ECB | UART_17158_EFR_IXOFF);
+
+        /* Why? Becuz Exar's spec says we have to zero it out before setting it */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Turn on UART enhanced bits */
+        writeb(efr, &ch->ch_neo_uart->efr);
+
+        /* Turn on table D, with 8 char hi/low watermarks */
+        writeb((UART_17158_FCTR_TRGD | UART_17158_FCTR_RTS_8DELAY), &ch->ch_neo_uart->fctr);
+
+        writeb(8, &ch->ch_neo_uart->tfifo);
+        ch->ch_t_tlevel = 8;
+
+        /* Tell UART what start/stop chars it should be looking for */
+        writeb(ch->ch_startc, &ch->ch_neo_uart->xonchar1);
+        writeb(0, &ch->ch_neo_uart->xonchar2);
+
+        writeb(ch->ch_stopc, &ch->ch_neo_uart->xoffchar1);
+        writeb(0, &ch->ch_neo_uart->xoffchar2);
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+}
+
+static void neo_set_no_input_flow_control(struct jsm_channel *ch)
+{
+        u8 ier = readb(&ch->ch_neo_uart->ier);
+        u8 efr = readb(&ch->ch_neo_uart->efr);
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
+
+        /* Turn off auto RTS flow control */
+        ier &= ~(UART_17158_IER_RTSDTR);
+        efr &= ~(UART_17158_EFR_RTSDTR);
+
+        /* Turn off auto Xoff flow control */
+        ier &= ~(UART_17158_IER_XOFF);
+        if (ch->ch_c_iflag & IXON)
+                efr &= ~(UART_17158_EFR_IXOFF);
+        else
+                efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXOFF);
+
+        /* Why? Becuz Exar's spec says we have to zero it out before setting it */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Turn on UART enhanced bits */
+        writeb(efr, &ch->ch_neo_uart->efr);
+
+        /* Turn on table D, with 8 char hi/low watermarks */
+        writeb((UART_17158_FCTR_TRGD | UART_17158_FCTR_RTS_8DELAY), &ch->ch_neo_uart->fctr);
+
+        ch->ch_r_watermark = 0;
+
+        writeb(16, &ch->ch_neo_uart->tfifo);
+        ch->ch_t_tlevel = 16;
+
+        writeb(16, &ch->ch_neo_uart->rfifo);
+        ch->ch_r_tlevel = 16;
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+}
+
+static void neo_set_no_output_flow_control(struct jsm_channel *ch)
+{
+        u8 ier = readb(&ch->ch_neo_uart->ier);
+        u8 efr = readb(&ch->ch_neo_uart->efr);
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");
+
+        /* Turn off auto CTS flow control */
+        ier &= ~(UART_17158_IER_CTSDSR);
+        efr &= ~(UART_17158_EFR_CTSDSR);
+
+        /* Turn off auto Xon flow control */
+        if (ch->ch_c_iflag & IXOFF)
+                efr &= ~(UART_17158_EFR_IXON);
+        else
+                efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXON);
+
+        /* Why? Becuz Exar's spec says we have to zero it out before setting it */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Turn on UART enhanced bits */
+        writeb(efr, &ch->ch_neo_uart->efr);
+
+        /* Turn on table D, with 8 char hi/low watermarks */
+        writeb((UART_17158_FCTR_TRGD | UART_17158_FCTR_RTS_8DELAY), &ch->ch_neo_uart->fctr);
+
+        ch->ch_r_watermark = 0;
+
+        writeb(16, &ch->ch_neo_uart->tfifo);
+        ch->ch_t_tlevel = 16;
+
+        writeb(16, &ch->ch_neo_uart->rfifo);
+        ch->ch_r_tlevel = 16;
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+}
+
+static inline void neo_set_new_start_stop_chars(struct jsm_channel *ch)
+{
+
+        /* if hardware flow control is set, then skip this whole thing */
+        if (ch->ch_c_cflag & CRTSCTS)
+                return;
+
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "start\n");
+
+        /* Tell UART what start/stop chars it should be looking for */
+        writeb(ch->ch_startc, &ch->ch_neo_uart->xonchar1);
+        writeb(0, &ch->ch_neo_uart->xonchar2);
+
+        writeb(ch->ch_stopc, &ch->ch_neo_uart->xoffchar1);
+        writeb(0, &ch->ch_neo_uart->xoffchar2);
+}
+
+static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
+{
+        int qleft = 0;
+        u8 linestatus = 0;
+        u8 error_mask = 0;
+        int n = 0;
+        int total = 0;
+        u16 head;
+        u16 tail;
+
+        if (!ch)
+                return;
+
+        /* cache head and tail of queue */
+        head = ch->ch_r_head & RQUEUEMASK;
+        tail = ch->ch_r_tail & RQUEUEMASK;
+
+        /* Get our cached LSR */
+        linestatus = ch->ch_cached_lsr;
+        ch->ch_cached_lsr = 0;
+
+        /* Store how much space we have left in the queue */
+        if ((qleft = tail - head - 1) < 0)
+                qleft += RQUEUEMASK + 1;
+
+        /*
+         * If the UART is not in FIFO mode, force the FIFO copy to
+         * NOT be run, by setting total to 0.
+         *
+         * On the other hand, if the UART IS in FIFO mode, then ask
+         * the UART to give us an approximation of data it has RX'ed.
+         */
+        if (!(ch->ch_flags & CH_FIFO_ENABLED))
+                total = 0;
+        else {
+                total = readb(&ch->ch_neo_uart->rfifo);
+
+                /*
+                 * EXAR chip bug - RX FIFO COUNT - Fudge factor.
+                 *
+                 * This resolves a problem/bug with the Exar chip that sometimes
+                 * returns a bogus value in the rfifo register.
+                 * The count can be any where from 0-3 bytes "off".
+                 * Bizarre, but true.
+                 */
+                total -= 3;
+        }
+
+        /*
+         * Finally, bound the copy to make sure we don't overflow
+         * our own queue...
+         * The byte by byte copy loop below this loop this will
+         * deal with the queue overflow possibility.
+         */
+        total = min(total, qleft);
+
+        while (total > 0) {
+                /*
+                 * Grab the linestatus register, we need to check
+                 * to see if there are any errors in the FIFO.
+                 */
+                linestatus = readb(&ch->ch_neo_uart->lsr);
+
+                /*
+                 * Break out if there is a FIFO error somewhere.
+                 * This will allow us to go byte by byte down below,
+                 * finding the exact location of the error.
+                 */
+                if (linestatus & UART_17158_RX_FIFO_DATA_ERROR)
+                        break;
+
+                /* Make sure we don't go over the end of our queue */
+                n = min(((u32) total), (RQUEUESIZE - (u32) head));
+
+                /*
+                 * Cut down n even further if needed, this is to fix
+                 * a problem with memcpy_fromio() with the Neo on the
+                 * IBM pSeries platform.
+                 * 15 bytes max appears to be the magic number.
+                 */
+                n = min((u32) n, (u32) 12);
+
+                /*
+                 * Since we are grabbing the linestatus register, which
+                 * will reset some bits after our read, we need to ensure
+                 * we don't miss our TX FIFO emptys.
+                 */
+                if (linestatus & (UART_LSR_THRE | UART_17158_TX_AND_FIFO_CLR))
+                        ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+
+                linestatus = 0;
+
+                /* Copy data from uart to the queue */
+                memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n);
+                /*
+                 * Since RX_FIFO_DATA_ERROR was 0, we are guarenteed
+                 * that all the data currently in the FIFO is free of
+                 * breaks and parity/frame/orun errors.
+                 */
+                memset(ch->ch_equeue + head, 0, n);
+
+                /* Add to and flip head if needed */
+                head = (head + n) & RQUEUEMASK;
+                total -= n;
+                qleft -= n;
+                ch->ch_rxcount += n;
+        }
+
+        /*
+         * Create a mask to determine whether we should
+         * insert the character (if any) into our queue.
+         */
+        if (ch->ch_c_iflag & IGNBRK)
+                error_mask |= UART_LSR_BI;
+
+        /*
+         * Now cleanup any leftover bytes still in the UART.
+         * Also deal with any possible queue overflow here as well.
+         */
+        while (1) {
+
+                /*
+                 * Its possible we have a linestatus from the loop above
+                 * this, so we "OR" on any extra bits.
+                 */
+                linestatus |= readb(&ch->ch_neo_uart->lsr);
+
+                /*
+                 * If the chip tells us there is no more data pending to
+                 * be read, we can then leave.
+                 * But before we do, cache the linestatus, just in case.
+                 */
+                if (!(linestatus & UART_LSR_DR)) {
+                        ch->ch_cached_lsr = linestatus;
+                        break;
+                }
+
+                /* No need to store this bit */
+                linestatus &= ~UART_LSR_DR;
+
+                /*
+                 * Since we are grabbing the linestatus register, which
+                 * will reset some bits after our read, we need to ensure
+                 * we don't miss our TX FIFO emptys.
+                 */
+                if (linestatus & (UART_LSR_THRE | UART_17158_TX_AND_FIFO_CLR)) {
+                        linestatus &= ~(UART_LSR_THRE | UART_17158_TX_AND_FIFO_CLR);
+                        ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+                }
+
+                /*
+                 * Discard character if we are ignoring the error mask.
+                 */
+                if (linestatus & error_mask) {
+                        u8 discard;
+                        linestatus = 0;
+                        memcpy_fromio(&discard, &ch->ch_neo_uart->txrxburst, 1);
+                        continue;
+                }
+
+                /*
+                 * If our queue is full, we have no choice but to drop some data.
+                 * The assumption is that HWFLOW or SWFLOW should have stopped
+                 * things way way before we got to this point.
+                 *
+                 * I decided that I wanted to ditch the oldest data first,
+                 * I hope thats okay with everyone? Yes? Good.
+                 */
+                while (qleft < 1) {
+                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                "Queue full, dropping DATA:%x LSR:%x\n",
+                                ch->ch_rqueue[tail], ch->ch_equeue[tail]);
+
+                        ch->ch_r_tail = tail = (tail + 1) & RQUEUEMASK;
+                        ch->ch_err_overrun++;
+                        qleft++;
+                }
+
+                memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, 1);
+                ch->ch_equeue[head] = (u8) linestatus;
+
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                "DATA/LSR pair: %x %x\n", ch->ch_rqueue[head], ch->ch_equeue[head]);
+
+                /* Ditch any remaining linestatus value. */
+                linestatus = 0;
+
+                /* Add to and flip head if needed */
+                head = (head + 1) & RQUEUEMASK;
+
+                qleft--;
+                ch->ch_rxcount++;
+        }
+
+        /*
+         * Write new final heads to channel structure.
+         */
+        ch->ch_r_head = head & RQUEUEMASK;
+        ch->ch_e_head = head & EQUEUEMASK;
+        jsm_input(ch);
+}
+
+static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
+{
+        u16 head;
+        u16 tail;
+        int n;
+        int s;
+        int qlen;
+        u32 len_written = 0;
+
+        if (!ch)
+                return;
+
+        /* No data to write to the UART */
+        if (ch->ch_w_tail == ch->ch_w_head)
+                return;
+
+        /* If port is "stopped", don't send any data to the UART */
+        if ((ch->ch_flags & CH_STOP) || (ch->ch_flags & CH_BREAK_SENDING))
+                return;
+        /*
+         * If FIFOs are disabled. Send data directly to txrx register
+         */
+        if (!(ch->ch_flags & CH_FIFO_ENABLED)) {
+                u8 lsrbits = readb(&ch->ch_neo_uart->lsr);
+
+                ch->ch_cached_lsr |= lsrbits;
+                if (ch->ch_cached_lsr & UART_LSR_THRE) {
+                        ch->ch_cached_lsr &= ~(UART_LSR_THRE);
+
+                        writeb(ch->ch_wqueue[ch->ch_w_tail], &ch->ch_neo_uart->txrx);
+                        jsm_printk(WRITE, INFO, &ch->ch_bd->pci_dev,
+                                        "Tx data: %x\n", ch->ch_wqueue[ch->ch_w_head]);
+                        ch->ch_w_tail++;
+                        ch->ch_w_tail &= WQUEUEMASK;
+                        ch->ch_txcount++;
+                }
+                return;
+        }
+
+        /*
+         * We have to do it this way, because of the EXAR TXFIFO count bug.
+         */
+        if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM)))
+                return;
+
+        len_written = 0;
+        n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel;
+
+        /* cache head and tail of queue */
+        head = ch->ch_w_head & WQUEUEMASK;
+        tail = ch->ch_w_tail & WQUEUEMASK;
+        qlen = (head - tail) & WQUEUEMASK;
+
+        /* Find minimum of the FIFO space, versus queue length */
+        n = min(n, qlen);
+
+        while (n > 0) {
+
+                s = ((head >= tail) ? head : WQUEUESIZE) - tail;
+                s = min(s, n);
+
+                if (s <= 0)
+                        break;
+
+                memcpy_toio(&ch->ch_neo_uart->txrxburst, ch->ch_wqueue + tail, s);
+                /* Add and flip queue if needed */
+                tail = (tail + s) & WQUEUEMASK;
+                n -= s;
+                ch->ch_txcount += s;
+                len_written += s;
+        }
+
+        /* Update the final tail */
+        ch->ch_w_tail = tail & WQUEUEMASK;
+
+        if (len_written >= ch->ch_t_tlevel)
+                ch->ch_flags &= ~(CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+
+        if (!jsm_tty_write(&ch->uart_port))
+                uart_write_wakeup(&ch->uart_port);
+}
+
+static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
+{
+        u8 msignals = signals;
+
+        jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev,
+                        "neo_parse_modem: port: %d msignals: %x\n", ch->ch_portnum, msignals);
+
+        if (!ch)
+                return;
+
+        /* Scrub off lower bits. They signify delta's, which I don't care about */
+        msignals &= 0xf0;
+
+        if (msignals & UART_MSR_DCD)
+                ch->ch_mistat |= UART_MSR_DCD;
+        else
+                ch->ch_mistat &= ~UART_MSR_DCD;
+
+        if (msignals & UART_MSR_DSR)
+                ch->ch_mistat |= UART_MSR_DSR;
+        else
+                ch->ch_mistat &= ~UART_MSR_DSR;
+
+        if (msignals & UART_MSR_RI)
+                ch->ch_mistat |= UART_MSR_RI;
+        else
+                ch->ch_mistat &= ~UART_MSR_RI;
+
+        if (msignals & UART_MSR_CTS)
+                ch->ch_mistat |= UART_MSR_CTS;
+        else
+                ch->ch_mistat &= ~UART_MSR_CTS;
+
+        jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev,
+                        "Port: %d DTR: %d RTS: %d CTS: %d DSR: %d " "RI: %d CD: %d\n",
+                ch->ch_portnum,
+                !!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_DTR),
+                !!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_RTS),
+                !!((ch->ch_mistat | ch->ch_mostat) & UART_MSR_CTS),
+                !!((ch->ch_mistat | ch->ch_mostat) & UART_MSR_DSR),
+                !!((ch->ch_mistat | ch->ch_mostat) & UART_MSR_RI),
+                !!((ch->ch_mistat | ch->ch_mostat) & UART_MSR_DCD));
+}
+
+/* Make the UART raise any of the output signals we want up */
+static void neo_assert_modem_signals(struct jsm_channel *ch)
+{
+        u8 out;
+
+        if (!ch)
+                return;
+
+        out = ch->ch_mostat;
+
+        writeb(out, &ch->ch_neo_uart->mcr);
+
+        /* flush write operation */
+        neo_pci_posting_flush(ch->ch_bd);
+}
+
+/*
+ * Flush the WRITE FIFO on the Neo.
+ *
+ * NOTE: Channel lock MUST be held before calling this function!
+ */
+static void neo_flush_uart_write(struct jsm_channel *ch)
+{
+        u8 tmp = 0;
+        int i = 0;
+
+        if (!ch)
+                return;
+
+        writeb((UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_XMIT), &ch->ch_neo_uart->isr_fcr);
+
+        for (i = 0; i < 10; i++) {
+
+                /* Check to see if the UART feels it completely flushed the FIFO. */
+                tmp = readb(&ch->ch_neo_uart->isr_fcr);
+                if (tmp & 4) {
+                        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev,
+                                        "Still flushing TX UART... i: %d\n", i);
+                        udelay(10);
+                }
+                else
+                        break;
+        }
+
+        ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+}
+
+
+/*
+ * Flush the READ FIFO on the Neo.
+ *
+ * NOTE: Channel lock MUST be held before calling this function!
+ */
+static void neo_flush_uart_read(struct jsm_channel *ch)
+{
+        u8 tmp = 0;
+        int i = 0;
+
+        if (!ch)
+                return;
+
+        writeb((UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR), &ch->ch_neo_uart->isr_fcr);
+
+        for (i = 0; i < 10; i++) {
+
+                /* Check to see if the UART feels it completely flushed the FIFO. */
+                tmp = readb(&ch->ch_neo_uart->isr_fcr);
+                if (tmp & 2) {
+                        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev,
+                                        "Still flushing RX UART... i: %d\n", i);
+                        udelay(10);
+                }
+                else
+                        break;
+        }
+}
+
+/*
+ * No locks are assumed to be held when calling this function.
+ */
+void neo_clear_break(struct jsm_channel *ch, int force)
+{
+        unsigned long lock_flags;
+
+        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+
+        /* Turn break off, and unset some variables */
+        if (ch->ch_flags & CH_BREAK_SENDING) {
+                u8 temp = readb(&ch->ch_neo_uart->lcr);
+                writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr);
+
+                ch->ch_flags &= ~(CH_BREAK_SENDING);
+                jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev,
+                                "clear break Finishing UART_LCR_SBC! finished: %lx\n", jiffies);
+
+                /* flush write operation */
+                neo_pci_posting_flush(ch->ch_bd);
+        }
+        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+}
+
+/*
+ * Parse the ISR register.
+ */
+static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
+{
+        struct jsm_channel *ch;
+        u8 isr;
+        u8 cause;
+        unsigned long lock_flags;
+
+        if (!brd)
+                return;
+
+        if (port > brd->maxports)
+                return;
+
+        ch = brd->channels[port];
+        if (!ch)
+                return;
+
+        /* Here we try to figure out what caused the interrupt to happen */
+        while (1) {
+
+                isr = readb(&ch->ch_neo_uart->isr_fcr);
+
+                /* Bail if no pending interrupt */
+                if (isr & UART_IIR_NO_INT)
+                        break;
+
+                /*
+                 * Yank off the upper 2 bits, which just show that the FIFO's are enabled.
+                 */
+                isr &= ~(UART_17158_IIR_FIFO_ENABLED);
+
+                jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                "%s:%d isr: %x\n", __FILE__, __LINE__, isr);
+
+                if (isr & (UART_17158_IIR_RDI_TIMEOUT | UART_IIR_RDI)) {
+                        /* Read data from uart -> queue */
+                        neo_copy_data_from_uart_to_queue(ch);
+
+                        /* Call our tty layer to enforce queue flow control if needed. */
+                        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                        jsm_check_queue_flow_control(ch);
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                }
+
+                if (isr & UART_IIR_THRI) {
+                        /* Transfer data (if any) from Write Queue -> UART. */
+                        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                        ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                        neo_copy_data_from_queue_to_uart(ch);
+                }
+
+                if (isr & UART_17158_IIR_XONXOFF) {
+                        cause = readb(&ch->ch_neo_uart->xoffchar1);
+
+                        jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                        "Port %d. Got ISR_XONXOFF: cause:%x\n", port, cause);
+
+                        /*
+                         * Since the UART detected either an XON or
+                         * XOFF match, we need to figure out which
+                         * one it was, so we can suspend or resume data flow.
+                         */
+                        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                        if (cause == UART_17158_XON_DETECT) {
+                                /* Is output stopped right now, if so, resume it */
+                                if (brd->channels[port]->ch_flags & CH_STOP) {
+                                        ch->ch_flags &= ~(CH_STOP);
+                                }
+                                jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                                "Port %d. XON detected in incoming data\n", port);
+                        }
+                        else if (cause == UART_17158_XOFF_DETECT) {
+                                if (!(brd->channels[port]->ch_flags & CH_STOP)) {
+                                        ch->ch_flags |= CH_STOP;
+                                        jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                                        "Setting CH_STOP\n");
+                                }
+                                jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                                "Port: %d. XOFF detected in incoming data\n", port);
+                        }
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                }
+
+                if (isr & UART_17158_IIR_HWFLOW_STATE_CHANGE) {
+                        /*
+                         * If we get here, this means the hardware is doing auto flow control.
+                         * Check to see whether RTS/DTR or CTS/DSR caused this interrupt.
+                         */
+                        cause = readb(&ch->ch_neo_uart->mcr);
+
+                        /* Which pin is doing auto flow? RTS or DTR? */
+                        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                        if ((cause & 0x4) == 0) {
+                                if (cause & UART_MCR_RTS)
+                                        ch->ch_mostat |= UART_MCR_RTS;
+                                else
+                                        ch->ch_mostat &= ~(UART_MCR_RTS);
+                        } else {
+                                if (cause & UART_MCR_DTR)
+                                        ch->ch_mostat |= UART_MCR_DTR;
+                                else
+                                        ch->ch_mostat &= ~(UART_MCR_DTR);
+                        }
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                }
+
+                /* Parse any modem signal changes */
+                jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                "MOD_STAT: sending to parse_modem_sigs\n");
+                neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr));
+        }
+}
+
+static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
+{
+        struct jsm_channel *ch;
+        int linestatus;
+        unsigned long lock_flags;
+
+        if (!brd)
+                return;
+
+        if (port > brd->maxports)
+                return;
+
+        ch = brd->channels[port];
+        if (!ch)
+                return;
+
+        linestatus = readb(&ch->ch_neo_uart->lsr);
+
+        jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                        "%s:%d port: %d linestatus: %x\n", __FILE__, __LINE__, port, linestatus);
+
+        ch->ch_cached_lsr |= linestatus;
+
+        if (ch->ch_cached_lsr & UART_LSR_DR) {
+                /* Read data from uart -> queue */
+                neo_copy_data_from_uart_to_queue(ch);
+                spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                jsm_check_queue_flow_control(ch);
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+        }
+
+        /*
+         * This is a special flag. It indicates that at least 1
+         * RX error (parity, framing, or break) has happened.
+         * Mark this in our struct, which will tell me that I have
+         *to do the special RX+LSR read for this FIFO load.
+         */
+        if (linestatus & UART_17158_RX_FIFO_DATA_ERROR)
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d Got an RX error, need to parse LSR\n",
+                        __FILE__, __LINE__, port);
+
+        /*
+         * The next 3 tests should *NOT* happen, as the above test
+         * should encapsulate all 3... At least, thats what Exar says.
+         */
+
+        if (linestatus & UART_LSR_PE) {
+                ch->ch_err_parity++;
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d. PAR ERR!\n", __FILE__, __LINE__, port);
+        }
+
+        if (linestatus & UART_LSR_FE) {
+                ch->ch_err_frame++;
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d. FRM ERR!\n", __FILE__, __LINE__, port);
+        }
+
+        if (linestatus & UART_LSR_BI) {
+                ch->ch_err_break++;
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d. BRK INTR!\n", __FILE__, __LINE__, port);
+        }
+
+        if (linestatus & UART_LSR_OE) {
+                /*
+                 * Rx Oruns. Exar says that an orun will NOT corrupt
+                 * the FIFO. It will just replace the holding register
+                 * with this new data byte. So basically just ignore this.
+                 * Probably we should eventually have an orun stat in our driver...
+                 */
+                ch->ch_err_overrun++;
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d. Rx Overrun!\n", __FILE__, __LINE__, port);
+        }
+
+        if (linestatus & UART_LSR_THRE) {
+                spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+
+                /* Transfer data (if any) from Write Queue -> UART. */
+                neo_copy_data_from_queue_to_uart(ch);
+        }
+        else if (linestatus & UART_17158_TX_AND_FIFO_CLR) {
+                spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+
+                /* Transfer data (if any) from Write Queue -> UART. */
+                neo_copy_data_from_queue_to_uart(ch);
+        }
+}
+
+/*
+ * neo_param()
+ * Send any/all changes to the line to the UART.
+ */
+static void neo_param(struct jsm_channel *ch)
+{
+        u8 lcr = 0;
+        u8 uart_lcr = 0;
+        u8 ier = 0;
+        u32 baud = 9600;
+        int quot = 0;
+        struct jsm_board *bd;
+
+        bd = ch->ch_bd;
+        if (!bd)
+                return;
+
+        /*
+         * If baud rate is zero, flush queues, and set mval to drop DTR.
+         */
+        if ((ch->ch_c_cflag & (CBAUD)) == 0) {
+                ch->ch_r_head = ch->ch_r_tail = 0;
+                ch->ch_e_head = ch->ch_e_tail = 0;
+                ch->ch_w_head = ch->ch_w_tail = 0;
+
+                neo_flush_uart_write(ch);
+                neo_flush_uart_read(ch);
+
+                ch->ch_flags |= (CH_BAUD0);
+                ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR);
+                neo_assert_modem_signals(ch);
+                ch->ch_old_baud = 0;
+                return;
+
+        } else if (ch->ch_custom_speed) {
+                        baud = ch->ch_custom_speed;
+                        if (ch->ch_flags & CH_BAUD0)
+                                ch->ch_flags &= ~(CH_BAUD0);
+                } else {
+                        int iindex = 0;
+                        int jindex = 0;
+
+                        const u64 bauds[4][16] = {
+                                {
+                                        0,      50,     75,     110,
+                                        134,    150,    200,    300,
+                                        600,    1200,   1800,   2400,
+                                        4800,   9600,   19200,  38400 },
+                                {
+                                        0,      57600,  115200, 230400,
+                                        460800, 150,    200,    921600,
+                                        600,    1200,   1800,   2400,
+                                        4800,   9600,   19200,  38400 },
+                                {
+                                        0,      57600,  76800, 115200,
+                                        131657, 153600, 230400, 460800,
+                                        921600, 1200,   1800,   2400,
+                                        4800,   9600,   19200,  38400 },
+                                {
+                                        0,      57600,  115200, 230400,
+                                        460800, 150,    200,    921600,
+                                        600,    1200,   1800,   2400,
+                                        4800,   9600,   19200,  38400 }
+                        };
+
+                        baud = C_BAUD(ch->uart_port.info->tty) & 0xff;
+
+                        if (ch->ch_c_cflag & CBAUDEX)
+                                iindex = 1;
+
+                        jindex = baud;
+
+                        if ((iindex >= 0) && (iindex < 4) && (jindex >= 0) && (jindex < 16))
+                                baud = bauds[iindex][jindex];
+                        else {
+                                jsm_printk(IOCTL, DEBUG, &ch->ch_bd->pci_dev,
+                                        "baud indices were out of range (%d)(%d)",
+                                iindex, jindex);
+                                baud = 0;
+                        }
+
+                        if (baud == 0)
+                                baud = 9600;
+
+                        if (ch->ch_flags & CH_BAUD0)
+                                ch->ch_flags &= ~(CH_BAUD0);
+                }
+
+        if (ch->ch_c_cflag & PARENB)
+                lcr |= UART_LCR_PARITY;
+
+        if (!(ch->ch_c_cflag & PARODD))
+                lcr |= UART_LCR_EPAR;
+
+        /*
+         * Not all platforms support mark/space parity,
+         * so this will hide behind an ifdef.
+         */
+#ifdef CMSPAR
+        if (ch->ch_c_cflag & CMSPAR)
+                lcr |= UART_LCR_SPAR;
+#endif
+
+        if (ch->ch_c_cflag & CSTOPB)
+                lcr |= UART_LCR_STOP;
+
+        switch (ch->ch_c_cflag & CSIZE) {
+                case CS5:
+                        lcr |= UART_LCR_WLEN5;
+                        break;
+                case CS6:
+                        lcr |= UART_LCR_WLEN6;
+                        break;
+                case CS7:
+                        lcr |= UART_LCR_WLEN7;
+                        break;
+                case CS8:
+                default:
+                        lcr |= UART_LCR_WLEN8;
+                break;
+        }
+
+        ier = readb(&ch->ch_neo_uart->ier);
+        uart_lcr = readb(&ch->ch_neo_uart->lcr);
+
+        if (baud == 0)
+                baud = 9600;
+
+        quot = ch->ch_bd->bd_dividend / baud;
+
+        if (quot != 0) {
+                ch->ch_old_baud = baud;
+                writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr);
+                writeb((quot & 0xff), &ch->ch_neo_uart->txrx);
+                writeb((quot >> 8), &ch->ch_neo_uart->ier);
+                writeb(lcr, &ch->ch_neo_uart->lcr);
+        }
+
+        if (uart_lcr != lcr)
+                writeb(lcr, &ch->ch_neo_uart->lcr);
+
+        if (ch->ch_c_cflag & CREAD)
+                ier |= (UART_IER_RDI | UART_IER_RLSI);
+
+        ier |= (UART_IER_THRI | UART_IER_MSI);
+
+        writeb(ier, &ch->ch_neo_uart->ier);
+
+        /* Set new start/stop chars */
+        neo_set_new_start_stop_chars(ch);
+
+        if (ch->ch_c_cflag & CRTSCTS)
+                neo_set_cts_flow_control(ch);
+        else if (ch->ch_c_iflag & IXON) {
+                /* If start/stop is set to disable, then we should disable flow control */
+                if ((ch->ch_startc == __DISABLED_CHAR) || (ch->ch_stopc == __DISABLED_CHAR))
+                        neo_set_no_output_flow_control(ch);
+                else
+                        neo_set_ixon_flow_control(ch);
+        }
+        else
+                neo_set_no_output_flow_control(ch);
+
+        if (ch->ch_c_cflag & CRTSCTS)
+                neo_set_rts_flow_control(ch);
+        else if (ch->ch_c_iflag & IXOFF) {
+                /* If start/stop is set to disable, then we should disable flow control */
+                if ((ch->ch_startc == __DISABLED_CHAR) || (ch->ch_stopc == __DISABLED_CHAR))
+                        neo_set_no_input_flow_control(ch);
+                else
+                        neo_set_ixoff_flow_control(ch);
+        }
+        else
+                neo_set_no_input_flow_control(ch);
+        /*
+         * Adjust the RX FIFO Trigger level if baud is less than 9600.
+         * Not exactly elegant, but this is needed because of the Exar chip's
+         * delay on firing off the RX FIFO interrupt on slower baud rates.
+         */
+        if (baud < 9600) {
+                writeb(1, &ch->ch_neo_uart->rfifo);
+                ch->ch_r_tlevel = 1;
+        }
+
+        neo_assert_modem_signals(ch);
+
+        /* Get current status of the modem signals now */
+        neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr));
+        return;
+}
+
+/*
+ * jsm_neo_intr()
+ *
+ * Neo specific interrupt handler.
+ */
+static irqreturn_t neo_intr(int irq, void *voidbrd, struct pt_regs *regs)
+{
+        struct jsm_board *brd = (struct jsm_board *) voidbrd;
+        struct jsm_channel *ch;
+        int port = 0;
+        int type = 0;
+        int current_port;
+        u32 tmp;
+        u32 uart_poll;
+        unsigned long lock_flags;
+        unsigned long lock_flags2;
+        int outofloop_count = 0;
+
+        brd->intr_count++;
+
+        /* Lock out the slow poller from running on this board. */
+        spin_lock_irqsave(&brd->bd_intr_lock, lock_flags);
+
+        /*
+         * Read in "extended" IRQ information from the 32bit Neo register.
+         * Bits 0-7: What port triggered the interrupt.
+         * Bits 8-31: Each 3bits indicate what type of interrupt occurred.
+         */
+        uart_poll = readl(brd->re_map_membase + UART_17158_POLL_ADDR_OFFSET);
+
+        jsm_printk(INTR, INFO, &brd->pci_dev,
+                "%s:%d uart_poll: %x\n", __FILE__, __LINE__, uart_poll);
+
+        if (!uart_poll) {
+                jsm_printk(INTR, INFO, &brd->pci_dev,
+                        "Kernel interrupted to me, but no pending interrupts...\n");
+                spin_unlock_irqrestore(&brd->bd_intr_lock, lock_flags);
+                return IRQ_NONE;
+        }
+
+        /* At this point, we have at least SOMETHING to service, dig further... */
+
+        current_port = 0;
+
+        /* Loop on each port */
+        while (((uart_poll & 0xff) != 0) && (outofloop_count < 0xff)){
+
+                tmp = uart_poll;
+                outofloop_count++;
+
+                /* Check current port to see if it has interrupt pending */
+                if ((tmp & jsm_offset_table[current_port]) != 0) {
+                        port = current_port;
+                        type = tmp >> (8 + (port * 3));
+                        type &= 0x7;
+                } else {
+                        current_port++;
+                        continue;
+                }
+
+                jsm_printk(INTR, INFO, &brd->pci_dev,
+                "%s:%d port: %x type: %x\n", __FILE__, __LINE__, port, type);
+
+                /* Remove this port + type from uart_poll */
+                uart_poll &= ~(jsm_offset_table[port]);
+
+                if (!type) {
+                        /* If no type, just ignore it, and move onto next port */
+                        jsm_printk(INTR, ERR, &brd->pci_dev,
+                                "Interrupt with no type! port: %d\n", port);
+                        continue;
+                }
+
+                /* Switch on type of interrupt we have */
+                switch (type) {
+
+                case UART_17158_RXRDY_TIMEOUT:
+                        /*
+                         * RXRDY Time-out is cleared by reading data in the
+                        * RX FIFO until it falls below the trigger level.
+                         */
+
+                        /* Verify the port is in range. */
+                        if (port > brd->nasync)
+                                continue;
+
+                        ch = brd->channels[port];
+                        neo_copy_data_from_uart_to_queue(ch);
+
+                        /* Call our tty layer to enforce queue flow control if needed. */
+                        spin_lock_irqsave(&ch->ch_lock, lock_flags2);
+                        jsm_check_queue_flow_control(ch);
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
+
+                        continue;
+
+                case UART_17158_RX_LINE_STATUS:
+                        /*
+                         * RXRDY and RX LINE Status (logic OR of LSR[4:1])
+                         */
+                        neo_parse_lsr(brd, port);
+                        continue;
+
+                case UART_17158_TXRDY:
+                        /*
+                         * TXRDY interrupt clears after reading ISR register for the UART channel.
+                         */
+
+                        /*
+                         * Yes, this is odd...
+                         * Why would I check EVERY possibility of type of
+                         * interrupt, when we know its TXRDY???
+                         * Becuz for some reason, even tho we got triggered for TXRDY,
+                         * it seems to be occassionally wrong. Instead of TX, which
+                         * it should be, I was getting things like RXDY too. Weird.
+                         */
+                        neo_parse_isr(brd, port);
+                        continue;
+
+                case UART_17158_MSR:
+                        /*
+                         * MSR or flow control was seen.
+                         */
+                        neo_parse_isr(brd, port);
+                        continue;
+
+                default:
+                        /*
+                         * The UART triggered us with a bogus interrupt type.
+                         * It appears the Exar chip, when REALLY bogged down, will throw
+                         * these once and awhile.
+                         * Its harmless, just ignore it and move on.
+                         */
+                        jsm_printk(INTR, ERR, &brd->pci_dev,
+                                "%s:%d Unknown Interrupt type: %x\n", __FILE__, __LINE__, type);
+                        continue;
+                }
+        }
+
+        spin_unlock_irqrestore(&brd->bd_intr_lock, lock_flags);
+
+        jsm_printk(INTR, INFO, &brd->pci_dev, "finish.\n");
+        return IRQ_HANDLED;
+}
+
+/*
+ * Neo specific way of turning off the receiver.
+ * Used as a way to enforce queue flow control when in
+ * hardware flow control mode.
+ */
+static void neo_disable_receiver(struct jsm_channel *ch)
+{
+        u8 tmp = readb(&ch->ch_neo_uart->ier);
+        tmp &= ~(UART_IER_RDI);
+        writeb(tmp, &ch->ch_neo_uart->ier);
+
+        /* flush write operation */
+        neo_pci_posting_flush(ch->ch_bd);
+}
+
+
+/*
+ * Neo specific way of turning on the receiver.
+ * Used as a way to un-enforce queue flow control when in
+ * hardware flow control mode.
+ */
+static void neo_enable_receiver(struct jsm_channel *ch)
+{
+        u8 tmp = readb(&ch->ch_neo_uart->ier);
+        tmp |= (UART_IER_RDI);
+        writeb(tmp, &ch->ch_neo_uart->ier);
+
+        /* flush write operation */
+        neo_pci_posting_flush(ch->ch_bd);
+}
+
+static void neo_send_start_character(struct jsm_channel *ch)
+{
+        if (!ch)
+                return;
+
+        if (ch->ch_startc != __DISABLED_CHAR) {
+                ch->ch_xon_sends++;
+                writeb(ch->ch_startc, &ch->ch_neo_uart->txrx);
+
+                /* flush write operation */
+                neo_pci_posting_flush(ch->ch_bd);
+        }
+}
+
+static void neo_send_stop_character(struct jsm_channel *ch)
+{
+        if (!ch)
+                return;
+
+        if (ch->ch_stopc != __DISABLED_CHAR) {
+                ch->ch_xoff_sends++;
+                writeb(ch->ch_stopc, &ch->ch_neo_uart->txrx);
+
+                /* flush write operation */
+                neo_pci_posting_flush(ch->ch_bd);
+        }
+}
+
+/*
+ * neo_uart_init
+ */
+static void neo_uart_init(struct jsm_channel *ch)
+{
+        writeb(0, &ch->ch_neo_uart->ier);
+        writeb(0, &ch->ch_neo_uart->efr);
+        writeb(UART_EFR_ECB, &ch->ch_neo_uart->efr);
+
+        /* Clear out UART and FIFO */
+        readb(&ch->ch_neo_uart->txrx);
+        writeb((UART_FCR_ENABLE_FIFO|UART_FCR_CLEAR_RCVR|UART_FCR_CLEAR_XMIT), &ch->ch_neo_uart->isr_fcr);
+        readb(&ch->ch_neo_uart->lsr);
+        readb(&ch->ch_neo_uart->msr);
+
+        ch->ch_flags |= CH_FIFO_ENABLED;
+
+        /* Assert any signals we want up */
+        writeb(ch->ch_mostat, &ch->ch_neo_uart->mcr);
+}
+
+/*
+ * Make the UART completely turn off.
+ */
+static void neo_uart_off(struct jsm_channel *ch)
+{
+        /* Turn off UART enhanced bits */
+        writeb(0, &ch->ch_neo_uart->efr);
+
+        /* Stop all interrupts from occurring. */
+        writeb(0, &ch->ch_neo_uart->ier);
+}
+
+static u32 neo_get_uart_bytes_left(struct jsm_channel *ch)
+{
+        u8 left = 0;
+        u8 lsr = readb(&ch->ch_neo_uart->lsr);
+
+        /* We must cache the LSR as some of the bits get reset once read... */
+        ch->ch_cached_lsr |= lsr;
+
+        /* Determine whether the Transmitter is empty or not */
+        if (!(lsr & UART_LSR_TEMT))
+                left = 1;
+        else {
+                ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
+                left = 0;
+        }
+
+        return left;
+}
+
+/* Channel lock MUST be held by the calling function! */
+static void neo_send_break(struct jsm_channel *ch)
+{
+        /*
+         * Set the time we should stop sending the break.
+         * If we are already sending a break, toss away the existing
+         * time to stop, and use this new value instead.
+         */
+
+        /* Tell the UART to start sending the break */
+        if (!(ch->ch_flags & CH_BREAK_SENDING)) {
+                u8 temp = readb(&ch->ch_neo_uart->lcr);
+                writeb((temp | UART_LCR_SBC), &ch->ch_neo_uart->lcr);
+                ch->ch_flags |= (CH_BREAK_SENDING);
+
+                /* flush write operation */
+                neo_pci_posting_flush(ch->ch_bd);
+        }
+}
+
+/*
+ * neo_send_immediate_char.
+ *
+ * Sends a specific character as soon as possible to the UART,
+ * jumping over any bytes that might be in the write queue.
+ *
+ * The channel lock MUST be held by the calling function.
+ */
+static void neo_send_immediate_char(struct jsm_channel *ch, unsigned char c)
+{
+        if (!ch)
+                return;
+
+        writeb(c, &ch->ch_neo_uart->txrx);
+
+        /* flush write operation */
+        neo_pci_posting_flush(ch->ch_bd);
+}
+
+struct board_ops jsm_neo_ops = {
+        .intr                           = neo_intr,
+        .uart_init                      = neo_uart_init,
+        .uart_off                       = neo_uart_off,
+        .param                          = neo_param,
+        .assert_modem_signals           = neo_assert_modem_signals,
+        .flush_uart_write               = neo_flush_uart_write,
+        .flush_uart_read                = neo_flush_uart_read,
+        .disable_receiver               = neo_disable_receiver,
+        .enable_receiver                = neo_enable_receiver,
+        .send_break                     = neo_send_break,
+        .clear_break                    = neo_clear_break,
+        .send_start_character           = neo_send_start_character,
+        .send_stop_character            = neo_send_stop_character,
+        .copy_data_from_queue_to_uart   = neo_copy_data_from_queue_to_uart,
+        .get_uart_bytes_left            = neo_get_uart_bytes_left,
+        .send_immediate_char            = neo_send_immediate_char
+};
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
new file mode 100644
index 000000000000..7fb7cc07074b
--- /dev/null
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -0,0 +1,1038 @@
+/************************************************************************
+ * Copyright 2003 Digi International (www.digi.com)
+ *
+ * Copyright (C) 2004 IBM Corporation. All rights reserved.
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 * Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ *
+ * Contact Information:
+ * Scott H Kilau <Scott_Kilau@digi.com>
+ * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
+ *
+ ***********************************************************************/
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_reg.h>
+#include <linux/delay.h>        /* For udelay */
+#include <linux/pci.h>
+
+#include "jsm.h"
+
+static inline int jsm_get_mstat(struct jsm_channel *ch)
+{
+        unsigned char mstat;
+        unsigned result;
+
+        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "start\n");
+
+        mstat = (ch->ch_mostat | ch->ch_mistat);
+
+        result = 0;
+
+        if (mstat & UART_MCR_DTR)
+                result |= TIOCM_DTR;
+        if (mstat & UART_MCR_RTS)
+                result |= TIOCM_RTS;
+        if (mstat & UART_MSR_CTS)
+                result |= TIOCM_CTS;
+        if (mstat & UART_MSR_DSR)
+                result |= TIOCM_DSR;
+        if (mstat & UART_MSR_RI)
+                result |= TIOCM_RI;
+        if (mstat & UART_MSR_DCD)
+                result |= TIOCM_CD;
+
+        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
+        return result;
+}
+
+static unsigned int jsm_tty_tx_empty(struct uart_port *port)
+{
+        return TIOCSER_TEMT;
+}
+
+/*
+ * Return modem signals to ld.
+ */
+static unsigned int jsm_tty_get_mctrl(struct uart_port *port)
+{
+        int result;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+
+        result = jsm_get_mstat(channel);
+
+        if (result < 0)
+                return -ENXIO;
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+
+        return result;
+}
+
+/*
+ * jsm_set_modem_info()
+ *
+ * Set modem signals, called by ld.
+ */
+static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+
+        if (mctrl & TIOCM_RTS)
+                channel->ch_mostat |= UART_MCR_RTS;
+        else
+                channel->ch_mostat &= ~UART_MCR_RTS;
+
+        if (mctrl & TIOCM_DTR)
+                channel->ch_mostat |= UART_MCR_DTR;
+        else
+                channel->ch_mostat &= ~UART_MCR_DTR;
+
+        channel->ch_bd->bd_ops->assert_modem_signals(channel);
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+        udelay(10);
+}
+
+static void jsm_tty_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+
+        channel->ch_flags &= ~(CH_STOP);
+        jsm_tty_write(port);
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+}
+
+static void jsm_tty_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
+
+        channel->ch_flags |= (CH_STOP);
+
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
+}
+
+static void jsm_tty_send_xchar(struct uart_port *port, char ch)
+{
+        unsigned long lock_flags;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        spin_lock_irqsave(&port->lock, lock_flags);
+        if (ch == port->info->tty->termios->c_cc[VSTART])
+                channel->ch_bd->bd_ops->send_start_character(channel);
+
+        if (ch == port->info->tty->termios->c_cc[VSTOP])
+                channel->ch_bd->bd_ops->send_stop_character(channel);
+        spin_unlock_irqrestore(&port->lock, lock_flags);
+}
+
+static void jsm_tty_stop_rx(struct uart_port *port)
+{
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        channel->ch_bd->bd_ops->disable_receiver(channel);
+}
+
+static void jsm_tty_break(struct uart_port *port, int break_state)
+{
+        unsigned long lock_flags;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        spin_lock_irqsave(&port->lock, lock_flags);
+        if (break_state == -1)
+                channel->ch_bd->bd_ops->send_break(channel);
+        else
+                channel->ch_bd->bd_ops->clear_break(channel, 0);
+
+        spin_unlock_irqrestore(&port->lock, lock_flags);
+}
+
+static int jsm_tty_open(struct uart_port *port)
+{
+        struct jsm_board *brd;
+        int rc = 0;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        /* Get board pointer from our array of majors we have allocated */
+        brd = channel->ch_bd;
+
+        /*
+         * Allocate channel buffers for read/write/error.
+         * Set flag, so we don't get trounced on.
+         */
+        channel->ch_flags |= (CH_OPENING);
+
+        /* Drop locks, as malloc with GFP_KERNEL can sleep */
+
+        if (!channel->ch_rqueue) {
+                channel->ch_rqueue = (u8 *) kmalloc(RQUEUESIZE, GFP_KERNEL);
+                if (!channel->ch_rqueue) {
+                        jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
+                                "unable to allocate read queue buf");
+                        return -ENOMEM;
+                }
+                memset(channel->ch_rqueue, 0, RQUEUESIZE);
+        }
+        if (!channel->ch_equeue) {
+                channel->ch_equeue = (u8 *) kmalloc(EQUEUESIZE, GFP_KERNEL);
+                if (!channel->ch_equeue) {
+                        jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
+                                "unable to allocate error queue buf");
+                        return -ENOMEM;
+                }
+                memset(channel->ch_equeue, 0, EQUEUESIZE);
+        }
+        if (!channel->ch_wqueue) {
+                channel->ch_wqueue = (u8 *) kmalloc(WQUEUESIZE, GFP_KERNEL);
+                if (!channel->ch_wqueue) {
+                        jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
+                                "unable to allocate write queue buf");
+                        return -ENOMEM;
+                }
+                memset(channel->ch_wqueue, 0, WQUEUESIZE);
+        }
+
+        channel->ch_flags &= ~(CH_OPENING);
+        /*
+         * Initialize if neither terminal is open.
+         */
+        jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev,
+                "jsm_open: initializing channel in open...\n");
+
+        /*
+         * Flush input queues.
+         */
+        channel->ch_r_head = channel->ch_r_tail = 0;
+        channel->ch_e_head = channel->ch_e_tail = 0;
+        channel->ch_w_head = channel->ch_w_tail = 0;
+
+        brd->bd_ops->flush_uart_write(channel);
+        brd->bd_ops->flush_uart_read(channel);
+
+        channel->ch_flags = 0;
+        channel->ch_cached_lsr = 0;
+        channel->ch_stops_sent = 0;
+
+        channel->ch_c_cflag     = port->info->tty->termios->c_cflag;
+        channel->ch_c_iflag     = port->info->tty->termios->c_iflag;
+        channel->ch_c_oflag     = port->info->tty->termios->c_oflag;
+        channel->ch_c_lflag     = port->info->tty->termios->c_lflag;
+        channel->ch_startc = port->info->tty->termios->c_cc[VSTART];
+        channel->ch_stopc = port->info->tty->termios->c_cc[VSTOP];
+
+        /* Tell UART to init itself */
+        brd->bd_ops->uart_init(channel);
+
+        /*
+         * Run param in case we changed anything
+         */
+        brd->bd_ops->param(channel);
+
+        jsm_carrier(channel);
+
+        channel->ch_open_count++;
+
+        jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev, "finish\n");
+        return rc;
+}
+
+static void jsm_tty_close(struct uart_port *port)
+{
+        struct jsm_board *bd;
+        struct termios *ts;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n");
+
+        bd = channel->ch_bd;
+        ts = channel->uart_port.info->tty->termios;
+
+        channel->ch_flags &= ~(CH_STOPI);
+
+        channel->ch_open_count--;
+
+        /*
+         * If we have HUPCL set, lower DTR and RTS
+         */
+        if (channel->ch_c_cflag & HUPCL) {
+                jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev,
+                        "Close. HUPCL set, dropping DTR/RTS\n");
+
+                /* Drop RTS/DTR */
+                channel->ch_mostat &= ~(UART_MCR_DTR | UART_MCR_RTS);
+                bd->bd_ops->assert_modem_signals(channel);
+        }
+
+        channel->ch_old_baud = 0;
+
+        /* Turn off UART interrupts for this port */
+        channel->ch_bd->bd_ops->uart_off(channel);
+
+        jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "finish\n");
+}
+
+static void jsm_tty_set_termios(struct uart_port *port,
+                                 struct termios *termios,
+                                 struct termios *old_termios)
+{
+        unsigned long lock_flags;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        spin_lock_irqsave(&port->lock, lock_flags);
+        channel->ch_c_cflag     = termios->c_cflag;
+        channel->ch_c_iflag     = termios->c_iflag;
+        channel->ch_c_oflag     = termios->c_oflag;
+        channel->ch_c_lflag     = termios->c_lflag;
+        channel->ch_startc      = termios->c_cc[VSTART];
+        channel->ch_stopc       = termios->c_cc[VSTOP];
+
+        channel->ch_bd->bd_ops->param(channel);
+        jsm_carrier(channel);
+        spin_unlock_irqrestore(&port->lock, lock_flags);
+}
+
+static const char *jsm_tty_type(struct uart_port *port)
+{
+        return "jsm";
+}
+
+static void jsm_tty_release_port(struct uart_port *port)
+{
+}
+
+static int jsm_tty_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static void jsm_config_port(struct uart_port *port, int flags)
+{
+        port->type = PORT_JSM;
+}
+
+static struct uart_ops jsm_ops = {
+        .tx_empty       = jsm_tty_tx_empty,
+        .set_mctrl      = jsm_tty_set_mctrl,
+        .get_mctrl      = jsm_tty_get_mctrl,
+        .stop_tx        = jsm_tty_stop_tx,
+        .start_tx       = jsm_tty_start_tx,
+        .send_xchar     = jsm_tty_send_xchar,
+        .stop_rx        = jsm_tty_stop_rx,
+        .break_ctl      = jsm_tty_break,
+        .startup        = jsm_tty_open,
+        .shutdown       = jsm_tty_close,
+        .set_termios    = jsm_tty_set_termios,
+        .type           = jsm_tty_type,
+        .release_port   = jsm_tty_release_port,
+        .request_port   = jsm_tty_request_port,
+        .config_port    = jsm_config_port,
+};
+
+/*
+ * jsm_tty_init()
+ *
+ * Init the tty subsystem.  Called once per board after board has been
+ * downloaded and init'ed.
+ */
+int jsm_tty_init(struct jsm_board *brd)
+{
+        int i;
+        void __iomem *vaddr;
+        struct jsm_channel *ch;
+
+        if (!brd)
+                return -ENXIO;
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+
+        /*
+         * Initialize board structure elements.
+         */
+
+        brd->nasync = brd->maxports;
+
+        /*
+         * Allocate channel memory that might not have been allocated
+         * when the driver was first loaded.
+         */
+        for (i = 0; i < brd->nasync; i++) {
+                if (!brd->channels[i]) {
+
+                        /*
+                         * Okay to malloc with GFP_KERNEL, we are not at
+                         * interrupt context, and there are no locks held.
+                         */
+                        brd->channels[i] = kmalloc(sizeof(struct jsm_channel), GFP_KERNEL);
+                        if (!brd->channels[i]) {
+                                jsm_printk(CORE, ERR, &brd->pci_dev,
+                                        "%s:%d Unable to allocate memory for channel struct\n",
+                                                         __FILE__, __LINE__);
+                        }
+                        memset(brd->channels[i], 0, sizeof(struct jsm_channel));
+                }
+        }
+
+        ch = brd->channels[0];
+        vaddr = brd->re_map_membase;
+
+        /* Set up channel variables */
+        for (i = 0; i < brd->nasync; i++, ch = brd->channels[i]) {
+
+                if (!brd->channels[i])
+                        continue;
+
+                spin_lock_init(&ch->ch_lock);
+
+                if (brd->bd_uart_offset == 0x200)
+                        ch->ch_neo_uart =  vaddr + (brd->bd_uart_offset * i);
+
+                ch->ch_bd = brd;
+                ch->ch_portnum = i;
+
+                /* .25 second delay */
+                ch->ch_close_delay = 250;
+
+                init_waitqueue_head(&ch->ch_flags_wait);
+        }
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
+        return 0;
+}
+
+int jsm_uart_port_init(struct jsm_board *brd)
+{
+        int i;
+        struct jsm_channel *ch;
+
+        if (!brd)
+                return -ENXIO;
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+
+        /*
+         * Initialize board structure elements.
+         */
+
+        brd->nasync = brd->maxports;
+
+        /* Set up channel variables */
+        for (i = 0; i < brd->nasync; i++, ch = brd->channels[i]) {
+
+                if (!brd->channels[i])
+                        continue;
+
+                brd->channels[i]->uart_port.irq = brd->irq;
+                brd->channels[i]->uart_port.type = PORT_JSM;
+                brd->channels[i]->uart_port.iotype = UPIO_MEM;
+                brd->channels[i]->uart_port.membase = brd->re_map_membase;
+                brd->channels[i]->uart_port.fifosize = 16;
+                brd->channels[i]->uart_port.ops = &jsm_ops;
+                brd->channels[i]->uart_port.line = brd->channels[i]->ch_portnum + brd->boardnum * 2;
+                if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port))
+                        printk(KERN_INFO "Added device failed\n");
+                else
+                        printk(KERN_INFO "Added device \n");
+        }
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
+        return 0;
+}
+
+int jsm_remove_uart_port(struct jsm_board *brd)
+{
+        int i;
+        struct jsm_channel *ch;
+
+        if (!brd)
+                return -ENXIO;
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
+
+        /*
+         * Initialize board structure elements.
+         */
+
+        brd->nasync = brd->maxports;
+
+        /* Set up channel variables */
+        for (i = 0; i < brd->nasync; i++) {
+
+                if (!brd->channels[i])
+                        continue;
+
+                ch = brd->channels[i];
+
+                uart_remove_one_port(&jsm_uart_driver, &brd->channels[i]->uart_port);
+        }
+
+        jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
+        return 0;
+}
+
+void jsm_input(struct jsm_channel *ch)
+{
+        struct jsm_board *bd;
+        struct tty_struct *tp;
+        u32 rmask;
+        u16 head;
+        u16 tail;
+        int data_len;
+        unsigned long lock_flags;
+        int flip_len;
+        int len = 0;
+        int n = 0;
+        char *buf = NULL;
+        char *buf2 = NULL;
+        int s = 0;
+        int i = 0;
+
+        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start\n");
+
+        if (!ch)
+                return;
+
+        tp = ch->uart_port.info->tty;
+
+        bd = ch->ch_bd;
+        if(!bd)
+                return;
+
+        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+
+        /*
+         *Figure the number of characters in the buffer.
+         *Exit immediately if none.
+         */
+
+        rmask = RQUEUEMASK;
+
+        head = ch->ch_r_head & rmask;
+        tail = ch->ch_r_tail & rmask;
+
+        data_len = (head - tail) & rmask;
+        if (data_len == 0) {
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                return;
+        }
+
+        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start\n");
+
+        /*
+         *If the device is not open, or CREAD is off, flush
+         *input data and return immediately.
+         */
+        if (!tp ||
+                !(tp->termios->c_cflag & CREAD) ) {
+
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                        "input. dropping %d bytes on port %d...\n", data_len, ch->ch_portnum);
+                ch->ch_r_head = tail;
+
+                /* Force queue flow control to be released, if needed */
+                jsm_check_queue_flow_control(ch);
+
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                return;
+        }
+
+        /*
+         * If we are throttled, simply don't read any data.
+         */
+        if (ch->ch_flags & CH_STOPI) {
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                        "Port %d throttled, not reading any data. head: %x tail: %x\n",
+                        ch->ch_portnum, head, tail);
+                return;
+        }
+
+        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start 2\n");
+
+        /*
+         * If the rxbuf is empty and we are not throttled, put as much
+         * as we can directly into the linux TTY flip buffer.
+         * The jsm_rawreadok case takes advantage of carnal knowledge that
+         * the char_buf and the flag_buf are next to each other and
+         * are each of (2 * TTY_FLIPBUF_SIZE) size.
+         *
+         * NOTE: if(!tty->real_raw), the call to ldisc.receive_buf
+         *actually still uses the flag buffer, so you can't
+         *use it for input data
+         */
+        if (jsm_rawreadok) {
+                if (tp->real_raw)
+                        flip_len = MYFLIPLEN;
+                else
+                        flip_len = 2 * TTY_FLIPBUF_SIZE;
+        } else
+                flip_len = TTY_FLIPBUF_SIZE - tp->flip.count;
+
+        len = min(data_len, flip_len);
+        len = min(len, (N_TTY_BUF_SIZE - 1) - tp->read_cnt);
+
+        if (len <= 0) {
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "jsm_input 1\n");
+                return;
+        }
+
+        /*
+         * If we're bypassing flip buffers on rx, we can blast it
+         * right into the beginning of the buffer.
+         */
+        if (jsm_rawreadok) {
+                if (tp->real_raw) {
+                        if (ch->ch_flags & CH_FLIPBUF_IN_USE) {
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "JSM - FLIPBUF in use. delaying input\n");
+                                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                                return;
+                        }
+                        ch->ch_flags |= CH_FLIPBUF_IN_USE;
+                        buf = ch->ch_bd->flipbuf;
+                        buf2 = NULL;
+                } else {
+                        buf = tp->flip.char_buf;
+                        buf2 = tp->flip.flag_buf;
+                }
+        } else {
+                buf = tp->flip.char_buf_ptr;
+                buf2 = tp->flip.flag_buf_ptr;
+        }
+
+        n = len;
+
+        /*
+         * n now contains the most amount of data we can copy,
+         * bounded either by the flip buffer size or the amount
+         * of data the card actually has pending...
+         */
+        while (n) {
+                s = ((head >= tail) ? head : RQUEUESIZE) - tail;
+                s = min(s, n);
+
+                if (s <= 0)
+                        break;
+
+                memcpy(buf, ch->ch_rqueue + tail, s);
+
+                /* buf2 is only set when port isn't raw */
+                if (buf2)
+                        memcpy(buf2, ch->ch_equeue + tail, s);
+
+                tail += s;
+                buf += s;
+                if (buf2)
+                        buf2 += s;
+                n -= s;
+                /* Flip queue if needed */
+                tail &= rmask;
+        }
+
+        /*
+         * In high performance mode, we don't have to update
+         * flag_buf or any of the counts or pointers into flip buf.
+         */
+        if (!jsm_rawreadok) {
+                if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {
+                        for (i = 0; i < len; i++) {
+                                /*
+                                 * Give the Linux ld the flags in the
+                                 * format it likes.
+                                 */
+                                if (tp->flip.flag_buf_ptr[i] & UART_LSR_BI)
+                                        tp->flip.flag_buf_ptr[i] = TTY_BREAK;
+                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_PE)
+                                        tp->flip.flag_buf_ptr[i] = TTY_PARITY;
+                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_FE)
+                                        tp->flip.flag_buf_ptr[i] = TTY_FRAME;
+                                else
+                                        tp->flip.flag_buf_ptr[i] = TTY_NORMAL;
+                        }
+                } else {
+                        memset(tp->flip.flag_buf_ptr, 0, len);
+                }
+
+                tp->flip.char_buf_ptr += len;
+                tp->flip.flag_buf_ptr += len;
+                tp->flip.count += len;
+        }
+        else if (!tp->real_raw) {
+                if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {
+                        for (i = 0; i < len; i++) {
+                                /*
+                                 * Give the Linux ld the flags in the
+                                 * format it likes.
+                                 */
+                                if (tp->flip.flag_buf_ptr[i] & UART_LSR_BI)
+                                        tp->flip.flag_buf_ptr[i] = TTY_BREAK;
+                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_PE)
+                                        tp->flip.flag_buf_ptr[i] = TTY_PARITY;
+                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_FE)
+                                        tp->flip.flag_buf_ptr[i] = TTY_FRAME;
+                                else
+                                        tp->flip.flag_buf_ptr[i] = TTY_NORMAL;
+                        }
+                } else
+                        memset(tp->flip.flag_buf, 0, len);
+        }
+
+        /*
+         * If we're doing raw reads, jam it right into the
+         * line disc bypassing the flip buffers.
+         */
+        if (jsm_rawreadok) {
+                if (tp->real_raw) {
+                        ch->ch_r_tail = tail & rmask;
+                        ch->ch_e_tail = tail & rmask;
+
+                        jsm_check_queue_flow_control(ch);
+
+                        /* !!! WE *MUST* LET GO OF ALL LOCKS BEFORE CALLING RECEIVE BUF !!! */
+
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+
+                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                "jsm_input. %d real_raw len:%d calling receive_buf for board %d\n",
+                                __LINE__, len, ch->ch_bd->boardnum);
+                        tp->ldisc.receive_buf(tp, ch->ch_bd->flipbuf, NULL, len);
+
+                        /* Allow use of channel flip buffer again */
+                        spin_lock_irqsave(&ch->ch_lock, lock_flags);
+                        ch->ch_flags &= ~CH_FLIPBUF_IN_USE;
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+
+                } else {
+                        ch->ch_r_tail = tail & rmask;
+                        ch->ch_e_tail = tail & rmask;
+
+                        jsm_check_queue_flow_control(ch);
+
+                        /* !!! WE *MUST* LET GO OF ALL LOCKS BEFORE CALLING RECEIVE BUF !!! */
+                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+
+                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                "jsm_input. %d not real_raw len:%d calling receive_buf for board %d\n",
+                                __LINE__, len, ch->ch_bd->boardnum);
+
+                        tp->ldisc.receive_buf(tp, tp->flip.char_buf, tp->flip.flag_buf, len);
+                }
+        } else {
+                ch->ch_r_tail = tail & rmask;
+                ch->ch_e_tail = tail & rmask;
+
+                jsm_check_queue_flow_control(ch);
+
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                        "jsm_input. %d not jsm_read raw okay scheduling flip\n", __LINE__);
+                tty_schedule_flip(tp);
+        }
+
+        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
+}
+
+void jsm_carrier(struct jsm_channel *ch)
+{
+        struct jsm_board *bd;
+
+        int virt_carrier = 0;
+        int phys_carrier = 0;
+
+        jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev, "start\n");
+        if (!ch)
+                return;
+
+        bd = ch->ch_bd;
+
+        if (!bd)
+                return;
+
+        if (ch->ch_mistat & UART_MSR_DCD) {
+                jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
+                        "mistat: %x D_CD: %x\n", ch->ch_mistat, ch->ch_mistat & UART_MSR_DCD);
+                phys_carrier = 1;
+        }
+
+        if (ch->ch_c_cflag & CLOCAL)
+                virt_carrier = 1;
+
+        jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
+                "DCD: physical: %d virt: %d\n", phys_carrier, virt_carrier);
+
+        /*
+         * Test for a VIRTUAL carrier transition to HIGH.
+         */
+        if (((ch->ch_flags & CH_FCAR) == 0) && (virt_carrier == 1)) {
+
+                /*
+                 * When carrier rises, wake any threads waiting
+                 * for carrier in the open routine.
+                 */
+
+                jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
+                        "carrier: virt DCD rose\n");
+
+                if (waitqueue_active(&(ch->ch_flags_wait)))
+                        wake_up_interruptible(&ch->ch_flags_wait);
+        }
+
+        /*
+         * Test for a PHYSICAL carrier transition to HIGH.
+         */
+        if (((ch->ch_flags & CH_CD) == 0) && (phys_carrier == 1)) {
+
+                /*
+                 * When carrier rises, wake any threads waiting
+                 * for carrier in the open routine.
+                 */
+
+                jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
+                        "carrier: physical DCD rose\n");
+
+                if (waitqueue_active(&(ch->ch_flags_wait)))
+                        wake_up_interruptible(&ch->ch_flags_wait);
+        }
+
+        /*
+         *  Test for a PHYSICAL transition to low, so long as we aren't
+         *  currently ignoring physical transitions (which is what "virtual
+         *  carrier" indicates).
+         *
+         *  The transition of the virtual carrier to low really doesn't
+         *  matter... it really only means "ignore carrier state", not
+         *  "make pretend that carrier is there".
+         */
+        if ((virt_carrier == 0) && ((ch->ch_flags & CH_CD) != 0)
+                        && (phys_carrier == 0)) {
+                /*
+                 *      When carrier drops:
+                 *
+                 *      Drop carrier on all open units.
+                 *
+                 *      Flush queues, waking up any task waiting in the
+                 *      line discipline.
+                 *
+                 *      Send a hangup to the control terminal.
+                 *
+                 *      Enable all select calls.
+                 */
+                if (waitqueue_active(&(ch->ch_flags_wait)))
+                        wake_up_interruptible(&ch->ch_flags_wait);
+        }
+
+        /*
+         *  Make sure that our cached values reflect the current reality.
+         */
+        if (virt_carrier == 1)
+                ch->ch_flags |= CH_FCAR;
+        else
+                ch->ch_flags &= ~CH_FCAR;
+
+        if (phys_carrier == 1)
+                ch->ch_flags |= CH_CD;
+        else
+                ch->ch_flags &= ~CH_CD;
+}
+
+
+void jsm_check_queue_flow_control(struct jsm_channel *ch)
+{
+        int qleft = 0;
+
+        /* Store how much space we have left in the queue */
+        if ((qleft = ch->ch_r_tail - ch->ch_r_head - 1) < 0)
+                qleft += RQUEUEMASK + 1;
+
+        /*
+         * Check to see if we should enforce flow control on our queue because
+         * the ld (or user) isn't reading data out of our queue fast enuf.
+         *
+         * NOTE: This is done based on what the current flow control of the
+         * port is set for.
+         *
+         * 1) HWFLOW (RTS) - Turn off the UART's Receive interrupt.
+         *      This will cause the UART's FIFO to back up, and force
+         *      the RTS signal to be dropped.
+         * 2) SWFLOW (IXOFF) - Keep trying to send a stop character to
+         *      the other side, in hopes it will stop sending data to us.
+         * 3) NONE - Nothing we can do.  We will simply drop any extra data
+         *      that gets sent into us when the queue fills up.
+         */
+        if (qleft < 256) {
+                /* HWFLOW */
+                if (ch->ch_c_cflag & CRTSCTS) {
+                        if(!(ch->ch_flags & CH_RECEIVER_OFF)) {
+                                ch->ch_bd->bd_ops->disable_receiver(ch);
+                                ch->ch_flags |= (CH_RECEIVER_OFF);
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "Internal queue hit hilevel mark (%d)! Turning off interrupts.\n",
+                                        qleft);
+                        }
+                }
+                /* SWFLOW */
+                else if (ch->ch_c_iflag & IXOFF) {
+                        if (ch->ch_stops_sent <= MAX_STOPS_SENT) {
+                                ch->ch_bd->bd_ops->send_stop_character(ch);
+                                ch->ch_stops_sent++;
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "Sending stop char! Times sent: %x\n", ch->ch_stops_sent);
+                        }
+                }
+        }
+
+        /*
+         * Check to see if we should unenforce flow control because
+         * ld (or user) finally read enuf data out of our queue.
+         *
+         * NOTE: This is done based on what the current flow control of the
+         * port is set for.
+         *
+         * 1) HWFLOW (RTS) - Turn back on the UART's Receive interrupt.
+         *      This will cause the UART's FIFO to raise RTS back up,
+         *      which will allow the other side to start sending data again.
+         * 2) SWFLOW (IXOFF) - Send a start character to
+         *      the other side, so it will start sending data to us again.
+         * 3) NONE - Do nothing. Since we didn't do anything to turn off the
+         *      other side, we don't need to do anything now.
+         */
+        if (qleft > (RQUEUESIZE / 2)) {
+                /* HWFLOW */
+                if (ch->ch_c_cflag & CRTSCTS) {
+                        if (ch->ch_flags & CH_RECEIVER_OFF) {
+                                ch->ch_bd->bd_ops->enable_receiver(ch);
+                                ch->ch_flags &= ~(CH_RECEIVER_OFF);
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "Internal queue hit lowlevel mark (%d)! Turning on interrupts.\n",
+                                        qleft);
+                        }
+                }
+                /* SWFLOW */
+                else if (ch->ch_c_iflag & IXOFF && ch->ch_stops_sent) {
+                        ch->ch_stops_sent = 0;
+                        ch->ch_bd->bd_ops->send_start_character(ch);
+                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "Sending start char!\n");
+                }
+        }
+}
+
+/*
+ * jsm_tty_write()
+ *
+ * Take data from the user or kernel and send it out to the FEP.
+ * In here exists all the Transparent Print magic as well.
+ */
+int jsm_tty_write(struct uart_port *port)
+{
+        int bufcount = 0, n = 0;
+        int data_count = 0,data_count1 =0;
+        u16 head;
+        u16 tail;
+        u16 tmask;
+        u32 remain;
+        int temp_tail = port->info->xmit.tail;
+        struct jsm_channel *channel = (struct jsm_channel *)port;
+
+        tmask = WQUEUEMASK;
+        head = (channel->ch_w_head) & tmask;
+        tail = (channel->ch_w_tail) & tmask;
+
+        if ((bufcount = tail - head - 1) < 0)
+                bufcount += WQUEUESIZE;
+
+        n = bufcount;
+
+        n = min(n, 56);
+        remain = WQUEUESIZE - head;
+
+        data_count = 0;
+        if (n >= remain) {
+                n -= remain;
+                while ((port->info->xmit.head != temp_tail) &&
+                (data_count < remain)) {
+                        channel->ch_wqueue[head++] =
+                        port->info->xmit.buf[temp_tail];
+
+                        temp_tail++;
+                        temp_tail &= (UART_XMIT_SIZE - 1);
+                        data_count++;
+                }
+                if (data_count == remain) head = 0;
+        }
+
+        data_count1 = 0;
+        if (n > 0) {
+                remain = n;
+                while ((port->info->xmit.head != temp_tail) &&
+                        (data_count1 < remain)) {
+                        channel->ch_wqueue[head++] =
+                                port->info->xmit.buf[temp_tail];
+
+                        temp_tail++;
+                        temp_tail &= (UART_XMIT_SIZE - 1);
+                        data_count1++;
+
+                }
+        }
+
+        port->info->xmit.tail = temp_tail;
+
+        data_count += data_count1;
+        if (data_count) {
+                head &= tmask;
+                channel->ch_w_head = head;
+        }
+
+        if (data_count) {
+                channel->ch_bd->bd_ops->copy_data_from_queue_to_uart(channel);
+        }
+
+        return data_count;
+}
+
+static ssize_t jsm_driver_version_show(struct device_driver *ddp, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", JSM_VERSION);
+}
+static DRIVER_ATTR(version, S_IRUSR, jsm_driver_version_show, NULL);
+
+static ssize_t jsm_driver_state_show(struct device_driver *ddp, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", jsm_driver_state_text[jsm_driver_state]);
+}
+static DRIVER_ATTR(state, S_IRUSR, jsm_driver_state_show, NULL);
+
+void jsm_create_driver_sysfiles(struct device_driver *driverfs)
+{
+        driver_create_file(driverfs, &driver_attr_version);
+        driver_create_file(driverfs, &driver_attr_state);
+}
+
+void jsm_remove_driver_sysfiles(struct device_driver *driverfs)
+{
+        driver_remove_file(driverfs, &driver_attr_version);
+        driver_remove_file(driverfs, &driver_attr_state);
+}
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
new file mode 100644
index 000000000000..08d61f13edc6
--- /dev/null
+++ b/drivers/serial/m32r_sio.c
@@ -0,0 +1,1218 @@
+/*
+ *  m32r_sio.c
+ *
+ *  Driver for M32R serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *  Based on drivers/serial/8250.c.
+ *
+ *  Copyright (C) 2001  Russell King.
+ *  Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ *
+ * 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.
+ */
+
+/*
+ * A note about mapbase / membase
+ *
+ *  mapbase is the physical address of the IO port.  Currently, we don't
+ *  support this very well, and it may well be dropped from this driver
+ *  in future.  As such, mapbase should be NULL.
+ *
+ *  membase is an 'ioremapped' cookie.  This is compatible with the old
+ *  serial.c driver, and is currently the preferred form.
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/serial.h>
+#include <linux/serialP.h>
+#include <linux/delay.h>
+
+#include <asm/m32r.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#define PORT_M32R_BASE  PORT_M32R_SIO
+#define PORT_INDEX(x)   (x - PORT_M32R_BASE + 1)
+#define BAUD_RATE       115200
+
+#include <linux/serial_core.h>
+#include "m32r_sio.h"
+#include "m32r_sio_reg.h"
+
+/*
+ * Debugging.
+ */
+#if 0
+#define DEBUG_AUTOCONF(fmt...)  printk(fmt)
+#else
+#define DEBUG_AUTOCONF(fmt...)  do { } while (0)
+#endif
+
+#if 0
+#define DEBUG_INTR(fmt...)      printk(fmt)
+#else
+#define DEBUG_INTR(fmt...)      do { } while (0)
+#endif
+
+#define PASS_LIMIT      256
+
+/*
+ * We default to IRQ0 for the "no irq" hack.   Some
+ * machine types want others as well - they're free
+ * to redefine this in their header file.
+ */
+#define is_real_interrupt(irq)  ((irq) != 0)
+
+#include <asm/serial.h>
+
+/* Standard COM flags */
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+
+/*
+ * SERIAL_PORT_DFNS tells us about built-in ports that have no
+ * standard enumeration mechanism.   Platforms that can find all
+ * serial ports via mechanisms like ACPI or PCI need not supply it.
+ */
+#undef SERIAL_PORT_DFNS
+#if defined(CONFIG_PLAT_USRV)
+
+#define SERIAL_PORT_DFNS                                                \
+       /* UART  CLK     PORT   IRQ            FLAGS */                  \
+        { 0, BASE_BAUD, 0x3F8, PLD_IRQ_UART0, STD_COM_FLAGS }, /* ttyS0 */ \
+        { 0, BASE_BAUD, 0x2F8, PLD_IRQ_UART1, STD_COM_FLAGS }, /* ttyS1 */
+
+#else /* !CONFIG_PLAT_USRV */
+
+#if defined(CONFIG_SERIAL_M32R_PLDSIO)
+#define SERIAL_PORT_DFNS                                                \
+        { 0, BASE_BAUD, ((unsigned long)PLD_ESIO0CR), PLD_IRQ_SIO0_RCV, \
+          STD_COM_FLAGS }, /* ttyS0 */
+#else
+#define SERIAL_PORT_DFNS                                                \
+        { 0, BASE_BAUD, M32R_SIO_OFFSET, M32R_IRQ_SIO0_R,               \
+          STD_COM_FLAGS }, /* ttyS0 */
+#endif
+
+#endif /* !CONFIG_PLAT_USRV */
+
+static struct old_serial_port old_serial_port[] = {
+        SERIAL_PORT_DFNS        /* defined in asm/serial.h */
+};
+
+#define UART_NR ARRAY_SIZE(old_serial_port)
+
+struct uart_sio_port {
+        struct uart_port        port;
+        struct timer_list       timer;          /* "no irq" timer */
+        struct list_head        list;           /* ports on this IRQ */
+        unsigned short          rev;
+        unsigned char           acr;
+        unsigned char           ier;
+        unsigned char           lcr;
+        unsigned char           mcr_mask;       /* mask of user bits */
+        unsigned char           mcr_force;      /* mask of forced bits */
+        unsigned char           lsr_break_flag;
+
+        /*
+         * We provide a per-port pm hook.
+         */
+        void                    (*pm)(struct uart_port *port,
+                                      unsigned int state, unsigned int old);
+};
+
+struct irq_info {
+        spinlock_t              lock;
+        struct list_head        *head;
+};
+
+static struct irq_info irq_lists[NR_IRQS];
+
+/*
+ * Here we define the default xmit fifo size used for each type of UART.
+ */
+static const struct serial_uart_config uart_config[] = {
+        [PORT_UNKNOWN] = {
+                .name                   = "unknown",
+                .dfl_xmit_fifo_size     = 1,
+                .flags                  = 0,
+        },
+        [PORT_INDEX(PORT_M32R_SIO)] = {
+                .name                   = "M32RSIO",
+                .dfl_xmit_fifo_size     = 1,
+                .flags                  = 0,
+        },
+};
+
+#ifdef CONFIG_SERIAL_M32R_PLDSIO
+
+#define __sio_in(x) inw((unsigned long)(x))
+#define __sio_out(v,x) outw((v),(unsigned long)(x))
+
+static inline void sio_set_baud_rate(unsigned long baud)
+{
+        unsigned short sbaud;
+        sbaud = (boot_cpu_data.bus_clock / (baud * 4))-1;
+        __sio_out(sbaud, PLD_ESIO0BAUR);
+}
+
+static void sio_reset(void)
+{
+        unsigned short tmp;
+
+        tmp = __sio_in(PLD_ESIO0RXB);
+        tmp = __sio_in(PLD_ESIO0RXB);
+        tmp = __sio_in(PLD_ESIO0CR);
+        sio_set_baud_rate(BAUD_RATE);
+        __sio_out(0x0300, PLD_ESIO0CR);
+        __sio_out(0x0003, PLD_ESIO0CR);
+}
+
+static void sio_init(void)
+{
+        unsigned short tmp;
+
+        tmp = __sio_in(PLD_ESIO0RXB);
+        tmp = __sio_in(PLD_ESIO0RXB);
+        tmp = __sio_in(PLD_ESIO0CR);
+        __sio_out(0x0300, PLD_ESIO0CR);
+        __sio_out(0x0003, PLD_ESIO0CR);
+}
+
+static void sio_error(int *status)
+{
+        printk("SIO0 error[%04x]\n", *status);
+        do {
+                sio_init();
+        } while ((*status = __sio_in(PLD_ESIO0CR)) != 3);
+}
+
+#else /* not CONFIG_SERIAL_M32R_PLDSIO */
+
+#define __sio_in(x) inl(x)
+#define __sio_out(v,x) outl((v),(x))
+
+static inline void sio_set_baud_rate(unsigned long baud)
+{
+        unsigned long i, j;
+
+        i = boot_cpu_data.bus_clock / (baud * 16);
+        j = (boot_cpu_data.bus_clock - (i * baud * 16)) / baud;
+        i -= 1;
+        j = (j + 1) >> 1;
+
+        __sio_out(i, M32R_SIO0_BAUR_PORTL);
+        __sio_out(j, M32R_SIO0_RBAUR_PORTL);
+}
+
+static void sio_reset(void)
+{
+        __sio_out(0x00000300, M32R_SIO0_CR_PORTL);      /* init status */
+        __sio_out(0x00000800, M32R_SIO0_MOD1_PORTL);    /* 8bit        */
+        __sio_out(0x00000080, M32R_SIO0_MOD0_PORTL);    /* 1stop non   */
+        sio_set_baud_rate(BAUD_RATE);
+        __sio_out(0x00000000, M32R_SIO0_TRCR_PORTL);
+        __sio_out(0x00000003, M32R_SIO0_CR_PORTL);      /* RXCEN */
+}
+
+static void sio_init(void)
+{
+        unsigned int tmp;
+
+        tmp = __sio_in(M32R_SIO0_RXB_PORTL);
+        tmp = __sio_in(M32R_SIO0_RXB_PORTL);
+        tmp = __sio_in(M32R_SIO0_STS_PORTL);
+        __sio_out(0x00000003, M32R_SIO0_CR_PORTL);
+}
+
+static void sio_error(int *status)
+{
+        printk("SIO0 error[%04x]\n", *status);
+        do {
+                sio_init();
+        } while ((*status = __sio_in(M32R_SIO0_CR_PORTL)) != 3);
+}
+
+#endif /* CONFIG_SERIAL_M32R_PLDSIO */
+
+static _INLINE_ unsigned int sio_in(struct uart_sio_port *up, int offset)
+{
+        return __sio_in(up->port.iobase + offset);
+}
+
+static _INLINE_ void sio_out(struct uart_sio_port *up, int offset, int value)
+{
+        __sio_out(value, up->port.iobase + offset);
+}
+
+static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset)
+{
+        if (!offset)
+                return 0;
+
+        return __sio_in(offset);
+}
+
+static _INLINE_ void
+serial_out(struct uart_sio_port *up, int offset, int value)
+{
+        if (!offset)
+                return;
+
+        __sio_out(value, offset);
+}
+
+static void m32r_sio_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        if (up->ier & UART_IER_THRI) {
+                up->ier &= ~UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+}
+
+static void m32r_sio_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+#ifdef CONFIG_SERIAL_M32R_PLDSIO
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+        struct circ_buf *xmit = &up->port.info->xmit;
+
+        if (!(up->ier & UART_IER_THRI)) {
+                up->ier |= UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+        }
+        while((serial_in(up, UART_LSR) & UART_EMPTY) != UART_EMPTY);
+#else
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        if (!(up->ier & UART_IER_THRI)) {
+                up->ier |= UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+#endif
+}
+
+static void m32r_sio_stop_rx(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        up->ier &= ~UART_IER_RLSI;
+        up->port.read_status_mask &= ~UART_LSR_DR;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static void m32r_sio_enable_ms(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        up->ier |= UART_IER_MSI;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status,
+        struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;
+        unsigned char ch;
+        int max_count = 256;
+
+        do {
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        tty->flip.work.func((void *)tty);
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                return; // if TTY_DONT_FLIP is set
+                }
+                ch = sio_in(up, SIORXB);
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
+                                       UART_LSR_FE | UART_LSR_OE))) {
+                        /*
+                         * For statistics only
+                         */
+                        if (*status & UART_LSR_BI) {
+                                *status &= ~(UART_LSR_FE | UART_LSR_PE);
+                                up->port.icount.brk++;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        goto ignore_char;
+                        } else if (*status & UART_LSR_PE)
+                                up->port.icount.parity++;
+                        else if (*status & UART_LSR_FE)
+                                up->port.icount.frame++;
+                        if (*status & UART_LSR_OE)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ingored.
+                         */
+                        *status &= up->port.read_status_mask;
+
+                        if (up->port.line == up->port.cons->index) {
+                                /* Recover the break flag from console xmit */
+                                *status |= up->lsr_break_flag;
+                                up->lsr_break_flag = 0;
+                        }
+
+                        if (*status & UART_LSR_BI) {
+                                DEBUG_INTR("handling break....");
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        } else if (*status & UART_LSR_PE)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (*status & UART_LSR_FE)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto ignore_char;
+                if ((*status & up->port.ignore_status_mask) == 0) {
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((*status & UART_LSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        ignore_char:
+                *status = serial_in(up, UART_LSR);
+        } while ((*status & UART_LSR_DR) && (max_count-- > 0));
+        tty_flip_buffer_push(tty);
+}
+
+static _INLINE_ void transmit_chars(struct uart_sio_port *up)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int count;
+
+        if (up->port.x_char) {
+#ifndef CONFIG_SERIAL_M32R_PLDSIO       /* XXX */
+                serial_out(up, UART_TX, up->port.x_char);
+#endif
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                m32r_sio_stop_tx(&up->port, 0);
+                return;
+        }
+
+        count = up->port.fifosize;
+        do {
+                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+                while (!serial_in(up, UART_LSR) & UART_LSR_THRE);
+
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        DEBUG_INTR("THRE...");
+
+        if (uart_circ_empty(xmit))
+                m32r_sio_stop_tx(&up->port, 0);
+}
+
+/*
+ * This handles the interrupt from one port.
+ */
+static inline void m32r_sio_handle_port(struct uart_sio_port *up,
+        unsigned int status, struct pt_regs *regs)
+{
+        DEBUG_INTR("status = %x...", status);
+
+        if (status & 0x04)
+                receive_chars(up, &status, regs);
+        if (status & 0x01)
+                transmit_chars(up);
+}
+
+/*
+ * This is the serial driver's interrupt routine.
+ *
+ * Arjan thinks the old way was overly complex, so it got simplified.
+ * Alan disagrees, saying that need the complexity to handle the weird
+ * nature of ISA shared interrupts.  (This is a special exception.)
+ *
+ * In order to handle ISA shared interrupts properly, we need to check
+ * that all ports have been serviced, and therefore the ISA interrupt
+ * line has been de-asserted.
+ *
+ * This means we need to loop through all ports. checking that they
+ * don't have an interrupt pending.
+ */
+static irqreturn_t m32r_sio_interrupt(int irq, void *dev_id,
+        struct pt_regs *regs)
+{
+        struct irq_info *i = dev_id;
+        struct list_head *l, *end = NULL;
+        int pass_counter = 0;
+
+        DEBUG_INTR("m32r_sio_interrupt(%d)...", irq);
+
+#ifdef CONFIG_SERIAL_M32R_PLDSIO
+//      if (irq == PLD_IRQ_SIO0_SND)
+//              irq = PLD_IRQ_SIO0_RCV;
+#else
+        if (irq == M32R_IRQ_SIO0_S)
+                irq = M32R_IRQ_SIO0_R;
+#endif
+
+        spin_lock(&i->lock);
+
+        l = i->head;
+        do {
+                struct uart_sio_port *up;
+                unsigned int sts;
+
+                up = list_entry(l, struct uart_sio_port, list);
+
+                sts = sio_in(up, SIOSTS);
+                if (sts & 0x5) {
+                        spin_lock(&up->port.lock);
+                        m32r_sio_handle_port(up, sts, regs);
+                        spin_unlock(&up->port.lock);
+
+                        end = NULL;
+                } else if (end == NULL)
+                        end = l;
+
+                l = l->next;
+
+                if (l == i->head && pass_counter++ > PASS_LIMIT) {
+                        if (sts & 0xe0)
+                                sio_error(&sts);
+                        break;
+                }
+        } while (l != end);
+
+        spin_unlock(&i->lock);
+
+        DEBUG_INTR("end.\n");
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * To support ISA shared interrupts, we need to have one interrupt
+ * handler that ensures that the IRQ line has been deasserted
+ * before returning.  Failing to do this will result in the IRQ
+ * line being stuck active, and, since ISA irqs are edge triggered,
+ * no more IRQs will be seen.
+ */
+static void serial_do_unlink(struct irq_info *i, struct uart_sio_port *up)
+{
+        spin_lock_irq(&i->lock);
+
+        if (!list_empty(i->head)) {
+                if (i->head == &up->list)
+                        i->head = i->head->next;
+                list_del(&up->list);
+        } else {
+                BUG_ON(i->head != &up->list);
+                i->head = NULL;
+        }
+
+        spin_unlock_irq(&i->lock);
+}
+
+static int serial_link_irq_chain(struct uart_sio_port *up)
+{
+        struct irq_info *i = irq_lists + up->port.irq;
+        int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0;
+
+        spin_lock_irq(&i->lock);
+
+        if (i->head) {
+                list_add(&up->list, i->head);
+                spin_unlock_irq(&i->lock);
+
+                ret = 0;
+        } else {
+                INIT_LIST_HEAD(&up->list);
+                i->head = &up->list;
+                spin_unlock_irq(&i->lock);
+
+                ret = request_irq(up->port.irq, m32r_sio_interrupt,
+                                  irq_flags, "SIO0-RX", i);
+                ret |= request_irq(up->port.irq + 1, m32r_sio_interrupt,
+                                  irq_flags, "SIO0-TX", i);
+                if (ret < 0)
+                        serial_do_unlink(i, up);
+        }
+
+        return ret;
+}
+
+static void serial_unlink_irq_chain(struct uart_sio_port *up)
+{
+        struct irq_info *i = irq_lists + up->port.irq;
+
+        BUG_ON(i->head == NULL);
+
+        if (list_empty(i->head)) {
+                free_irq(up->port.irq, i);
+                free_irq(up->port.irq + 1, i);
+        }
+
+        serial_do_unlink(i, up);
+}
+
+/*
+ * This function is used to handle ports that do not have an interrupt.
+ */
+static void m32r_sio_timeout(unsigned long data)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)data;
+        unsigned int timeout;
+        unsigned int sts;
+
+        sts = sio_in(up, SIOSTS);
+        if (sts & 0x5) {
+                spin_lock(&up->port.lock);
+                m32r_sio_handle_port(up, sts, NULL);
+                spin_unlock(&up->port.lock);
+        }
+
+        timeout = up->port.timeout;
+        timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
+        mod_timer(&up->timer, jiffies + timeout);
+}
+
+static unsigned int m32r_sio_tx_empty(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static unsigned int m32r_sio_get_mctrl(struct uart_port *port)
+{
+        return 0;
+}
+
+static void m32r_sio_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+
+}
+
+static void m32r_sio_break_ctl(struct uart_port *port, int break_state)
+{
+
+}
+
+static int m32r_sio_startup(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+        int retval;
+
+        sio_init();
+
+        /*
+         * If the "interrupt" for this port doesn't correspond with any
+         * hardware interrupt, we use a timer-based system.  The original
+         * driver used to do this with IRQ0.
+         */
+        if (!is_real_interrupt(up->port.irq)) {
+                unsigned int timeout = up->port.timeout;
+
+                timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
+
+                up->timer.data = (unsigned long)up;
+                mod_timer(&up->timer, jiffies + timeout);
+        } else {
+                retval = serial_link_irq_chain(up);
+                if (retval)
+                        return retval;
+        }
+
+        /*
+         * Finally, enable interrupts.  Note: Modem status interrupts
+         * are set via set_termios(), which will be occurring imminently
+         * anyway, so we don't enable them here.
+         * - M32R_SIO: 0x0c
+         * - M32R_PLDSIO: 0x04
+         */
+        up->ier = UART_IER_MSI | UART_IER_RLSI | UART_IER_RDI;
+        sio_out(up, SIOTRCR, up->ier);
+
+        /*
+         * And clear the interrupt registers again for luck.
+         */
+        sio_reset();
+
+        return 0;
+}
+
+static void m32r_sio_shutdown(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        /*
+         * Disable interrupts from this port
+         */
+        up->ier = 0;
+        sio_out(up, SIOTRCR, 0);
+
+        /*
+         * Disable break condition and FIFOs
+         */
+
+        sio_init();
+
+        if (!is_real_interrupt(up->port.irq))
+                del_timer_sync(&up->timer);
+        else
+                serial_unlink_irq_chain(up);
+}
+
+static unsigned int m32r_sio_get_divisor(struct uart_port *port,
+        unsigned int baud)
+{
+        return uart_get_divisor(port, baud);
+}
+
+static void m32r_sio_set_termios(struct uart_port *port,
+        struct termios *termios, struct termios *old)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+        unsigned char cval = 0;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                cval = 0x00;
+                break;
+        case CS6:
+                cval = 0x01;
+                break;
+        case CS7:
+                cval = 0x02;
+                break;
+        default:
+        case CS8:
+                cval = 0x03;
+                break;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                cval |= 0x04;
+        if (termios->c_cflag & PARENB)
+                cval |= UART_LCR_PARITY;
+        if (!(termios->c_cflag & PARODD))
+                cval |= UART_LCR_EPAR;
+#ifdef CMSPAR
+        if (termios->c_cflag & CMSPAR)
+                cval |= UART_LCR_SPAR;
+#endif
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+#ifdef CONFIG_SERIAL_M32R_PLDSIO
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/4);
+#else
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+#endif
+        quot = m32r_sio_get_divisor(port, baud);
+
+        /*
+         * Ok, we're now changing the port state.  Do it with
+         * interrupts disabled.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        sio_set_baud_rate(baud);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
+        if (termios->c_iflag & INPCK)
+                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= UART_LSR_BI;
+
+        /*
+         * Characteres to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
+        if (termios->c_iflag & IGNBRK) {
+                up->port.ignore_status_mask |= UART_LSR_BI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        up->port.ignore_status_mask |= UART_LSR_OE;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= UART_LSR_DR;
+
+        /*
+         * CTS flow control flag and modem status interrupts
+         */
+        up->ier &= ~UART_IER_MSI;
+        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+                up->ier |= UART_IER_MSI;
+
+        serial_out(up, UART_IER, up->ier);
+
+        up->lcr = cval;                                 /* Save LCR */
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void m32r_sio_pm(struct uart_port *port, unsigned int state,
+        unsigned int oldstate)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        if (up->pm)
+                up->pm(port, state, oldstate);
+}
+
+/*
+ * Resource handling.  This is complicated by the fact that resources
+ * depend on the port type.  Maybe we should be claiming the standard
+ * 8250 ports, and then trying to get other resources as necessary?
+ */
+static int
+m32r_sio_request_std_resource(struct uart_sio_port *up, struct resource **res)
+{
+        unsigned int size = 8 << up->port.regshift;
+#ifndef CONFIG_SERIAL_M32R_PLDSIO
+        unsigned long start;
+#endif
+        int ret = 0;
+
+        switch (up->port.iotype) {
+        case UPIO_MEM:
+                if (up->port.mapbase) {
+#ifdef CONFIG_SERIAL_M32R_PLDSIO
+                        *res = request_mem_region(up->port.mapbase, size, "serial");
+#else
+                        start = up->port.mapbase;
+                        *res = request_mem_region(start, size, "serial");
+#endif
+                        if (!*res)
+                                ret = -EBUSY;
+                }
+                break;
+
+        case UPIO_PORT:
+                *res = request_region(up->port.iobase, size, "serial");
+                if (!*res)
+                        ret = -EBUSY;
+                break;
+        }
+        return ret;
+}
+
+static void m32r_sio_release_port(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+        unsigned long start, offset = 0, size = 0;
+
+        size <<= up->port.regshift;
+
+        switch (up->port.iotype) {
+        case UPIO_MEM:
+                if (up->port.mapbase) {
+                        /*
+                         * Unmap the area.
+                         */
+                        iounmap(up->port.membase);
+                        up->port.membase = NULL;
+
+                        start = up->port.mapbase;
+
+                        if (size)
+                                release_mem_region(start + offset, size);
+                        release_mem_region(start, 8 << up->port.regshift);
+                }
+                break;
+
+        case UPIO_PORT:
+                start = up->port.iobase;
+
+                if (size)
+                        release_region(start + offset, size);
+                release_region(start + offset, 8 << up->port.regshift);
+                break;
+
+        default:
+                break;
+        }
+}
+
+static int m32r_sio_request_port(struct uart_port *port)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+        struct resource *res = NULL;
+        int ret = 0;
+
+        ret = m32r_sio_request_std_resource(up, &res);
+
+        /*
+         * If we have a mapbase, then request that as well.
+         */
+        if (ret == 0 && up->port.flags & UPF_IOREMAP) {
+                int size = res->end - res->start + 1;
+
+                up->port.membase = ioremap(up->port.mapbase, size);
+                if (!up->port.membase)
+                        ret = -ENOMEM;
+        }
+
+        if (ret < 0) {
+                if (res)
+                        release_resource(res);
+        }
+
+        return ret;
+}
+
+static void m32r_sio_config_port(struct uart_port *port, int flags)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        up->port.type = (PORT_M32R_SIO - PORT_M32R_BASE + 1);
+        up->port.fifosize = uart_config[up->port.type].dfl_xmit_fifo_size;
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int
+m32r_sio_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        if (ser->irq >= NR_IRQS || ser->irq < 0 ||
+            ser->baud_base < 9600 || ser->type < PORT_UNKNOWN ||
+            ser->type >= ARRAY_SIZE(uart_config))
+                return -EINVAL;
+        return 0;
+}
+
+static const char *
+m32r_sio_type(struct uart_port *port)
+{
+        int type = port->type;
+
+        if (type >= ARRAY_SIZE(uart_config))
+                type = 0;
+        return uart_config[type].name;
+}
+
+static struct uart_ops m32r_sio_pops = {
+        .tx_empty       = m32r_sio_tx_empty,
+        .set_mctrl      = m32r_sio_set_mctrl,
+        .get_mctrl      = m32r_sio_get_mctrl,
+        .stop_tx        = m32r_sio_stop_tx,
+        .start_tx       = m32r_sio_start_tx,
+        .stop_rx        = m32r_sio_stop_rx,
+        .enable_ms      = m32r_sio_enable_ms,
+        .break_ctl      = m32r_sio_break_ctl,
+        .startup        = m32r_sio_startup,
+        .shutdown       = m32r_sio_shutdown,
+        .set_termios    = m32r_sio_set_termios,
+        .pm             = m32r_sio_pm,
+        .type           = m32r_sio_type,
+        .release_port   = m32r_sio_release_port,
+        .request_port   = m32r_sio_request_port,
+        .config_port    = m32r_sio_config_port,
+        .verify_port    = m32r_sio_verify_port,
+};
+
+static struct uart_sio_port m32r_sio_ports[UART_NR];
+
+static void __init m32r_sio_init_ports(void)
+{
+        struct uart_sio_port *up;
+        static int first = 1;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        for (i = 0, up = m32r_sio_ports; i < ARRAY_SIZE(old_serial_port);
+             i++, up++) {
+                up->port.iobase   = old_serial_port[i].port;
+                up->port.irq      = irq_canonicalize(old_serial_port[i].irq);
+                up->port.uartclk  = old_serial_port[i].baud_base * 16;
+                up->port.flags    = old_serial_port[i].flags;
+                up->port.membase  = old_serial_port[i].iomem_base;
+                up->port.iotype   = old_serial_port[i].io_type;
+                up->port.regshift = old_serial_port[i].iomem_reg_shift;
+                up->port.ops      = &m32r_sio_pops;
+        }
+}
+
+static void __init m32r_sio_register_ports(struct uart_driver *drv)
+{
+        int i;
+
+        m32r_sio_init_ports();
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_sio_port *up = &m32r_sio_ports[i];
+
+                up->port.line = i;
+                up->port.ops = &m32r_sio_pops;
+                init_timer(&up->timer);
+                up->timer.function = m32r_sio_timeout;
+
+                /*
+                 * ALPHA_KLUDGE_MCR needs to be killed.
+                 */
+                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
+                up->mcr_force = ALPHA_KLUDGE_MCR;
+
+                uart_add_one_port(drv, &up->port);
+        }
+}
+
+#ifdef CONFIG_SERIAL_M32R_SIO_CONSOLE
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static inline void wait_for_xmitr(struct uart_sio_port *up)
+{
+        unsigned int status, tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        do {
+                status = sio_in(up, SIOSTS);
+
+                if (--tmout == 0)
+                        break;
+                udelay(1);
+        } while ((status & UART_EMPTY) != UART_EMPTY);
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & UPF_CONS_FLOW) {
+                tmout = 1000000;
+                while (--tmout)
+                        udelay(1);
+        }
+}
+
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ */
+static void m32r_sio_console_write(struct console *co, const char *s,
+        unsigned int count)
+{
+        struct uart_sio_port *up = &m32r_sio_ports[co->index];
+        unsigned int ier;
+        int i;
+
+        /*
+         *      First save the UER then disable the interrupts
+         */
+        ier = sio_in(up, SIOTRCR);
+        sio_out(up, SIOTRCR, 0);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++, s++) {
+                wait_for_xmitr(up);
+
+                /*
+                 *      Send the character out.
+                 *      If a LF, also do CR...
+                 */
+                sio_out(up, SIOTXB, *s);
+
+                if (*s == 10) {
+                        wait_for_xmitr(up);
+                        sio_out(up, SIOTXB, 13);
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(up);
+        sio_out(up, SIOTRCR, ier);
+}
+
+static int __init m32r_sio_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        port = &m32r_sio_ports[co->index].port;
+
+        /*
+         * Temporary fix.
+         */
+        spin_lock_init(&port->lock);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver m32r_sio_reg;
+static struct console m32r_sio_console = {
+        .name           = "ttyS",
+        .write          = m32r_sio_console_write,
+        .device         = uart_console_device,
+        .setup          = m32r_sio_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &m32r_sio_reg,
+};
+
+static int __init m32r_sio_console_init(void)
+{
+        sio_reset();
+        sio_init();
+        m32r_sio_init_ports();
+        register_console(&m32r_sio_console);
+        return 0;
+}
+console_initcall(m32r_sio_console_init);
+
+#define M32R_SIO_CONSOLE        &m32r_sio_console
+#else
+#define M32R_SIO_CONSOLE        NULL
+#endif
+
+static struct uart_driver m32r_sio_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "sio",
+        .devfs_name             = "tts/",
+        .dev_name               = "ttyS",
+        .major                  = TTY_MAJOR,
+        .minor                  = 64,
+        .nr                     = UART_NR,
+        .cons                   = M32R_SIO_CONSOLE,
+};
+
+/**
+ *      m32r_sio_suspend_port - suspend one serial port
+ *      @line: serial line number
+ *
+ *      Suspend one serial port.
+ */
+void m32r_sio_suspend_port(int line)
+{
+        uart_suspend_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
+}
+
+/**
+ *      m32r_sio_resume_port - resume one serial port
+ *      @line: serial line number
+ *
+ *      Resume one serial port.
+ */
+void m32r_sio_resume_port(int line)
+{
+        uart_resume_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
+}
+
+static int __init m32r_sio_init(void)
+{
+        int ret, i;
+
+        printk(KERN_INFO "Serial: M32R SIO driver $Revision: 1.11 $ ");
+
+        for (i = 0; i < NR_IRQS; i++)
+                spin_lock_init(&irq_lists[i].lock);
+
+        ret = uart_register_driver(&m32r_sio_reg);
+        if (ret >= 0)
+                m32r_sio_register_ports(&m32r_sio_reg);
+
+        return ret;
+}
+
+static void __exit m32r_sio_exit(void)
+{
+        int i;
+
+        for (i = 0; i < UART_NR; i++)
+                uart_remove_one_port(&m32r_sio_reg, &m32r_sio_ports[i].port);
+
+        uart_unregister_driver(&m32r_sio_reg);
+}
+
+module_init(m32r_sio_init);
+module_exit(m32r_sio_exit);
+
+EXPORT_SYMBOL(m32r_sio_suspend_port);
+EXPORT_SYMBOL(m32r_sio_resume_port);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic M32R SIO serial driver $Revision: 1.11 $");
diff --git a/drivers/serial/m32r_sio.h b/drivers/serial/m32r_sio.h
new file mode 100644
index 000000000000..07d0dd80aa3d
--- /dev/null
+++ b/drivers/serial/m32r_sio.h
@@ -0,0 +1,55 @@
+/*
+ *  m32r_sio.h
+ *
+ *  Driver for M32R serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *  Based on drivers/serial/8250.h.
+ *
+ *  Copyright (C) 2001  Russell King.
+ *  Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ *
+ * 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/config.h>
+
+struct m32r_sio_probe {
+        struct module   *owner;
+        int             (*pci_init_one)(struct pci_dev *dev);
+        void            (*pci_remove_one)(struct pci_dev *dev);
+        void            (*pnp_init)(void);
+};
+
+int m32r_sio_register_probe(struct m32r_sio_probe *probe);
+void m32r_sio_unregister_probe(struct m32r_sio_probe *probe);
+void m32r_sio_get_irq_map(unsigned int *map);
+void m32r_sio_suspend_port(int line);
+void m32r_sio_resume_port(int line);
+
+struct old_serial_port {
+        unsigned int uart;
+        unsigned int baud_base;
+        unsigned int port;
+        unsigned int irq;
+        unsigned int flags;
+        unsigned char io_type;
+        unsigned char *iomem_base;
+        unsigned short iomem_reg_shift;
+};
+
+#define _INLINE_ inline
+
+#define PROBE_RSA       (1 << 0)
+#define PROBE_ANY       (~0)
+
+#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
+
+#ifdef CONFIG_SERIAL_SIO_SHARE_IRQ
+#define M32R_SIO_SHARE_IRQS 1
+#else
+#define M32R_SIO_SHARE_IRQS 0
+#endif
diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/serial/m32r_sio_reg.h
new file mode 100644
index 000000000000..9c864529451b
--- /dev/null
+++ b/drivers/serial/m32r_sio_reg.h
@@ -0,0 +1,153 @@
+/*
+ * m32r_sio_reg.h
+ *
+ * Copyright (C) 1992, 1994 by Theodore Ts'o.
+ * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ *
+ * Redistribution of this file is permitted under the terms of the GNU
+ * Public License (GPL)
+ *
+ * These are the UART port assignments, expressed as offsets from the base
+ * register.  These assignments should hold for any serial port based on
+ * a 8250, 16450, or 16550(A).
+ */
+
+#ifndef _M32R_SIO_REG_H
+#define _M32R_SIO_REG_H
+
+#include <linux/config.h>
+
+#ifdef CONFIG_SERIAL_M32R_PLDSIO
+
+#define SIOCR           0x000
+#define SIOMOD0         0x002
+#define SIOMOD1         0x004
+#define SIOSTS          0x006
+#define SIOTRCR         0x008
+#define SIOBAUR         0x00a
+// #define SIORBAUR     0x018
+#define SIOTXB          0x00c
+#define SIORXB          0x00e
+
+#define UART_RX         ((unsigned long) PLD_ESIO0RXB)
+                                /* In:  Receive buffer (DLAB=0) */
+#define UART_TX         ((unsigned long) PLD_ESIO0TXB)
+                                /* Out: Transmit buffer (DLAB=0) */
+#define UART_DLL        0       /* Out: Divisor Latch Low (DLAB=1) */
+#define UART_TRG        0       /* (LCR=BF) FCTR bit 7 selects Rx or Tx
+                                 * In: Fifo count
+                                 * Out: Fifo custom trigger levels
+                                 * XR16C85x only */
+
+#define UART_DLM        0       /* Out: Divisor Latch High (DLAB=1) */
+#define UART_IER        ((unsigned long) PLD_ESIO0INTCR)
+                                /* Out: Interrupt Enable Register */
+#define UART_FCTR       0       /* (LCR=BF) Feature Control Register
+                                 * XR16C85x only */
+
+#define UART_IIR        0       /* In:  Interrupt ID Register */
+#define UART_FCR        0       /* Out: FIFO Control Register */
+#define UART_EFR        0       /* I/O: Extended Features Register */
+                                /* (DLAB=1, 16C660 only) */
+
+#define UART_LCR        0       /* Out: Line Control Register */
+#define UART_MCR        0       /* Out: Modem Control Register */
+#define UART_LSR        ((unsigned long) PLD_ESIO0STS)
+                                /* In:  Line Status Register */
+#define UART_MSR        0       /* In:  Modem Status Register */
+#define UART_SCR        0       /* I/O: Scratch Register */
+#define UART_EMSR       0       /* (LCR=BF) Extended Mode Select Register
+                                 * FCTR bit 6 selects SCR or EMSR
+                                 * XR16c85x only */
+
+#else /* not CONFIG_SERIAL_M32R_PLDSIO */
+
+#define SIOCR           0x000
+#define SIOMOD0         0x004
+#define SIOMOD1         0x008
+#define SIOSTS          0x00c
+#define SIOTRCR         0x010
+#define SIOBAUR         0x014
+#define SIORBAUR        0x018
+#define SIOTXB          0x01c
+#define SIORXB          0x020
+
+#define UART_RX         M32R_SIO0_RXB_PORTL     /* In:  Receive buffer (DLAB=0) */
+#define UART_TX         M32R_SIO0_TXB_PORTL     /* Out: Transmit buffer (DLAB=0) */
+#define UART_DLL        0       /* Out: Divisor Latch Low (DLAB=1) */
+#define UART_TRG        0       /* (LCR=BF) FCTR bit 7 selects Rx or Tx
+                                 * In: Fifo count
+                                 * Out: Fifo custom trigger levels
+                                 * XR16C85x only */
+
+#define UART_DLM        0       /* Out: Divisor Latch High (DLAB=1) */
+#define UART_IER        M32R_SIO0_TRCR_PORTL    /* Out: Interrupt Enable Register */
+#define UART_FCTR       0       /* (LCR=BF) Feature Control Register
+                                 * XR16C85x only */
+
+#define UART_IIR        0       /* In:  Interrupt ID Register */
+#define UART_FCR        0       /* Out: FIFO Control Register */
+#define UART_EFR        0       /* I/O: Extended Features Register */
+                                /* (DLAB=1, 16C660 only) */
+
+#define UART_LCR        0       /* Out: Line Control Register */
+#define UART_MCR        0       /* Out: Modem Control Register */
+#define UART_LSR        M32R_SIO0_STS_PORTL     /* In:  Line Status Register */
+#define UART_MSR        0       /* In:  Modem Status Register */
+#define UART_SCR        0       /* I/O: Scratch Register */
+#define UART_EMSR       0       /* (LCR=BF) Extended Mode Select Register
+                                 * FCTR bit 6 selects SCR or EMSR
+                                 * XR16c85x only */
+
+#endif /* CONFIG_SERIAL_M32R_PLDSIO */
+
+#define UART_EMPTY      (UART_LSR_TEMT | UART_LSR_THRE)
+
+/*
+ * These are the definitions for the Line Control Register
+ *
+ * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting
+ * UART_LCR_STOP will select 1.5 stop bits, not 2 stop bits.
+ */
+#define UART_LCR_DLAB   0x80    /* Divisor latch access bit */
+#define UART_LCR_SBC    0x40    /* Set break control */
+#define UART_LCR_SPAR   0x20    /* Stick parity (?) */
+#define UART_LCR_EPAR   0x10    /* Even parity select */
+#define UART_LCR_PARITY 0x08    /* Parity Enable */
+#define UART_LCR_STOP   0x04    /* Stop bits: 0=1 stop bit, 1= 2 stop bits */
+#define UART_LCR_WLEN5  0x00    /* Wordlength: 5 bits */
+#define UART_LCR_WLEN6  0x01    /* Wordlength: 6 bits */
+#define UART_LCR_WLEN7  0x02    /* Wordlength: 7 bits */
+#define UART_LCR_WLEN8  0x03    /* Wordlength: 8 bits */
+
+/*
+ * These are the definitions for the Line Status Register
+ */
+#define UART_LSR_TEMT   0x02    /* Transmitter empty */
+#define UART_LSR_THRE   0x01    /* Transmit-hold-register empty */
+#define UART_LSR_BI     0x00    /* Break interrupt indicator */
+#define UART_LSR_FE     0x80    /* Frame error indicator */
+#define UART_LSR_PE     0x40    /* Parity error indicator */
+#define UART_LSR_OE     0x20    /* Overrun error indicator */
+#define UART_LSR_DR     0x04    /* Receiver data ready */
+
+/*
+ * These are the definitions for the Interrupt Identification Register
+ */
+#define UART_IIR_NO_INT 0x01    /* No interrupts pending */
+#define UART_IIR_ID     0x06    /* Mask for the interrupt ID */
+
+#define UART_IIR_MSI    0x00    /* Modem status interrupt */
+#define UART_IIR_THRI   0x02    /* Transmitter holding register empty */
+#define UART_IIR_RDI    0x04    /* Receiver data interrupt */
+#define UART_IIR_RLSI   0x06    /* Receiver line status interrupt */
+
+/*
+ * These are the definitions for the Interrupt Enable Register
+ */
+#define UART_IER_MSI    0x00    /* Enable Modem status interrupt */
+#define UART_IER_RLSI   0x08    /* Enable receiver line status interrupt */
+#define UART_IER_THRI   0x03    /* Enable Transmitter holding register int. */
+#define UART_IER_RDI    0x04    /* Enable receiver data interrupt */
+
+#endif /* _M32R_SIO_REG_H */
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
new file mode 100644
index 000000000000..8c40167778de
--- /dev/null
+++ b/drivers/serial/mcfserial.c
@@ -0,0 +1,1883 @@
+/*
+ * mcfserial.c -- serial driver for ColdFire internal UARTS.
+ *
+ * Copyright (C) 1999-2003 Greg Ungerer <gerg@snapgear.com>
+ * Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com> 
+ * Copyright (C) 2001-2002 SnapGear Inc. <www.snapgear.com> 
+ *
+ * Based on code from 68332serial.c which was:
+ *
+ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1998 TSHG
+ * Copyright (c) 1999 Rt-Control Inc. <jeff@uclinux.org>
+ *
+ * Changes:
+ * 08/07/2003    Daniele Bellucci <bellucda@tiscali.it>
+ *               some cleanups in mcfrs_write.
+ *
+ */
+ 
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/wait.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/string.h>
+#include <linux/fcntl.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
+#include <linux/serial.h>
+#include <linux/serialP.h>
+#include <linux/console.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/segment.h>
+#include <asm/semaphore.h>
+#include <asm/delay.h>
+#include <asm/coldfire.h>
+#include <asm/mcfsim.h>
+#include <asm/mcfuart.h>
+#include <asm/nettel.h>
+#include <asm/uaccess.h>
+#include "mcfserial.h"
+
+struct timer_list mcfrs_timer_struct;
+
+/*
+ *      Default console baud rate,  we use this as the default
+ *      for all ports so init can just open /dev/console and
+ *      keep going.  Perhaps one day the cflag settings for the
+ *      console can be used instead.
+ */
+#if defined(CONFIG_ARNEWSH) || defined(CONFIG_MOTOROLA) || defined(CONFIG_senTec) || defined(CONFIG_SNEHA)
+#define CONSOLE_BAUD_RATE       19200
+#define DEFAULT_CBAUD           B19200
+#endif
+
+#if defined(CONFIG_HW_FEITH)
+  #define       CONSOLE_BAUD_RATE       38400
+  #define       DEFAULT_CBAUD           B38400
+#endif
+
+#ifndef CONSOLE_BAUD_RATE
+#define CONSOLE_BAUD_RATE       9600
+#define DEFAULT_CBAUD           B9600
+#endif
+
+int mcfrs_console_inited = 0;
+int mcfrs_console_port = -1;
+int mcfrs_console_baud = CONSOLE_BAUD_RATE;
+int mcfrs_console_cbaud = DEFAULT_CBAUD;
+
+/*
+ *      Driver data structures.
+ */
+static struct tty_driver *mcfrs_serial_driver;
+
+/* number of characters left in xmit buffer before we ask for more */
+#define WAKEUP_CHARS 256
+
+/* Debugging...
+ */
+#undef SERIAL_DEBUG_OPEN
+#undef SERIAL_DEBUG_FLOW
+
+#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#define IRQBASE (MCFINT_VECBASE+MCFINT_UART0)
+#else
+#define IRQBASE 73
+#endif
+
+/*
+ *      Configuration table, UARTs to look for at startup.
+ */
+static struct mcf_serial mcfrs_table[] = {
+        {  /* ttyS0 */
+                .magic = 0,
+                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE1),
+                .irq = IRQBASE,
+                .flags = ASYNC_BOOT_AUTOCONF,
+        },
+        {  /* ttyS1 */
+                .magic = 0,
+                .addr = (volatile unsigned char *) (MCF_MBAR+MCFUART_BASE2),
+                .irq = IRQBASE+1,
+                .flags = ASYNC_BOOT_AUTOCONF,
+        },
+};
+
+
+#define NR_PORTS        (sizeof(mcfrs_table) / sizeof(struct mcf_serial))
+
+/*
+ * This is used to figure out the divisor speeds and the timeouts.
+ */
+static int mcfrs_baud_table[] = {
+        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
+        9600, 19200, 38400, 57600, 115200, 230400, 460800, 0
+};
+#define MCFRS_BAUD_TABLE_SIZE \
+                        (sizeof(mcfrs_baud_table)/sizeof(mcfrs_baud_table[0]))
+
+
+#ifdef CONFIG_MAGIC_SYSRQ
+/*
+ *      Magic system request keys. Used for debugging...
+ */
+extern int      magic_sysrq_key(int ch);
+#endif
+
+
+/*
+ *      Forware declarations...
+ */
+static void     mcfrs_change_speed(struct mcf_serial *info);
+static void     mcfrs_wait_until_sent(struct tty_struct *tty, int timeout);
+
+
+static inline int serial_paranoia_check(struct mcf_serial *info,
+                                        char *name, const char *routine)
+{
+#ifdef SERIAL_PARANOIA_CHECK
+        static const char badmagic[] =
+                "MCFRS(warning): bad magic number for serial struct %s in %s\n";
+        static const char badinfo[] =
+                "MCFRS(warning): null mcf_serial for %s in %s\n";
+
+        if (!info) {
+                printk(badinfo, name, routine);
+                return 1;
+        }
+        if (info->magic != SERIAL_MAGIC) {
+                printk(badmagic, name, routine);
+                return 1;
+        }
+#endif
+        return 0;
+}
+
+/*
+ *      Sets or clears DTR and RTS on the requested line.
+ */
+static void mcfrs_setsignals(struct mcf_serial *info, int dtr, int rts)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+        
+#if 0
+        printk("%s(%d): mcfrs_setsignals(info=%x,dtr=%d,rts=%d)\n",
+                __FILE__, __LINE__, info, dtr, rts);
+#endif
+
+        local_irq_save(flags);
+        if (dtr >= 0) {
+#ifdef MCFPP_DTR0
+                if (info->line)
+                        mcf_setppdata(MCFPP_DTR1, (dtr ? 0 : MCFPP_DTR1));
+                else
+                        mcf_setppdata(MCFPP_DTR0, (dtr ? 0 : MCFPP_DTR0));
+#endif
+        }
+        if (rts >= 0) {
+                uartp = info->addr;
+                if (rts) {
+                        info->sigs |= TIOCM_RTS;
+                        uartp[MCFUART_UOP1] = MCFUART_UOP_RTS;
+                } else {
+                        info->sigs &= ~TIOCM_RTS;
+                        uartp[MCFUART_UOP0] = MCFUART_UOP_RTS;
+                }
+        }
+        local_irq_restore(flags);
+        return;
+}
+
+/*
+ *      Gets values of serial signals.
+ */
+static int mcfrs_getsignals(struct mcf_serial *info)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+        int                     sigs;
+#if defined(CONFIG_NETtel) && defined(CONFIG_M5307)
+        unsigned short          ppdata;
+#endif
+
+#if 0
+        printk("%s(%d): mcfrs_getsignals(info=%x)\n", __FILE__, __LINE__);
+#endif
+
+        local_irq_save(flags);
+        uartp = info->addr;
+        sigs = (uartp[MCFUART_UIPR] & MCFUART_UIPR_CTS) ? 0 : TIOCM_CTS;
+        sigs |= (info->sigs & TIOCM_RTS);
+
+#ifdef MCFPP_DCD0
+{
+        unsigned int ppdata;
+        ppdata = mcf_getppdata();
+        if (info->line == 0) {
+                sigs |= (ppdata & MCFPP_DCD0) ? 0 : TIOCM_CD;
+                sigs |= (ppdata & MCFPP_DTR0) ? 0 : TIOCM_DTR;
+        } else if (info->line == 1) {
+                sigs |= (ppdata & MCFPP_DCD1) ? 0 : TIOCM_CD;
+                sigs |= (ppdata & MCFPP_DTR1) ? 0 : TIOCM_DTR;
+        }
+}
+#endif
+
+        local_irq_restore(flags);
+        return(sigs);
+}
+
+/*
+ * ------------------------------------------------------------
+ * mcfrs_stop() and mcfrs_start()
+ *
+ * This routines are called before setting or resetting tty->stopped.
+ * They enable or disable transmitter interrupts, as necessary.
+ * ------------------------------------------------------------
+ */
+static void mcfrs_stop(struct tty_struct *tty)
+{
+        volatile unsigned char  *uartp;
+        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
+        unsigned long           flags;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_stop"))
+                return;
+        
+        local_irq_save(flags);
+        uartp = info->addr;
+        info->imr &= ~MCFUART_UIR_TXREADY;
+        uartp[MCFUART_UIMR] = info->imr;
+        local_irq_restore(flags);
+}
+
+static void mcfrs_start(struct tty_struct *tty)
+{
+        volatile unsigned char  *uartp;
+        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
+        unsigned long           flags;
+        
+        if (serial_paranoia_check(info, tty->name, "mcfrs_start"))
+                return;
+
+        local_irq_save(flags);
+        if (info->xmit_cnt && info->xmit_buf) {
+                uartp = info->addr;
+                info->imr |= MCFUART_UIR_TXREADY;
+                uartp[MCFUART_UIMR] = info->imr;
+        }
+        local_irq_restore(flags);
+}
+
+/*
+ * ----------------------------------------------------------------------
+ *
+ * Here starts the interrupt handling routines.  All of the following
+ * subroutines are declared as inline and are folded into
+ * mcfrs_interrupt().  They were separated out for readability's sake.
+ *
+ * Note: mcfrs_interrupt() is a "fast" interrupt, which means that it
+ * runs with interrupts turned off.  People who may want to modify
+ * mcfrs_interrupt() should try to keep the interrupt handler as fast as
+ * possible.  After you are done making modifications, it is not a bad
+ * idea to do:
+ * 
+ * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
+ *
+ * and look at the resulting assemble code in serial.s.
+ *
+ *                              - Ted Ts'o (tytso@mit.edu), 7-Mar-93
+ * -----------------------------------------------------------------------
+ */
+
+static inline void receive_chars(struct mcf_serial *info)
+{
+        volatile unsigned char  *uartp;
+        struct tty_struct       *tty = info->tty;
+        unsigned char           status, ch;
+
+        if (!tty)
+                return;
+
+        uartp = info->addr;
+
+        while ((status = uartp[MCFUART_USR]) & MCFUART_USR_RXREADY) {
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        break;
+
+                ch = uartp[MCFUART_URB];
+                info->stats.rx++;
+
+#ifdef CONFIG_MAGIC_SYSRQ
+                if (mcfrs_console_inited && (info->line == mcfrs_console_port)) {
+                        if (magic_sysrq_key(ch))
+                                continue;
+                }
+#endif
+
+                tty->flip.count++;
+                if (status & MCFUART_USR_RXERR) {
+                        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETERR;
+                        if (status & MCFUART_USR_RXBREAK) {
+                                info->stats.rxbreak++;
+                                *tty->flip.flag_buf_ptr++ = TTY_BREAK;
+                        } else if (status & MCFUART_USR_RXPARITY) {
+                                info->stats.rxparity++;
+                                *tty->flip.flag_buf_ptr++ = TTY_PARITY;
+                        } else if (status & MCFUART_USR_RXOVERRUN) {
+                                info->stats.rxoverrun++;
+                                *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                        } else if (status & MCFUART_USR_RXFRAMING) {
+                                info->stats.rxframing++;
+                                *tty->flip.flag_buf_ptr++ = TTY_FRAME;
+                        } else {
+                                /* This should never happen... */
+                                *tty->flip.flag_buf_ptr++ = 0;
+                        }
+                } else {
+                        *tty->flip.flag_buf_ptr++ = 0;
+                }
+                *tty->flip.char_buf_ptr++ = ch;
+        }
+
+        schedule_work(&tty->flip.work);
+        return;
+}
+
+static inline void transmit_chars(struct mcf_serial *info)
+{
+        volatile unsigned char  *uartp;
+
+        uartp = info->addr;
+
+        if (info->x_char) {
+                /* Send special char - probably flow control */
+                uartp[MCFUART_UTB] = info->x_char;
+                info->x_char = 0;
+                info->stats.tx++;
+        }
+
+        if ((info->xmit_cnt <= 0) || info->tty->stopped) {
+                info->imr &= ~MCFUART_UIR_TXREADY;
+                uartp[MCFUART_UIMR] = info->imr;
+                return;
+        }
+
+        while (uartp[MCFUART_USR] & MCFUART_USR_TXREADY) {
+                uartp[MCFUART_UTB] = info->xmit_buf[info->xmit_tail++];
+                info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
+                info->stats.tx++;
+                if (--info->xmit_cnt <= 0)
+                        break;
+        }
+
+        if (info->xmit_cnt < WAKEUP_CHARS)
+                schedule_work(&info->tqueue);
+        return;
+}
+
+/*
+ * This is the serial driver's generic interrupt routine
+ */
+irqreturn_t mcfrs_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct mcf_serial       *info;
+        unsigned char           isr;
+
+        info = &mcfrs_table[(irq - IRQBASE)];
+        isr = info->addr[MCFUART_UISR] & info->imr;
+
+        if (isr & MCFUART_UIR_RXREADY)
+                receive_chars(info);
+        if (isr & MCFUART_UIR_TXREADY)
+                transmit_chars(info);
+        return IRQ_HANDLED;
+}
+
+/*
+ * -------------------------------------------------------------------
+ * Here ends the serial interrupt routines.
+ * -------------------------------------------------------------------
+ */
+
+static void mcfrs_offintr(void *private)
+{
+        struct mcf_serial       *info = (struct mcf_serial *) private;
+        struct tty_struct       *tty;
+        
+        tty = info->tty;
+        if (!tty)
+                return;
+        tty_wakeup(tty);
+}
+
+
+/*
+ *      Change of state on a DCD line.
+ */
+void mcfrs_modem_change(struct mcf_serial *info, int dcd)
+{
+        if (info->count == 0)
+                return;
+
+        if (info->flags & ASYNC_CHECK_CD) {
+                if (dcd)
+                        wake_up_interruptible(&info->open_wait);
+                else 
+                        schedule_work(&info->tqueue_hangup);
+        }
+}
+
+
+#ifdef MCFPP_DCD0
+
+unsigned short  mcfrs_ppstatus;
+
+/*
+ * This subroutine is called when the RS_TIMER goes off. It is used
+ * to monitor the state of the DCD lines - since they have no edge
+ * sensors and interrupt generators.
+ */
+static void mcfrs_timer(void)
+{
+        unsigned int    ppstatus, dcdval, i;
+
+        ppstatus = mcf_getppdata() & (MCFPP_DCD0 | MCFPP_DCD1);
+
+        if (ppstatus != mcfrs_ppstatus) {
+                for (i = 0; (i < 2); i++) {
+                        dcdval = (i ? MCFPP_DCD1 : MCFPP_DCD0);
+                        if ((ppstatus & dcdval) != (mcfrs_ppstatus & dcdval)) {
+                                mcfrs_modem_change(&mcfrs_table[i],
+                                        ((ppstatus & dcdval) ? 0 : 1));
+                        }
+                }
+        }
+        mcfrs_ppstatus = ppstatus;
+
+        /* Re-arm timer */
+        mcfrs_timer_struct.expires = jiffies + HZ/25;
+        add_timer(&mcfrs_timer_struct);
+}
+
+#endif  /* MCFPP_DCD0 */
+
+
+/*
+ * This routine is called from the scheduler tqueue when the interrupt
+ * routine has signalled that a hangup has occurred. The path of
+ * hangup processing is:
+ *
+ *      serial interrupt routine -> (scheduler tqueue) ->
+ *      do_serial_hangup() -> tty->hangup() -> mcfrs_hangup()
+ * 
+ */
+static void do_serial_hangup(void *private)
+{
+        struct mcf_serial       *info = (struct mcf_serial *) private;
+        struct tty_struct       *tty;
+        
+        tty = info->tty;
+        if (!tty)
+                return;
+
+        tty_hangup(tty);
+}
+
+static int startup(struct mcf_serial * info)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+        
+        if (info->flags & ASYNC_INITIALIZED)
+                return 0;
+
+        if (!info->xmit_buf) {
+                info->xmit_buf = (unsigned char *) __get_free_page(GFP_KERNEL);
+                if (!info->xmit_buf)
+                        return -ENOMEM;
+        }
+
+        local_irq_save(flags);
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("starting up ttyS%d (irq %d)...\n", info->line, info->irq);
+#endif
+
+        /*
+         *      Reset UART, get it into known state...
+         */
+        uartp = info->addr;
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
+        mcfrs_setsignals(info, 1, 1);
+
+        if (info->tty)
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
+
+        /*
+         * and set the speed of the serial port
+         */
+        mcfrs_change_speed(info);
+
+        /*
+         * Lastly enable the UART transmitter and receiver, and
+         * interrupt enables.
+         */
+        info->imr = MCFUART_UIR_RXREADY;
+        uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
+        uartp[MCFUART_UIMR] = info->imr;
+
+        info->flags |= ASYNC_INITIALIZED;
+        local_irq_restore(flags);
+        return 0;
+}
+
+/*
+ * This routine will shutdown a serial port; interrupts are disabled, and
+ * DTR is dropped if the hangup on close termio flag is on.
+ */
+static void shutdown(struct mcf_serial * info)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+
+        if (!(info->flags & ASYNC_INITIALIZED))
+                return;
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("Shutting down serial port %d (irq %d)....\n", info->line,
+               info->irq);
+#endif
+        
+        local_irq_save(flags);
+
+        uartp = info->addr;
+        uartp[MCFUART_UIMR] = 0;  /* mask all interrupts */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
+
+        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+                mcfrs_setsignals(info, 0, 0);
+
+        if (info->xmit_buf) {
+                free_page((unsigned long) info->xmit_buf);
+                info->xmit_buf = 0;
+        }
+
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        
+        info->flags &= ~ASYNC_INITIALIZED;
+        local_irq_restore(flags);
+}
+
+
+/*
+ * This routine is called to set the UART divisor registers to match
+ * the specified baud rate for a serial port.
+ */
+static void mcfrs_change_speed(struct mcf_serial *info)
+{
+        volatile unsigned char  *uartp;
+        unsigned int            baudclk, cflag;
+        unsigned long           flags;
+        unsigned char           mr1, mr2;
+        int                     i;
+#ifdef  CONFIG_M5272
+        unsigned int            fraction;
+#endif
+
+        if (!info->tty || !info->tty->termios)
+                return;
+        cflag = info->tty->termios->c_cflag;
+        if (info->addr == 0)
+                return;
+
+#if 0
+        printk("%s(%d): mcfrs_change_speed()\n", __FILE__, __LINE__);
+#endif
+
+        i = cflag & CBAUD;
+        if (i & CBAUDEX) {
+                i &= ~CBAUDEX;
+                if (i < 1 || i > 4)
+                        info->tty->termios->c_cflag &= ~CBAUDEX;
+                else
+                        i += 15;
+        }
+        if (i == 0) {
+                mcfrs_setsignals(info, 0, -1);
+                return;
+        }
+
+        /* compute the baudrate clock */
+#ifdef  CONFIG_M5272
+        /*
+         * For the MCF5272, also compute the baudrate fraction.
+         */
+        baudclk = (MCF_BUSCLK / mcfrs_baud_table[i]) / 32;
+        fraction = MCF_BUSCLK - (baudclk * 32 * mcfrs_baud_table[i]);
+        fraction *= 16;
+        fraction /= (32 * mcfrs_baud_table[i]);
+#else
+        baudclk = ((MCF_BUSCLK / mcfrs_baud_table[i]) + 16) / 32;
+#endif
+
+        info->baud = mcfrs_baud_table[i];
+
+        mr1 = MCFUART_MR1_RXIRQRDY | MCFUART_MR1_RXERRCHAR;
+        mr2 = 0;
+
+        switch (cflag & CSIZE) {
+        case CS5:       mr1 |= MCFUART_MR1_CS5; break;
+        case CS6:       mr1 |= MCFUART_MR1_CS6; break;
+        case CS7:       mr1 |= MCFUART_MR1_CS7; break;
+        case CS8:
+        default:        mr1 |= MCFUART_MR1_CS8; break;
+        }
+
+        if (cflag & PARENB) {
+                if (cflag & CMSPAR) {
+                        if (cflag & PARODD)
+                                mr1 |= MCFUART_MR1_PARITYMARK;
+                        else
+                                mr1 |= MCFUART_MR1_PARITYSPACE;
+                } else {
+                        if (cflag & PARODD)
+                                mr1 |= MCFUART_MR1_PARITYODD;
+                        else
+                                mr1 |= MCFUART_MR1_PARITYEVEN;
+                }
+        } else {
+                mr1 |= MCFUART_MR1_PARITYNONE;
+        }
+
+        if (cflag & CSTOPB)
+                mr2 |= MCFUART_MR2_STOP2;
+        else
+                mr2 |= MCFUART_MR2_STOP1;
+
+        if (cflag & CRTSCTS) {
+                mr1 |= MCFUART_MR1_RXRTS;
+                mr2 |= MCFUART_MR2_TXCTS;
+        }
+
+        if (cflag & CLOCAL)
+                info->flags &= ~ASYNC_CHECK_CD;
+        else
+                info->flags |= ASYNC_CHECK_CD;
+
+        uartp = info->addr;
+
+        local_irq_save(flags);
+#if 0
+        printk("%s(%d): mr1=%x mr2=%x baudclk=%x\n", __FILE__, __LINE__,
+                mr1, mr2, baudclk);
+#endif
+        /*
+          Note: pg 12-16 of MCF5206e User's Manual states that a
+          software reset should be performed prior to changing
+          UMR1,2, UCSR, UACR, bit 7
+        */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;    /* reset RX */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;    /* reset TX */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETMRPTR; /* reset MR pointer */
+        uartp[MCFUART_UMR] = mr1;
+        uartp[MCFUART_UMR] = mr2;
+        uartp[MCFUART_UBG1] = (baudclk & 0xff00) >> 8;  /* set msb byte */
+        uartp[MCFUART_UBG2] = (baudclk & 0xff);         /* set lsb byte */
+#ifdef  CONFIG_M5272
+        uartp[MCFUART_UFPD] = (fraction & 0xf);         /* set fraction */
+#endif
+        uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;
+        uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
+        mcfrs_setsignals(info, 1, -1);
+        local_irq_restore(flags);
+        return;
+}
+
+static void mcfrs_flush_chars(struct tty_struct *tty)
+{
+        volatile unsigned char  *uartp;
+        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
+        unsigned long           flags;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_flush_chars"))
+                return;
+
+        uartp = (volatile unsigned char *) info->addr;
+
+        /*
+         * re-enable receiver interrupt
+         */
+        local_irq_save(flags);
+        if ((!(info->imr & MCFUART_UIR_RXREADY)) &&
+            (info->flags & ASYNC_INITIALIZED) ) {
+                info->imr |= MCFUART_UIR_RXREADY;
+                uartp[MCFUART_UIMR] = info->imr;
+        }
+        local_irq_restore(flags);
+
+        if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
+            !info->xmit_buf)
+                return;
+
+        /* Enable transmitter */
+        local_irq_save(flags);
+        info->imr |= MCFUART_UIR_TXREADY;
+        uartp[MCFUART_UIMR] = info->imr;
+        local_irq_restore(flags);
+}
+
+static int mcfrs_write(struct tty_struct * tty,
+                    const unsigned char *buf, int count)
+{
+        volatile unsigned char  *uartp;
+        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
+        unsigned long           flags;
+        int                     c, total = 0;
+
+#if 0
+        printk("%s(%d): mcfrs_write(tty=%x,buf=%x,count=%d)\n",
+                __FILE__, __LINE__, (int)tty, (int)buf, count);
+#endif
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_write"))
+                return 0;
+
+        if (!tty || !info->xmit_buf)
+                return 0;
+        
+        local_save_flags(flags);
+        while (1) {
+                local_irq_disable();            
+                c = min(count, (int) min(((int)SERIAL_XMIT_SIZE) - info->xmit_cnt - 1,
+                        ((int)SERIAL_XMIT_SIZE) - info->xmit_head));
+                local_irq_restore(flags);
+
+                if (c <= 0)
+                        break;
+
+                memcpy(info->xmit_buf + info->xmit_head, buf, c);
+
+                local_irq_disable();
+                info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
+                info->xmit_cnt += c;
+                local_irq_restore(flags);
+
+                buf += c;
+                count -= c;
+                total += c;
+        }
+
+        local_irq_disable();
+        uartp = info->addr;
+        info->imr |= MCFUART_UIR_TXREADY;
+        uartp[MCFUART_UIMR] = info->imr;
+        local_irq_restore(flags);
+
+        return total;
+}
+
+static int mcfrs_write_room(struct tty_struct *tty)
+{
+        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
+        int     ret;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_write_room"))
+                return 0;
+        ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
+        if (ret < 0)
+                ret = 0;
+        return ret;
+}
+
+static int mcfrs_chars_in_buffer(struct tty_struct *tty)
+{
+        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_chars_in_buffer"))
+                return 0;
+        return info->xmit_cnt;
+}
+
+static void mcfrs_flush_buffer(struct tty_struct *tty)
+{
+        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
+        unsigned long           flags;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_flush_buffer"))
+                return;
+
+        local_irq_save(flags);
+        info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
+        local_irq_restore(flags);
+
+        tty_wakeup(tty);
+}
+
+/*
+ * ------------------------------------------------------------
+ * mcfrs_throttle()
+ * 
+ * This routine is called by the upper-layer tty layer to signal that
+ * incoming characters should be throttled.
+ * ------------------------------------------------------------
+ */
+static void mcfrs_throttle(struct tty_struct * tty)
+{
+        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
+#ifdef SERIAL_DEBUG_THROTTLE
+        char    buf[64];
+        
+        printk("throttle %s: %d....\n", _tty_name(tty, buf),
+               tty->ldisc.chars_in_buffer(tty));
+#endif
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_throttle"))
+                return;
+        
+        if (I_IXOFF(tty))
+                info->x_char = STOP_CHAR(tty);
+
+        /* Turn off RTS line (do this atomic) */
+}
+
+static void mcfrs_unthrottle(struct tty_struct * tty)
+{
+        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
+#ifdef SERIAL_DEBUG_THROTTLE
+        char    buf[64];
+        
+        printk("unthrottle %s: %d....\n", _tty_name(tty, buf),
+               tty->ldisc.chars_in_buffer(tty));
+#endif
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_unthrottle"))
+                return;
+        
+        if (I_IXOFF(tty)) {
+                if (info->x_char)
+                        info->x_char = 0;
+                else
+                        info->x_char = START_CHAR(tty);
+        }
+
+        /* Assert RTS line (do this atomic) */
+}
+
+/*
+ * ------------------------------------------------------------
+ * mcfrs_ioctl() and friends
+ * ------------------------------------------------------------
+ */
+
+static int get_serial_info(struct mcf_serial * info,
+                           struct serial_struct * retinfo)
+{
+        struct serial_struct tmp;
+  
+        if (!retinfo)
+                return -EFAULT;
+        memset(&tmp, 0, sizeof(tmp));
+        tmp.type = info->type;
+        tmp.line = info->line;
+        tmp.port = (unsigned int) info->addr;
+        tmp.irq = info->irq;
+        tmp.flags = info->flags;
+        tmp.baud_base = info->baud_base;
+        tmp.close_delay = info->close_delay;
+        tmp.closing_wait = info->closing_wait;
+        tmp.custom_divisor = info->custom_divisor;
+        return copy_to_user(retinfo,&tmp,sizeof(*retinfo)) ? -EFAULT : 0;
+}
+
+static int set_serial_info(struct mcf_serial * info,
+                           struct serial_struct * new_info)
+{
+        struct serial_struct new_serial;
+        struct mcf_serial old_info;
+        int     retval = 0;
+
+        if (!new_info)
+                return -EFAULT;
+        if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
+                return -EFAULT;
+        old_info = *info;
+
+        if (!capable(CAP_SYS_ADMIN)) {
+                if ((new_serial.baud_base != info->baud_base) ||
+                    (new_serial.type != info->type) ||
+                    (new_serial.close_delay != info->close_delay) ||
+                    ((new_serial.flags & ~ASYNC_USR_MASK) !=
+                     (info->flags & ~ASYNC_USR_MASK)))
+                        return -EPERM;
+                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
+                               (new_serial.flags & ASYNC_USR_MASK));
+                info->custom_divisor = new_serial.custom_divisor;
+                goto check_and_exit;
+        }
+
+        if (info->count > 1)
+                return -EBUSY;
+
+        /*
+         * OK, past this point, all the error checking has been done.
+         * At this point, we start making changes.....
+         */
+
+        info->baud_base = new_serial.baud_base;
+        info->flags = ((info->flags & ~ASYNC_FLAGS) |
+                        (new_serial.flags & ASYNC_FLAGS));
+        info->type = new_serial.type;
+        info->close_delay = new_serial.close_delay;
+        info->closing_wait = new_serial.closing_wait;
+
+check_and_exit:
+        retval = startup(info);
+        return retval;
+}
+
+/*
+ * get_lsr_info - get line status register info
+ *
+ * Purpose: Let user call ioctl() to get info when the UART physically
+ *          is emptied.  On bus types like RS485, the transmitter must
+ *          release the bus after transmitting. This must be done when
+ *          the transmit shift register is empty, not be done when the
+ *          transmit holding register is empty.  This functionality
+ *          allows an RS485 driver to be written in user space. 
+ */
+static int get_lsr_info(struct mcf_serial * info, unsigned int *value)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+        unsigned char           status;
+
+        local_irq_save(flags);
+        uartp = info->addr;
+        status = (uartp[MCFUART_USR] & MCFUART_USR_TXEMPTY) ? TIOCSER_TEMT : 0;
+        local_irq_restore(flags);
+
+        return put_user(status,value);
+}
+
+/*
+ * This routine sends a break character out the serial port.
+ */
+static void send_break( struct mcf_serial * info, int duration)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+
+        if (!info->addr)
+                return;
+        set_current_state(TASK_INTERRUPTIBLE);
+        uartp = info->addr;
+
+        local_irq_save(flags);
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDBREAKSTART;
+        schedule_timeout(duration);
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDBREAKSTOP;
+        local_irq_restore(flags);
+}
+
+static int mcfrs_tiocmget(struct tty_struct *tty, struct file *file)
+{
+        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_ioctl"))
+                return -ENODEV;
+        if (tty->flags & (1 << TTY_IO_ERROR))
+                return -EIO;
+
+        return mcfrs_getsignals(info);
+}
+
+static int mcfrs_tiocmset(struct tty_struct *tty, struct file *file,
+                          unsigned int set, unsigned int clear)
+{
+        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
+        int rts = -1, dtr = -1;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_ioctl"))
+                return -ENODEV;
+        if (tty->flags & (1 << TTY_IO_ERROR))
+                return -EIO;
+
+        if (set & TIOCM_RTS)
+                rts = 1;
+        if (set & TIOCM_DTR)
+                dtr = 1;
+        if (clear & TIOCM_RTS)
+                rts = 0;
+        if (clear & TIOCM_DTR)
+                dtr = 0;
+
+        mcfrs_setsignals(info, dtr, rts);
+
+        return 0;
+}
+
+static int mcfrs_ioctl(struct tty_struct *tty, struct file * file,
+                    unsigned int cmd, unsigned long arg)
+{
+        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
+        int retval, error;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_ioctl"))
+                return -ENODEV;
+
+        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
+            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD)  &&
+            (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
+                if (tty->flags & (1 << TTY_IO_ERROR))
+                    return -EIO;
+        }
+        
+        switch (cmd) {
+                case TCSBRK:    /* SVID version: non-zero arg --> no break */
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        if (!arg)
+                                send_break(info, HZ/4); /* 1/4 second */
+                        return 0;
+                case TCSBRKP:   /* support for POSIX tcsendbreak() */
+                        retval = tty_check_change(tty);
+                        if (retval)
+                                return retval;
+                        tty_wait_until_sent(tty, 0);
+                        send_break(info, arg ? arg*(HZ/10) : HZ/4);
+                        return 0;
+                case TIOCGSOFTCAR:
+                        error = put_user(C_CLOCAL(tty) ? 1 : 0,
+                                    (unsigned long *) arg);
+                        if (error)
+                                return error;
+                        return 0;
+                case TIOCSSOFTCAR:
+                        get_user(arg, (unsigned long *) arg);
+                        tty->termios->c_cflag =
+                                ((tty->termios->c_cflag & ~CLOCAL) |
+                                 (arg ? CLOCAL : 0));
+                        return 0;
+                case TIOCGSERIAL:
+                        if (access_ok(VERIFY_WRITE, (void *) arg,
+                                                sizeof(struct serial_struct)))
+                                return get_serial_info(info,
+                                               (struct serial_struct *) arg);
+                        return -EFAULT;
+                case TIOCSSERIAL:
+                        return set_serial_info(info,
+                                               (struct serial_struct *) arg);
+                case TIOCSERGETLSR: /* Get line status register */
+                        if (access_ok(VERIFY_WRITE, (void *) arg,
+                                                sizeof(unsigned int)))
+                                return get_lsr_info(info, (unsigned int *) arg);
+                        return -EFAULT;
+                case TIOCSERGSTRUCT:
+                        error = copy_to_user((struct mcf_serial *) arg,
+                                    info, sizeof(struct mcf_serial));
+                        if (error)
+                                return -EFAULT;
+                        return 0;
+                        
+#ifdef TIOCSET422
+                case TIOCSET422: {
+                        unsigned int val;
+                        get_user(val, (unsigned int *) arg);
+                        mcf_setpa(MCFPP_PA11, (val ? 0 : MCFPP_PA11));
+                        break;
+                }
+                case TIOCGET422: {
+                        unsigned int val;
+                        val = (mcf_getpa() & MCFPP_PA11) ? 0 : 1;
+                        put_user(val, (unsigned int *) arg);
+                        break;
+                }
+#endif
+
+                default:
+                        return -ENOIOCTLCMD;
+                }
+        return 0;
+}
+
+static void mcfrs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+{
+        struct mcf_serial *info = (struct mcf_serial *)tty->driver_data;
+
+        if (tty->termios->c_cflag == old_termios->c_cflag)
+                return;
+
+        mcfrs_change_speed(info);
+
+        if ((old_termios->c_cflag & CRTSCTS) &&
+            !(tty->termios->c_cflag & CRTSCTS)) {
+                tty->hw_stopped = 0;
+                mcfrs_setsignals(info, -1, 1);
+#if 0
+                mcfrs_start(tty);
+#endif
+        }
+}
+
+/*
+ * ------------------------------------------------------------
+ * mcfrs_close()
+ * 
+ * This routine is called when the serial port gets closed.  First, we
+ * wait for the last remaining data to be sent.  Then, we unlink its
+ * S structure from the interrupt chain if necessary, and we free
+ * that IRQ if nothing is left in the chain.
+ * ------------------------------------------------------------
+ */
+static void mcfrs_close(struct tty_struct *tty, struct file * filp)
+{
+        volatile unsigned char  *uartp;
+        struct mcf_serial       *info = (struct mcf_serial *)tty->driver_data;
+        unsigned long           flags;
+
+        if (!info || serial_paranoia_check(info, tty->name, "mcfrs_close"))
+                return;
+        
+        local_irq_save(flags);
+        
+        if (tty_hung_up_p(filp)) {
+                local_irq_restore(flags);
+                return;
+        }
+        
+#ifdef SERIAL_DEBUG_OPEN
+        printk("mcfrs_close ttyS%d, count = %d\n", info->line, info->count);
+#endif
+        if ((tty->count == 1) && (info->count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  Info->count should always
+                 * be one in these conditions.  If it's greater than
+                 * one, we've got real problems, since it means the
+                 * serial port won't be shutdown.
+                 */
+                printk("MCFRS: bad serial port count; tty->count is 1, "
+                       "info->count is %d\n", info->count);
+                info->count = 1;
+        }
+        if (--info->count < 0) {
+                printk("MCFRS: bad serial port count for ttyS%d: %d\n",
+                       info->line, info->count);
+                info->count = 0;
+        }
+        if (info->count) {
+                local_irq_restore(flags);
+                return;
+        }
+        info->flags |= ASYNC_CLOSING;
+
+        /*
+         * Now we wait for the transmit buffer to clear; and we notify 
+         * the line discipline to only process XON/XOFF characters.
+         */
+        tty->closing = 1;
+        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->closing_wait);
+
+        /*
+         * At this point we stop accepting input.  To do this, we
+         * disable the receive line status interrupts, and tell the
+         * interrupt driver to stop checking the data ready bit in the
+         * line status register.
+         */
+        info->imr &= ~MCFUART_UIR_RXREADY;
+        uartp = info->addr;
+        uartp[MCFUART_UIMR] = info->imr;
+
+#if 0
+        /* FIXME: do we need to keep this enabled for console?? */
+        if (mcfrs_console_inited && (mcfrs_console_port == info->line)) {
+                /* Do not disable the UART */ ;
+        } else
+#endif
+        shutdown(info);
+        if (tty->driver->flush_buffer)
+                tty->driver->flush_buffer(tty);
+        tty_ldisc_flush(tty);
+        
+        tty->closing = 0;
+        info->event = 0;
+        info->tty = 0;
+#if 0   
+        if (tty->ldisc.num != ldiscs[N_TTY].num) {
+                if (tty->ldisc.close)
+                        (tty->ldisc.close)(tty);
+                tty->ldisc = ldiscs[N_TTY];
+                tty->termios->c_line = N_TTY;
+                if (tty->ldisc.open)
+                        (tty->ldisc.open)(tty);
+        }
+#endif  
+        if (info->blocked_open) {
+                if (info->close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+                }
+                wake_up_interruptible(&info->open_wait);
+        }
+        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&info->close_wait);
+        local_irq_restore(flags);
+}
+
+/*
+ * mcfrs_wait_until_sent() --- wait until the transmitter is empty
+ */
+static void
+mcfrs_wait_until_sent(struct tty_struct *tty, int timeout)
+{
+#ifdef  CONFIG_M5272
+#define MCF5272_FIFO_SIZE       25              /* fifo size + shift reg */
+
+        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
+        volatile unsigned char *uartp;
+        unsigned long orig_jiffies, fifo_time, char_time, fifo_cnt;
+
+        if (serial_paranoia_check(info, tty->name, "mcfrs_wait_until_sent"))
+                return;
+
+        orig_jiffies = jiffies;
+
+        /*
+         * Set the check interval to be 1/5 of the approximate time
+         * to send the entire fifo, and make it at least 1.  The check
+         * interval should also be less than the timeout.
+         *
+         * Note: we have to use pretty tight timings here to satisfy
+         * the NIST-PCTS.
+         */
+        fifo_time = (MCF5272_FIFO_SIZE * HZ * 10) / info->baud;
+        char_time = fifo_time / 5;
+        if (char_time == 0)
+                char_time = 1;
+        if (timeout && timeout < char_time)
+                char_time = timeout;
+
+        /*
+         * Clamp the timeout period at 2 * the time to empty the
+         * fifo.  Just to be safe, set the minimum at .5 seconds.
+         */
+        fifo_time *= 2;
+        if (fifo_time < (HZ/2))
+                fifo_time = HZ/2;
+        if (!timeout || timeout > fifo_time)
+                timeout = fifo_time;
+
+        /*
+         * Account for the number of bytes in the UART
+         * transmitter FIFO plus any byte being shifted out.
+         */
+        uartp = (volatile unsigned char *) info->addr;
+        for (;;) {
+                fifo_cnt = (uartp[MCFUART_UTF] & MCFUART_UTF_TXB);
+                if ((uartp[MCFUART_USR] & (MCFUART_USR_TXREADY|
+                                MCFUART_USR_TXEMPTY)) ==
+                        MCFUART_USR_TXREADY)
+                        fifo_cnt++;
+                if (fifo_cnt == 0)
+                        break;
+                msleep_interruptible(jiffies_to_msecs(char_time));
+                if (signal_pending(current))
+                        break;
+                if (timeout && time_after(jiffies, orig_jiffies + timeout))
+                        break;
+        }
+#else
+        /*
+         * For the other coldfire models, assume all data has been sent
+         */
+#endif
+}
+
+/*
+ * mcfrs_hangup() --- called by tty_hangup() when a hangup is signaled.
+ */
+void mcfrs_hangup(struct tty_struct *tty)
+{
+        struct mcf_serial * info = (struct mcf_serial *)tty->driver_data;
+        
+        if (serial_paranoia_check(info, tty->name, "mcfrs_hangup"))
+                return;
+        
+        mcfrs_flush_buffer(tty);
+        shutdown(info);
+        info->event = 0;
+        info->count = 0;
+        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->tty = 0;
+        wake_up_interruptible(&info->open_wait);
+}
+
+/*
+ * ------------------------------------------------------------
+ * mcfrs_open() and friends
+ * ------------------------------------------------------------
+ */
+static int block_til_ready(struct tty_struct *tty, struct file * filp,
+                           struct mcf_serial *info)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        int     retval;
+        int     do_clocal = 0;
+
+        /*
+         * If the device is in the middle of being closed, then block
+         * until it's done, and then try again.
+         */
+        if (info->flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&info->close_wait);
+#ifdef SERIAL_DO_RESTART
+                if (info->flags & ASYNC_HUP_NOTIFY)
+                        return -EAGAIN;
+                else
+                        return -ERESTARTSYS;
+#else
+                return -EAGAIN;
+#endif
+        }
+        
+        /*
+         * If non-blocking mode is set, or the port is not enabled,
+         * then make the check up front and then exit.
+         */
+        if ((filp->f_flags & O_NONBLOCK) ||
+            (tty->flags & (1 << TTY_IO_ERROR))) {
+                info->flags |= ASYNC_NORMAL_ACTIVE;
+                return 0;
+        }
+
+        if (tty->termios->c_cflag & CLOCAL)
+                do_clocal = 1;
+
+        /*
+         * Block waiting for the carrier detect and the line to become
+         * free (i.e., not in use by the callout).  While we are in
+         * this loop, info->count is dropped by one, so that
+         * mcfrs_close() knows when to free things.  We restore it upon
+         * exit, either normal or abnormal.
+         */
+        retval = 0;
+        add_wait_queue(&info->open_wait, &wait);
+#ifdef SERIAL_DEBUG_OPEN
+        printk("block_til_ready before block: ttyS%d, count = %d\n",
+               info->line, info->count);
+#endif
+        info->count--;
+        info->blocked_open++;
+        while (1) {
+                local_irq_disable();
+                mcfrs_setsignals(info, 1, 1);
+                local_irq_enable();
+                current->state = TASK_INTERRUPTIBLE;
+                if (tty_hung_up_p(filp) ||
+                    !(info->flags & ASYNC_INITIALIZED)) {
+#ifdef SERIAL_DO_RESTART
+                        if (info->flags & ASYNC_HUP_NOTIFY)
+                                retval = -EAGAIN;
+                        else
+                                retval = -ERESTARTSYS;  
+#else
+                        retval = -EAGAIN;
+#endif
+                        break;
+                }
+                if (!(info->flags & ASYNC_CLOSING) &&
+                    (do_clocal || (mcfrs_getsignals(info) & TIOCM_CD)))
+                        break;
+                if (signal_pending(current)) {
+                        retval = -ERESTARTSYS;
+                        break;
+                }
+#ifdef SERIAL_DEBUG_OPEN
+                printk("block_til_ready blocking: ttyS%d, count = %d\n",
+                       info->line, info->count);
+#endif
+                schedule();
+        }
+        current->state = TASK_RUNNING;
+        remove_wait_queue(&info->open_wait, &wait);
+        if (!tty_hung_up_p(filp))
+                info->count++;
+        info->blocked_open--;
+#ifdef SERIAL_DEBUG_OPEN
+        printk("block_til_ready after blocking: ttyS%d, count = %d\n",
+               info->line, info->count);
+#endif
+        if (retval)
+                return retval;
+        info->flags |= ASYNC_NORMAL_ACTIVE;
+        return 0;
+}       
+
+/*
+ * This routine is called whenever a serial port is opened. It
+ * enables interrupts for a serial port, linking in its structure into
+ * the IRQ chain.   It also performs the serial-specific
+ * initialization for the tty structure.
+ */
+int mcfrs_open(struct tty_struct *tty, struct file * filp)
+{
+        struct mcf_serial       *info;
+        int                     retval, line;
+
+        line = tty->index;
+        if ((line < 0) || (line >= NR_PORTS))
+                return -ENODEV;
+        info = mcfrs_table + line;
+        if (serial_paranoia_check(info, tty->name, "mcfrs_open"))
+                return -ENODEV;
+#ifdef SERIAL_DEBUG_OPEN
+        printk("mcfrs_open %s, count = %d\n", tty->name, info->count);
+#endif
+        info->count++;
+        tty->driver_data = info;
+        info->tty = tty;
+
+        /*
+         * Start up serial port
+         */
+        retval = startup(info);
+        if (retval)
+                return retval;
+
+        retval = block_til_ready(tty, filp, info);
+        if (retval) {
+#ifdef SERIAL_DEBUG_OPEN
+                printk("mcfrs_open returning after block_til_ready with %d\n",
+                       retval);
+#endif
+                return retval;
+        }
+
+#ifdef SERIAL_DEBUG_OPEN
+        printk("mcfrs_open %s successful...\n", tty->name);
+#endif
+        return 0;
+}
+
+/*
+ *      Based on the line number set up the internal interrupt stuff.
+ */
+static void mcfrs_irqinit(struct mcf_serial *info)
+{
+#if defined(CONFIG_M5272)
+        volatile unsigned long  *icrp;
+        volatile unsigned long  *portp;
+        volatile unsigned char  *uartp;
+
+        uartp = info->addr;
+        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR2);
+
+        switch (info->line) {
+        case 0:
+                *icrp = 0xe0000000;
+                break;
+        case 1:
+                *icrp = 0x0e000000;
+                break;
+        default:
+                printk("MCFRS: don't know how to handle UART %d interrupt?\n",
+                        info->line);
+                return;
+        }
+
+        /* Enable the output lines for the serial ports */
+        portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PBCNT);
+        *portp = (*portp & ~0x000000ff) | 0x00000055;
+        portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT);
+        *portp = (*portp & ~0x000003fc) | 0x000002a8;
+#elif defined(CONFIG_M527x) || defined(CONFIG_M528x)
+        volatile unsigned char *icrp, *uartp;
+        volatile unsigned long *imrp;
+
+        uartp = info->addr;
+
+        icrp = (volatile unsigned char *) (MCF_MBAR + MCFICM_INTC0 +
+                MCFINTC_ICR0 + MCFINT_UART0 + info->line);
+        *icrp = 0x33; /* UART0 with level 6, priority 3 */
+
+        imrp = (volatile unsigned long *) (MCF_MBAR + MCFICM_INTC0 +
+                MCFINTC_IMRL);
+        *imrp &= ~((1 << (info->irq - MCFINT_VECBASE)) | 1);
+#else
+        volatile unsigned char  *icrp, *uartp;
+
+        switch (info->line) {
+        case 0:
+                icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_UART1ICR);
+                *icrp = /*MCFSIM_ICR_AUTOVEC |*/ MCFSIM_ICR_LEVEL6 |
+                        MCFSIM_ICR_PRI1;
+                mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
+                break;
+        case 1:
+                icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_UART2ICR);
+                *icrp = /*MCFSIM_ICR_AUTOVEC |*/ MCFSIM_ICR_LEVEL6 |
+                        MCFSIM_ICR_PRI2;
+                mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
+                break;
+        default:
+                printk("MCFRS: don't know how to handle UART %d interrupt?\n",
+                        info->line);
+                return;
+        }
+
+        uartp = info->addr;
+        uartp[MCFUART_UIVR] = info->irq;
+#endif
+
+        /* Clear mask, so no surprise interrupts. */
+        uartp[MCFUART_UIMR] = 0;
+
+        if (request_irq(info->irq, mcfrs_interrupt, SA_INTERRUPT,
+            "ColdFire UART", NULL)) {
+                printk("MCFRS: Unable to attach ColdFire UART %d interrupt "
+                        "vector=%d\n", info->line, info->irq);
+        }
+
+        return;
+}
+
+
+char *mcfrs_drivername = "ColdFire internal UART serial driver version 1.00\n";
+
+
+/*
+ * Serial stats reporting...
+ */
+int mcfrs_readproc(char *page, char **start, off_t off, int count,
+                         int *eof, void *data)
+{
+        struct mcf_serial       *info;
+        char                    str[20];
+        int                     len, sigs, i;
+
+        len = sprintf(page, mcfrs_drivername);
+        for (i = 0; (i < NR_PORTS); i++) {
+                info = &mcfrs_table[i];
+                len += sprintf((page + len), "%d: port:%x irq=%d baud:%d ",
+                        i, (unsigned int) info->addr, info->irq, info->baud);
+                if (info->stats.rx || info->stats.tx)
+                        len += sprintf((page + len), "tx:%d rx:%d ",
+                        info->stats.tx, info->stats.rx);
+                if (info->stats.rxframing)
+                        len += sprintf((page + len), "fe:%d ",
+                        info->stats.rxframing);
+                if (info->stats.rxparity)
+                        len += sprintf((page + len), "pe:%d ",
+                        info->stats.rxparity);
+                if (info->stats.rxbreak)
+                        len += sprintf((page + len), "brk:%d ",
+                        info->stats.rxbreak);
+                if (info->stats.rxoverrun)
+                        len += sprintf((page + len), "oe:%d ",
+                        info->stats.rxoverrun);
+
+                str[0] = str[1] = 0;
+                if ((sigs = mcfrs_getsignals(info))) {
+                        if (sigs & TIOCM_RTS)
+                                strcat(str, "|RTS");
+                        if (sigs & TIOCM_CTS)
+                                strcat(str, "|CTS");
+                        if (sigs & TIOCM_DTR)
+                                strcat(str, "|DTR");
+                        if (sigs & TIOCM_CD)
+                                strcat(str, "|CD");
+                }
+
+                len += sprintf((page + len), "%s\n", &str[1]);
+        }
+
+        return(len);
+}
+
+
+/* Finally, routines used to initialize the serial driver. */
+
+static void show_serial_version(void)
+{
+        printk(mcfrs_drivername);
+}
+
+static struct tty_operations mcfrs_ops = {
+        .open = mcfrs_open,
+        .close = mcfrs_close,
+        .write = mcfrs_write,
+        .flush_chars = mcfrs_flush_chars,
+        .write_room = mcfrs_write_room,
+        .chars_in_buffer = mcfrs_chars_in_buffer,
+        .flush_buffer = mcfrs_flush_buffer,
+        .ioctl = mcfrs_ioctl,
+        .throttle = mcfrs_throttle,
+        .unthrottle = mcfrs_unthrottle,
+        .set_termios = mcfrs_set_termios,
+        .stop = mcfrs_stop,
+        .start = mcfrs_start,
+        .hangup = mcfrs_hangup,
+        .read_proc = mcfrs_readproc,
+        .wait_until_sent = mcfrs_wait_until_sent,
+        .tiocmget = mcfrs_tiocmget,
+        .tiocmset = mcfrs_tiocmset,
+};
+
+/* mcfrs_init inits the driver */
+static int __init
+mcfrs_init(void)
+{
+        struct mcf_serial       *info;
+        unsigned long           flags;
+        int                     i;
+
+        /* Setup base handler, and timer table. */
+#ifdef MCFPP_DCD0
+        init_timer(&mcfrs_timer_struct);
+        mcfrs_timer_struct.function = mcfrs_timer;
+        mcfrs_timer_struct.data = 0;
+        mcfrs_timer_struct.expires = jiffies + HZ/25;
+        add_timer(&mcfrs_timer_struct);
+        mcfrs_ppstatus = mcf_getppdata() & (MCFPP_DCD0 | MCFPP_DCD1);
+#endif
+        mcfrs_serial_driver = alloc_tty_driver(NR_PORTS);
+        if (!mcfrs_serial_driver)
+                return -ENOMEM;
+
+        show_serial_version();
+
+        /* Initialize the tty_driver structure */
+        mcfrs_serial_driver->owner = THIS_MODULE;
+        mcfrs_serial_driver->name = "ttyS";
+        mcfrs_serial_driver->devfs_name = "ttys/";
+        mcfrs_serial_driver->driver_name = "serial";
+        mcfrs_serial_driver->major = TTY_MAJOR;
+        mcfrs_serial_driver->minor_start = 64;
+        mcfrs_serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        mcfrs_serial_driver->subtype = SERIAL_TYPE_NORMAL;
+        mcfrs_serial_driver->init_termios = tty_std_termios;
+
+        mcfrs_serial_driver->init_termios.c_cflag =
+                mcfrs_console_cbaud | CS8 | CREAD | HUPCL | CLOCAL;
+        mcfrs_serial_driver->flags = TTY_DRIVER_REAL_RAW;
+
+        tty_set_operations(mcfrs_serial_driver, &mcfrs_ops);
+
+        if (tty_register_driver(mcfrs_serial_driver)) {
+                printk("MCFRS: Couldn't register serial driver\n");
+                put_tty_driver(mcfrs_serial_driver);
+                return(-EBUSY);
+        }
+
+        local_irq_save(flags);
+
+        /*
+         *      Configure all the attached serial ports.
+         */
+        for (i = 0, info = mcfrs_table; (i < NR_PORTS); i++, info++) {
+                info->magic = SERIAL_MAGIC;
+                info->line = i;
+                info->tty = 0;
+                info->custom_divisor = 16;
+                info->close_delay = 50;
+                info->closing_wait = 3000;
+                info->x_char = 0;
+                info->event = 0;
+                info->count = 0;
+                info->blocked_open = 0;
+                INIT_WORK(&info->tqueue, mcfrs_offintr, info);
+                INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);
+                init_waitqueue_head(&info->open_wait);
+                init_waitqueue_head(&info->close_wait);
+
+                info->imr = 0;
+                mcfrs_setsignals(info, 0, 0);
+                mcfrs_irqinit(info);
+
+                printk("ttyS%d at 0x%04x (irq = %d)", info->line,
+                        (unsigned int) info->addr, info->irq);
+                printk(" is a builtin ColdFire UART\n");
+        }
+
+        local_irq_restore(flags);
+        return 0;
+}
+
+module_init(mcfrs_init);
+
+/****************************************************************************/
+/*                          Serial Console                                  */
+/****************************************************************************/
+
+/*
+ *      Quick and dirty UART initialization, for console output.
+ */
+
+void mcfrs_init_console(void)
+{
+        volatile unsigned char  *uartp;
+        unsigned int            clk;
+
+        /*
+         *      Reset UART, get it into known state...
+         */
+        uartp = (volatile unsigned char *) (MCF_MBAR +
+                (mcfrs_console_port ? MCFUART_BASE2 : MCFUART_BASE1));
+
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
+        uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETMRPTR;  /* reset MR pointer */
+
+        /*
+         * Set port for defined baud , 8 data bits, 1 stop bit, no parity.
+         */
+        uartp[MCFUART_UMR] = MCFUART_MR1_PARITYNONE | MCFUART_MR1_CS8;
+        uartp[MCFUART_UMR] = MCFUART_MR2_STOP1;
+
+        clk = ((MCF_BUSCLK / mcfrs_console_baud) + 16) / 32; /* set baud */
+        uartp[MCFUART_UBG1] = (clk & 0xff00) >> 8;  /* set msb baud */
+        uartp[MCFUART_UBG2] = (clk & 0xff);  /* set lsb baud */
+
+        uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;
+        uartp[MCFUART_UCR] = MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE;
+
+        mcfrs_console_inited++;
+        return;
+}
+
+
+/*
+ *      Setup for console. Argument comes from the boot command line.
+ */
+
+int mcfrs_console_setup(struct console *cp, char *arg)
+{
+        int             i, n = CONSOLE_BAUD_RATE;
+
+        if (!cp)
+                return(-1);
+
+        if (!strncmp(cp->name, "ttyS", 4))
+                mcfrs_console_port = cp->index;
+        else if (!strncmp(cp->name, "cua", 3))
+                mcfrs_console_port = cp->index;
+        else
+                return(-1);
+
+        if (arg)
+                n = simple_strtoul(arg,NULL,0);
+        for (i = 0; i < MCFRS_BAUD_TABLE_SIZE; i++)
+                if (mcfrs_baud_table[i] == n)
+                        break;
+        if (i < MCFRS_BAUD_TABLE_SIZE) {
+                mcfrs_console_baud = n;
+                mcfrs_console_cbaud = 0;
+                if (i > 15) {
+                        mcfrs_console_cbaud |= CBAUDEX;
+                        i -= 15;
+                }
+                mcfrs_console_cbaud |= i;
+        }
+        mcfrs_init_console(); /* make sure baud rate changes */
+        return(0);
+}
+
+
+static struct tty_driver *mcfrs_console_device(struct console *c, int *index)
+{
+        *index = c->index;
+        return mcfrs_serial_driver;
+}
+
+
+/*
+ *      Output a single character, using UART polled mode.
+ *      This is used for console output.
+ */
+
+void mcfrs_put_char(char ch)
+{
+        volatile unsigned char  *uartp;
+        unsigned long           flags;
+        int                     i;
+
+        uartp = (volatile unsigned char *) (MCF_MBAR +
+                (mcfrs_console_port ? MCFUART_BASE2 : MCFUART_BASE1));
+
+        local_irq_save(flags);
+        for (i = 0; (i < 0x10000); i++) {
+                if (uartp[MCFUART_USR] & MCFUART_USR_TXREADY)
+                        break;
+        }
+        if (i < 0x10000) {
+                uartp[MCFUART_UTB] = ch;
+                for (i = 0; (i < 0x10000); i++)
+                        if (uartp[MCFUART_USR] & MCFUART_USR_TXEMPTY)
+                                break;
+        }
+        if (i >= 0x10000)
+                mcfrs_init_console(); /* try and get it back */
+        local_irq_restore(flags);
+
+        return;
+}
+
+
+/*
+ * rs_console_write is registered for printk output.
+ */
+
+void mcfrs_console_write(struct console *cp, const char *p, unsigned len)
+{
+        if (!mcfrs_console_inited)
+                mcfrs_init_console();
+        while (len-- > 0) {
+                if (*p == '\n')
+                        mcfrs_put_char('\r');
+                mcfrs_put_char(*p++);
+        }
+}
+
+/*
+ * declare our consoles
+ */
+
+struct console mcfrs_console = {
+        .name           = "ttyS",
+        .write          = mcfrs_console_write,
+        .device         = mcfrs_console_device,
+        .setup          = mcfrs_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+};
+
+static int __init mcfrs_console_init(void)
+{
+        register_console(&mcfrs_console);
+        return 0;
+}
+
+console_initcall(mcfrs_console_init);
+
+/****************************************************************************/
diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h
new file mode 100644
index 000000000000..a2b28e8629f9
--- /dev/null
+++ b/drivers/serial/mcfserial.h
@@ -0,0 +1,75 @@
+/*
+ * mcfserial.c -- serial driver for ColdFire internal UARTS.
+ *
+ * Copyright (c) 1999 Greg Ungerer <gerg@snapgear.com>
+ * Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com>
+ * Copyright (c) 2002 SnapGear Inc., <www.snapgear.com>
+ *
+ * Based on code from 68332serial.c which was:
+ *
+ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1998 TSHG
+ * Copyright (c) 1999 Rt-Control Inc. <jeff@uclinux.org>
+ */ 
+#ifndef _MCF_SERIAL_H
+#define _MCF_SERIAL_H
+
+#include <linux/config.h>
+#include <linux/serial.h>
+
+#ifdef __KERNEL__
+
+/*
+ *      Define a local serial stats structure.
+ */
+
+struct mcf_stats {
+        unsigned int    rx;
+        unsigned int    tx;
+        unsigned int    rxbreak;
+        unsigned int    rxframing;
+        unsigned int    rxparity;
+        unsigned int    rxoverrun;
+};
+
+
+/*
+ * This is our internal structure for each serial port's state.
+ * Each serial port has one of these structures associated with it.
+ */
+
+struct mcf_serial {
+        int                     magic;
+        volatile unsigned char  *addr;          /* UART memory address */
+        int                     irq;
+        int                     flags;          /* defined in tty.h */
+        int                     type;           /* UART type */
+        struct tty_struct       *tty;
+        unsigned char           imr;            /* Software imr register */
+        unsigned int            baud;
+        int                     sigs;
+        int                     custom_divisor;
+        int                     x_char; /* xon/xoff character */
+        int                     baud_base;
+        int                     close_delay;
+        unsigned short          closing_wait;
+        unsigned short          closing_wait2;
+        unsigned long           event;
+        int                     line;
+        int                     count;      /* # of fd on device */
+        int                     blocked_open; /* # of blocked opens */
+        unsigned char           *xmit_buf;
+        int                     xmit_head;
+        int                     xmit_tail;
+        int                     xmit_cnt;
+        struct mcf_stats        stats;
+        struct work_struct      tqueue;
+        struct work_struct      tqueue_hangup;
+        wait_queue_head_t       open_wait;
+        wait_queue_head_t       close_wait;
+
+};
+
+#endif /* __KERNEL__ */
+
+#endif /* _MCF_SERIAL_H */
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
new file mode 100644
index 000000000000..2a5cf174ca30
--- /dev/null
+++ b/drivers/serial/mpc52xx_uart.c
@@ -0,0 +1,852 @@
+/*
+ * drivers/serial/mpc52xx_uart.c
+ *
+ * Driver for the PSC of the Freescale MPC52xx PSCs configured as UARTs.
+ *
+ * FIXME According to the usermanual the status bits in the status register
+ * are only updated when the peripherals access the FIFO and not when the
+ * CPU access them. So since we use this bits to know when we stop writing
+ * and reading, they may not be updated in-time and a race condition may
+ * exists. But I haven't be able to prove this and I don't care. But if
+ * any problem arises, it might worth checking. The TX/RX FIFO Stats
+ * registers should be used in addition.
+ * Update: Actually, they seem updated ... At least the bits we use.
+ *
+ *
+ * Maintainer : Sylvain Munaut <tnt@246tNt.com>
+ * 
+ * Some of the code has been inspired/copied from the 2.4 code written
+ * by Dale Farnsworth <dfarnsworth@mvista.com>.
+ * 
+ * Copyright (C) 2004-2005 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2003 MontaVista, Software, Inc.
+ * 
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+ 
+/* Platform device Usage :
+ *
+ * Since PSCs can have multiple function, the correct driver for each one
+ * is selected by calling mpc52xx_match_psc_function(...). The function
+ * handled by this driver is "uart".
+ *
+ * The driver init all necessary registers to place the PSC in uart mode without
+ * DCD. However, the pin multiplexing aren't changed and should be set either
+ * by the bootloader or in the platform init code.
+ *
+ * The idx field must be equal to the PSC index ( e.g. 0 for PSC1, 1 for PSC2,
+ * and so on). So the PSC1 is mapped to /dev/ttyS0, PSC2 to /dev/ttyS1 and so
+ * on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly for
+ * the console code : without this 1:1 mapping, at early boot time, when we are
+ * parsing the kernel args console=ttyS?, we wouldn't know wich PSC it will be
+ * mapped to.
+ */
+
+#include <linux/config.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+
+#include <asm/delay.h>
+#include <asm/io.h>
+
+#include <asm/mpc52xx.h>
+#include <asm/mpc52xx_psc.h>
+
+#if defined(CONFIG_SERIAL_MPC52xx_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+
+
+#define ISR_PASS_LIMIT 256      /* Max number of iteration in the interrupt */
+
+
+static struct uart_port mpc52xx_uart_ports[MPC52xx_PSC_MAXNUM];
+        /* Rem: - We use the read_status_mask as a shadow of
+         *        psc->mpc52xx_psc_imr
+         *      - It's important that is array is all zero on start as we
+         *        use it to know if it's initialized or not ! If it's not sure
+         *        it's cleared, then a memset(...,0,...) should be added to
+         *        the console_init
+         */
+
+#define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
+
+
+/* Forward declaration of the interruption handling routine */
+static irqreturn_t mpc52xx_uart_int(int irq,void *dev_id,struct pt_regs *regs);
+
+
+/* Simple macro to test if a port is console or not. This one is taken
+ * for serial_core.c and maybe should be moved to serial_core.h ? */
+#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#define uart_console(port)      ((port)->cons && (port)->cons->index == (port)->line)
+#else
+#define uart_console(port)      (0)
+#endif
+
+
+/* ======================================================================== */
+/* UART operations                                                          */
+/* ======================================================================== */
+
+static unsigned int 
+mpc52xx_uart_tx_empty(struct uart_port *port)
+{
+        int status = in_be16(&PSC(port)->mpc52xx_psc_status);
+        return (status & MPC52xx_PSC_SR_TXEMP) ? TIOCSER_TEMT : 0;
+}
+
+static void 
+mpc52xx_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        /* Not implemented */
+}
+
+static unsigned int 
+mpc52xx_uart_get_mctrl(struct uart_port *port)
+{
+        /* Not implemented */
+        return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+}
+
+static void 
+mpc52xx_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        /* port->lock taken by caller */
+        port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
+        out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
+}
+
+static void 
+mpc52xx_uart_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        /* port->lock taken by caller */
+        port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
+        out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
+}
+
+static void 
+mpc52xx_uart_send_xchar(struct uart_port *port, char ch)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&port->lock, flags);
+        
+        port->x_char = ch;
+        if (ch) {
+                /* Make sure tx interrupts are on */
+                /* Truly necessary ??? They should be anyway */
+                port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
+                out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
+        }
+        
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void
+mpc52xx_uart_stop_rx(struct uart_port *port)
+{
+        /* port->lock taken by caller */
+        port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;
+        out_be16(&PSC(port)->mpc52xx_psc_imr,port->read_status_mask);
+}
+
+static void
+mpc52xx_uart_enable_ms(struct uart_port *port)
+{
+        /* Not implemented */
+}
+
+static void
+mpc52xx_uart_break_ctl(struct uart_port *port, int ctl)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&port->lock, flags);
+
+        if ( ctl == -1 )
+                out_8(&PSC(port)->command,MPC52xx_PSC_START_BRK);
+        else
+                out_8(&PSC(port)->command,MPC52xx_PSC_STOP_BRK);
+        
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int
+mpc52xx_uart_startup(struct uart_port *port)
+{
+        struct mpc52xx_psc __iomem *psc = PSC(port);
+        int ret;
+
+        /* Request IRQ */
+        ret = request_irq(port->irq, mpc52xx_uart_int,
+                SA_INTERRUPT | SA_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
+        if (ret)
+                return ret;
+
+        /* Reset/activate the port, clear and enable interrupts */
+        out_8(&psc->command,MPC52xx_PSC_RST_RX);
+        out_8(&psc->command,MPC52xx_PSC_RST_TX);
+        
+        out_be32(&psc->sicr,0); /* UART mode DCD ignored */
+
+        out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00); /* /16 prescaler on */
+        
+        out_8(&psc->rfcntl, 0x00);
+        out_be16(&psc->rfalarm, 0x1ff);
+        out_8(&psc->tfcntl, 0x07);
+        out_be16(&psc->tfalarm, 0x80);
+
+        port->read_status_mask |= MPC52xx_PSC_IMR_RXRDY | MPC52xx_PSC_IMR_TXRDY;
+        out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
+        
+        out_8(&psc->command,MPC52xx_PSC_TX_ENABLE);
+        out_8(&psc->command,MPC52xx_PSC_RX_ENABLE);
+                
+        return 0;
+}
+
+static void
+mpc52xx_uart_shutdown(struct uart_port *port)
+{
+        struct mpc52xx_psc __iomem *psc = PSC(port);
+        
+        /* Shut down the port, interrupt and all */
+        out_8(&psc->command,MPC52xx_PSC_RST_RX);
+        out_8(&psc->command,MPC52xx_PSC_RST_TX);
+        
+        port->read_status_mask = 0; 
+        out_be16(&psc->mpc52xx_psc_imr,port->read_status_mask);
+
+        /* Release interrupt */
+        free_irq(port->irq, port);
+}
+
+static void 
+mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
+                         struct termios *old)
+{
+        struct mpc52xx_psc __iomem *psc = PSC(port);
+        unsigned long flags;
+        unsigned char mr1, mr2;
+        unsigned short ctr;
+        unsigned int j, baud, quot;
+        
+        /* Prepare what we're gonna write */
+        mr1 = 0;
+        
+        switch (new->c_cflag & CSIZE) {
+                case CS5:       mr1 |= MPC52xx_PSC_MODE_5_BITS;
+                                break;
+                case CS6:       mr1 |= MPC52xx_PSC_MODE_6_BITS;
+                                break;
+                case CS7:       mr1 |= MPC52xx_PSC_MODE_7_BITS;
+                                break;
+                case CS8:
+                default:        mr1 |= MPC52xx_PSC_MODE_8_BITS;
+        }
+
+        if (new->c_cflag & PARENB) {
+                mr1 |= (new->c_cflag & PARODD) ?
+                        MPC52xx_PSC_MODE_PARODD : MPC52xx_PSC_MODE_PAREVEN;
+        } else
+                mr1 |= MPC52xx_PSC_MODE_PARNONE;
+        
+        
+        mr2 = 0;
+
+        if (new->c_cflag & CSTOPB)
+                mr2 |= MPC52xx_PSC_MODE_TWO_STOP;
+        else
+                mr2 |= ((new->c_cflag & CSIZE) == CS5) ?
+                        MPC52xx_PSC_MODE_ONE_STOP_5_BITS :
+                        MPC52xx_PSC_MODE_ONE_STOP;
+
+
+        baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+        ctr = quot & 0xffff;
+        
+        /* Get the lock */
+        spin_lock_irqsave(&port->lock, flags);
+
+        /* Update the per-port timeout */
+        uart_update_timeout(port, new->c_cflag, baud);
+
+        /* Do our best to flush TX & RX, so we don't loose anything */
+        /* But we don't wait indefinitly ! */
+        j = 5000000;    /* Maximum wait */
+        /* FIXME Can't receive chars since set_termios might be called at early
+         * boot for the console, all stuff is not yet ready to receive at that
+         * time and that just makes the kernel oops */
+        /* while (j-- && mpc52xx_uart_int_rx_chars(port)); */
+        while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) && 
+               --j)
+                udelay(1);
+
+        if (!j)
+                printk( KERN_ERR "mpc52xx_uart.c: "
+                        "Unable to flush RX & TX fifos in-time in set_termios."
+                        "Some chars may have been lost.\n" ); 
+
+        /* Reset the TX & RX */
+        out_8(&psc->command,MPC52xx_PSC_RST_RX);
+        out_8(&psc->command,MPC52xx_PSC_RST_TX);
+
+        /* Send new mode settings */
+        out_8(&psc->command,MPC52xx_PSC_SEL_MODE_REG_1);
+        out_8(&psc->mode,mr1);
+        out_8(&psc->mode,mr2);
+        out_8(&psc->ctur,ctr >> 8);
+        out_8(&psc->ctlr,ctr & 0xff);
+        
+        /* Reenable TX & RX */
+        out_8(&psc->command,MPC52xx_PSC_TX_ENABLE);
+        out_8(&psc->command,MPC52xx_PSC_RX_ENABLE);
+
+        /* We're all set, release the lock */
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *
+mpc52xx_uart_type(struct uart_port *port)
+{
+        return port->type == PORT_MPC52xx ? "MPC52xx PSC" : NULL;
+}
+
+static void
+mpc52xx_uart_release_port(struct uart_port *port)
+{
+        if (port->flags & UPF_IOREMAP) { /* remapped by us ? */
+                iounmap(port->membase);
+                port->membase = NULL;
+        }
+
+        release_mem_region(port->mapbase, MPC52xx_PSC_SIZE);
+}
+
+static int
+mpc52xx_uart_request_port(struct uart_port *port)
+{
+        if (port->flags & UPF_IOREMAP) /* Need to remap ? */
+                port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE);
+
+        if (!port->membase)
+                return -EINVAL;
+
+        return request_mem_region(port->mapbase, MPC52xx_PSC_SIZE,
+                        "mpc52xx_psc_uart") != NULL ? 0 : -EBUSY;
+}
+
+static void
+mpc52xx_uart_config_port(struct uart_port *port, int flags)
+{
+        if ( (flags & UART_CONFIG_TYPE) &&
+             (mpc52xx_uart_request_port(port) == 0) )
+                port->type = PORT_MPC52xx;
+}
+
+static int
+mpc52xx_uart_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        if ( ser->type != PORT_UNKNOWN && ser->type != PORT_MPC52xx )
+                return -EINVAL;
+
+        if ( (ser->irq != port->irq) ||
+             (ser->io_type != SERIAL_IO_MEM) ||
+             (ser->baud_base != port->uartclk)  || 
+             (ser->iomem_base != (void*)port->mapbase) ||
+             (ser->hub6 != 0 ) )
+                return -EINVAL;
+
+        return 0;
+}
+
+
+static struct uart_ops mpc52xx_uart_ops = {
+        .tx_empty       = mpc52xx_uart_tx_empty,
+        .set_mctrl      = mpc52xx_uart_set_mctrl,
+        .get_mctrl      = mpc52xx_uart_get_mctrl,
+        .stop_tx        = mpc52xx_uart_stop_tx,
+        .start_tx       = mpc52xx_uart_start_tx,
+        .send_xchar     = mpc52xx_uart_send_xchar,
+        .stop_rx        = mpc52xx_uart_stop_rx,
+        .enable_ms      = mpc52xx_uart_enable_ms,
+        .break_ctl      = mpc52xx_uart_break_ctl,
+        .startup        = mpc52xx_uart_startup,
+        .shutdown       = mpc52xx_uart_shutdown,
+        .set_termios    = mpc52xx_uart_set_termios,
+/*      .pm             = mpc52xx_uart_pm,              Not supported yet */
+/*      .set_wake       = mpc52xx_uart_set_wake,        Not supported yet */
+        .type           = mpc52xx_uart_type,
+        .release_port   = mpc52xx_uart_release_port,
+        .request_port   = mpc52xx_uart_request_port,
+        .config_port    = mpc52xx_uart_config_port,
+        .verify_port    = mpc52xx_uart_verify_port
+};
+
+        
+/* ======================================================================== */
+/* Interrupt handling                                                       */
+/* ======================================================================== */
+        
+static inline int
+mpc52xx_uart_int_rx_chars(struct uart_port *port, struct pt_regs *regs)
+{
+        struct tty_struct *tty = port->info->tty;
+        unsigned char ch;
+        unsigned short status;
+
+        /* While we can read, do so ! */
+        while ( (status = in_be16(&PSC(port)->mpc52xx_psc_status)) &
+                MPC52xx_PSC_SR_RXRDY) {
+
+                /* If we are full, just stop reading */
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        break;
+                
+                /* Get the char */
+                ch = in_8(&PSC(port)->mpc52xx_psc_buffer_8);
+
+                /* Handle sysreq char */
+#ifdef SUPPORT_SYSRQ
+                if (uart_handle_sysrq_char(port, ch, regs)) {
+                        port->sysrq = 0;
+                        continue;
+                }
+#endif
+
+                /* Store it */
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = 0;
+                port->icount.rx++;
+        
+                if ( status & (MPC52xx_PSC_SR_PE |
+                               MPC52xx_PSC_SR_FE |
+                               MPC52xx_PSC_SR_RB |
+                               MPC52xx_PSC_SR_OE) ) {
+                        
+                        if (status & MPC52xx_PSC_SR_RB) {
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                                uart_handle_break(port);
+                        } else if (status & MPC52xx_PSC_SR_PE)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (status & MPC52xx_PSC_SR_FE)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                        if (status & MPC52xx_PSC_SR_OE) {
+                                /*
+                                 * Overrun is special, since it's
+                                 * reported immediately, and doesn't
+                                 * affect the current character
+                                 */
+                                if (tty->flip.count < (TTY_FLIPBUF_SIZE-1)) {
+                                        tty->flip.flag_buf_ptr++;
+                                        tty->flip.char_buf_ptr++;
+                                        tty->flip.count++;
+                                }
+                                *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        }
+
+                        /* Clear error condition */
+                        out_8(&PSC(port)->command,MPC52xx_PSC_RST_ERR_STAT);
+
+                }
+
+                tty->flip.char_buf_ptr++;
+                tty->flip.flag_buf_ptr++;
+                tty->flip.count++;
+
+        }
+
+        tty_flip_buffer_push(tty);
+        
+        return in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_RXRDY;
+}
+
+static inline int
+mpc52xx_uart_int_tx_chars(struct uart_port *port)
+{
+        struct circ_buf *xmit = &port->info->xmit;
+
+        /* Process out of band chars */
+        if (port->x_char) {
+                out_8(&PSC(port)->mpc52xx_psc_buffer_8, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                return 1;
+        }
+
+        /* Nothing to do ? */
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                mpc52xx_uart_stop_tx(port,0);
+                return 0;
+        }
+
+        /* Send chars */
+        while (in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXRDY) {
+                out_8(&PSC(port)->mpc52xx_psc_buffer_8, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        }
+
+        /* Wake up */
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        /* Maybe we're done after all */
+        if (uart_circ_empty(xmit)) {
+                mpc52xx_uart_stop_tx(port,0);
+                return 0;
+        }
+
+        return 1;
+}
+
+static irqreturn_t 
+mpc52xx_uart_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = (struct uart_port *) dev_id;
+        unsigned long pass = ISR_PASS_LIMIT;
+        unsigned int keepgoing;
+        unsigned short status;
+        
+        if ( irq != port->irq ) {
+                printk( KERN_WARNING
+                        "mpc52xx_uart_int : " \
+                        "Received wrong int %d. Waiting for %d\n",
+                       irq, port->irq);
+                return IRQ_NONE;
+        }
+        
+        spin_lock(&port->lock);
+        
+        /* While we have stuff to do, we continue */
+        do {
+                /* If we don't find anything to do, we stop */
+                keepgoing = 0; 
+                
+                /* Read status */
+                status = in_be16(&PSC(port)->mpc52xx_psc_isr);
+                status &= port->read_status_mask;
+                        
+                /* Do we need to receive chars ? */
+                /* For this RX interrupts must be on and some chars waiting */
+                if ( status & MPC52xx_PSC_IMR_RXRDY )
+                        keepgoing |= mpc52xx_uart_int_rx_chars(port, regs);
+
+                /* Do we need to send chars ? */
+                /* For this, TX must be ready and TX interrupt enabled */
+                if ( status & MPC52xx_PSC_IMR_TXRDY )
+                        keepgoing |= mpc52xx_uart_int_tx_chars(port);
+                
+                /* Limit number of iteration */
+                if ( !(--pass) )
+                        keepgoing = 0;
+
+        } while (keepgoing);
+        
+        spin_unlock(&port->lock);
+        
+        return IRQ_HANDLED;
+}
+
+
+/* ======================================================================== */
+/* Console ( if applicable )                                                */
+/* ======================================================================== */
+
+#ifdef CONFIG_SERIAL_MPC52xx_CONSOLE
+
+static void __init
+mpc52xx_console_get_options(struct uart_port *port,
+                            int *baud, int *parity, int *bits, int *flow)
+{
+        struct mpc52xx_psc __iomem *psc = PSC(port);
+        unsigned char mr1;
+
+        /* Read the mode registers */
+        out_8(&psc->command,MPC52xx_PSC_SEL_MODE_REG_1);
+        mr1 = in_8(&psc->mode);
+        
+        /* CT{U,L}R are write-only ! */
+        *baud = __res.bi_baudrate ?
+                __res.bi_baudrate : CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
+
+        /* Parse them */
+        switch (mr1 & MPC52xx_PSC_MODE_BITS_MASK) {
+                case MPC52xx_PSC_MODE_5_BITS:   *bits = 5; break;
+                case MPC52xx_PSC_MODE_6_BITS:   *bits = 6; break;
+                case MPC52xx_PSC_MODE_7_BITS:   *bits = 7; break;
+                case MPC52xx_PSC_MODE_8_BITS:
+                default:                        *bits = 8;
+        }
+        
+        if (mr1 & MPC52xx_PSC_MODE_PARNONE)
+                *parity = 'n';
+        else
+                *parity = mr1 & MPC52xx_PSC_MODE_PARODD ? 'o' : 'e';
+}
+
+static void  
+mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_port *port = &mpc52xx_uart_ports[co->index];
+        struct mpc52xx_psc __iomem *psc = PSC(port);
+        unsigned int i, j;
+        
+        /* Disable interrupts */
+        out_be16(&psc->mpc52xx_psc_imr, 0);
+
+        /* Wait the TX buffer to be empty */
+        j = 5000000;    /* Maximum wait */      
+        while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) && 
+               --j)
+                udelay(1);
+
+        /* Write all the chars */
+        for ( i=0 ; i<count ; i++ ) {
+        
+                /* Send the char */
+                out_8(&psc->mpc52xx_psc_buffer_8, *s);
+
+                /* Line return handling */
+                if ( *s++ == '\n' )
+                        out_8(&psc->mpc52xx_psc_buffer_8, '\r');
+                
+                /* Wait the TX buffer to be empty */
+                j = 20000;      /* Maximum wait */      
+                while (!(in_be16(&psc->mpc52xx_psc_status) & 
+                         MPC52xx_PSC_SR_TXEMP) && --j)
+                        udelay(1);
+        }
+
+        /* Restore interrupt state */
+        out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
+}
+
+static int __init
+mpc52xx_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port = &mpc52xx_uart_ports[co->index];
+
+        int baud = CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        if (co->index < 0 || co->index >= MPC52xx_PSC_MAXNUM)
+                return -EINVAL;
+        
+        /* Basic port init. Needed since we use some uart_??? func before
+         * real init for early access */
+        spin_lock_init(&port->lock);
+        port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
+        port->ops       = &mpc52xx_uart_ops;
+        port->mapbase   = MPC52xx_PA(MPC52xx_PSCx_OFFSET(co->index+1));
+
+        /* We ioremap ourself */
+        port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE);
+        if (port->membase == NULL)
+                return -EINVAL;
+
+        /* Setup the port parameters accoding to options */
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                mpc52xx_console_get_options(port, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+
+extern struct uart_driver mpc52xx_uart_driver;
+
+static struct console mpc52xx_console = {
+        .name   = "ttyS",
+        .write  = mpc52xx_console_write,
+        .device = uart_console_device,
+        .setup  = mpc52xx_console_setup,
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,   /* Specified on the cmdline (e.g. console=ttyS0 ) */
+        .data   = &mpc52xx_uart_driver,
+};
+
+        
+static int __init 
+mpc52xx_console_init(void)
+{
+        register_console(&mpc52xx_console);
+        return 0;
+}
+
+console_initcall(mpc52xx_console_init);
+
+#define MPC52xx_PSC_CONSOLE &mpc52xx_console
+#else
+#define MPC52xx_PSC_CONSOLE NULL
+#endif
+
+
+/* ======================================================================== */
+/* UART Driver                                                              */
+/* ======================================================================== */
+
+static struct uart_driver mpc52xx_uart_driver = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "mpc52xx_psc_uart",
+        .dev_name       = "ttyS",
+        .devfs_name     = "ttyS",
+        .major          = TTY_MAJOR,
+        .minor          = 64,
+        .nr             = MPC52xx_PSC_MAXNUM,
+        .cons           = MPC52xx_PSC_CONSOLE,
+};
+
+
+/* ======================================================================== */
+/* Platform Driver                                                          */
+/* ======================================================================== */
+
+static int __devinit
+mpc52xx_uart_probe(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct resource *res = pdev->resource;
+
+        struct uart_port *port = NULL;
+        int i, idx, ret;
+
+        /* Check validity & presence */
+        idx = pdev->id;
+        if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM)
+                return -EINVAL;
+
+        if (!mpc52xx_match_psc_function(idx,"uart"))
+                return -ENODEV;
+
+        /* Init the port structure */
+        port = &mpc52xx_uart_ports[idx];
+
+        memset(port, 0x00, sizeof(struct uart_port));
+
+        spin_lock_init(&port->lock);
+        port->uartclk   = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
+        port->fifosize  = 255; /* Should be 512 ! But it can't be */
+                               /* stored in a unsigned char       */
+        port->iotype    = UPIO_MEM;
+        port->flags     = UPF_BOOT_AUTOCONF |
+                          ( uart_console(port) ? 0 : UPF_IOREMAP );
+        port->line      = idx;
+        port->ops       = &mpc52xx_uart_ops;
+
+        /* Search for IRQ and mapbase */
+        for (i=0 ; i<pdev->num_resources ; i++, res++) {
+                if (res->flags & IORESOURCE_MEM)
+                        port->mapbase = res->start;
+                else if (res->flags & IORESOURCE_IRQ)
+                        port->irq = res->start;
+        }
+        if (!port->irq || !port->mapbase)
+                return -EINVAL;
+
+        /* Add the port to the uart sub-system */
+        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
+        if (!ret)
+                dev_set_drvdata(dev, (void*)port);
+
+        return ret;
+}
+
+static int
+mpc52xx_uart_remove(struct device *dev)
+{
+        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+
+        dev_set_drvdata(dev, NULL);
+
+        if (port)
+                uart_remove_one_port(&mpc52xx_uart_driver, port);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int
+mpc52xx_uart_suspend(struct device *dev, u32 state, u32 level)
+{
+        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+
+        if (sport && level == SUSPEND_DISABLE)
+                uart_suspend_port(&mpc52xx_uart_driver, port);
+
+        return 0;
+}
+
+static int
+mpc52xx_uart_resume(struct device *dev, u32 level)
+{
+        struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);
+
+        if (port && level == RESUME_ENABLE)
+                uart_resume_port(&mpc52xx_uart_driver, port);
+
+        return 0;
+}
+#endif
+
+static struct device_driver mpc52xx_uart_platform_driver = {
+        .name           = "mpc52xx-psc",
+        .bus            = &platform_bus_type,
+        .probe          = mpc52xx_uart_probe,
+        .remove         = mpc52xx_uart_remove,
+#ifdef CONFIG_PM
+        .suspend        = mpc52xx_uart_suspend,
+        .resume         = mpc52xx_uart_resume,
+#endif
+};
+
+
+/* ======================================================================== */
+/* Module                                                                   */
+/* ======================================================================== */
+
+static int __init
+mpc52xx_uart_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Serial: MPC52xx PSC driver\n");
+
+        ret = uart_register_driver(&mpc52xx_uart_driver);
+        if (ret == 0) {
+                ret = driver_register(&mpc52xx_uart_platform_driver);
+                if (ret)
+                        uart_unregister_driver(&mpc52xx_uart_driver);
+        }
+
+        return ret;
+}
+
+static void __exit
+mpc52xx_uart_exit(void)
+{
+        driver_unregister(&mpc52xx_uart_platform_driver);
+        uart_unregister_driver(&mpc52xx_uart_driver);
+}
+
+
+module_init(mpc52xx_uart_init);
+module_exit(mpc52xx_uart_exit);
+
+MODULE_AUTHOR("Sylvain Munaut <tnt@246tNt.com>");
+MODULE_DESCRIPTION("Freescale MPC52xx PSC UART");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
new file mode 100644
index 000000000000..d0dfc3cf9245
--- /dev/null
+++ b/drivers/serial/mpsc.c
@@ -0,0 +1,1832 @@
+/*
+ * drivers/serial/mpsc.c
+ *
+ * Generic driver for the MPSC (UART mode) on Marvell parts (e.g., GT64240,
+ * GT64260, MV64340, MV64360, GT96100, ... ).
+ *
+ * Author: Mark A. Greer <mgreer@mvista.com>
+ *
+ * Based on an old MPSC driver that was in the linuxppc tree.  It appears to
+ * have been created by Chris Zankel (formerly of MontaVista) but there
+ * is no proper Copyright so I'm not sure.  Apparently, parts were also
+ * taken from PPCBoot (now U-Boot).  Also based on drivers/serial/8250.c
+ * by Russell King.
+ *
+ * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+/*
+ * The MPSC interface is much like a typical network controller's interface.
+ * That is, you set up separate rings of descriptors for transmitting and
+ * receiving data.  There is also a pool of buffers with (one buffer per
+ * descriptor) that incoming data are dma'd into or outgoing data are dma'd
+ * out of.
+ *
+ * The MPSC requires two other controllers to be able to work.  The Baud Rate
+ * Generator (BRG) provides a clock at programmable frequencies which determines
+ * the baud rate.  The Serial DMA Controller (SDMA) takes incoming data from the
+ * MPSC and DMA's it into memory or DMA's outgoing data and passes it to the
+ * MPSC.  It is actually the SDMA interrupt that the driver uses to keep the
+ * transmit and receive "engines" going (i.e., indicate data has been
+ * transmitted or received).
+ *
+ * NOTES:
+ *
+ * 1) Some chips have an erratum where several regs cannot be
+ * read.  To work around that, we keep a local copy of those regs in
+ * 'mpsc_port_info'.
+ *
+ * 2) Some chips have an erratum where the ctlr will hang when the SDMA ctlr
+ * accesses system mem with coherency enabled.  For that reason, the driver
+ * assumes that coherency for that ctlr has been disabled.  This means
+ * that when in a cache coherent system, the driver has to manually manage
+ * the data cache on the areas that it touches because the dma_* macro are
+ * basically no-ops.
+ *
+ * 3) There is an erratum (on PPC) where you can't use the instruction to do
+ * a DMA_TO_DEVICE/cache clean so DMA_BIDIRECTIONAL/flushes are used in places
+ * where a DMA_TO_DEVICE/clean would have [otherwise] sufficed.
+ *
+ * 4) AFAICT, hardware flow control isn't supported by the controller --MAG.
+ */
+
+#include "mpsc.h"
+
+/*
+ * Define how this driver is known to the outside (we've been assigned a
+ * range on the "Low-density serial ports" major).
+ */
+#define MPSC_MAJOR              204
+#define MPSC_MINOR_START        44
+#define MPSC_DRIVER_NAME        "MPSC"
+#define MPSC_DEVFS_NAME         "ttymm/"
+#define MPSC_DEV_NAME           "ttyMM"
+#define MPSC_VERSION            "1.00"
+
+static struct mpsc_port_info mpsc_ports[MPSC_NUM_CTLRS];
+static struct mpsc_shared_regs mpsc_shared_regs;
+
+/*
+ ******************************************************************************
+ *
+ * Baud Rate Generator Routines (BRG)
+ *
+ ******************************************************************************
+ */
+static void
+mpsc_brg_init(struct mpsc_port_info *pi, u32 clk_src)
+{
+        u32     v;
+
+        v = (pi->mirror_regs) ? pi->BRG_BCR_m : readl(pi->brg_base + BRG_BCR);
+        v = (v & ~(0xf << 18)) | ((clk_src & 0xf) << 18);
+
+        if (pi->brg_can_tune)
+                v &= ~(1 << 25);
+
+        if (pi->mirror_regs)
+                pi->BRG_BCR_m = v;
+        writel(v, pi->brg_base + BRG_BCR);
+
+        writel(readl(pi->brg_base + BRG_BTR) & 0xffff0000,
+                pi->brg_base + BRG_BTR);
+        return;
+}
+
+static void
+mpsc_brg_enable(struct mpsc_port_info *pi)
+{
+        u32     v;
+
+        v = (pi->mirror_regs) ? pi->BRG_BCR_m : readl(pi->brg_base + BRG_BCR);
+        v |= (1 << 16);
+
+        if (pi->mirror_regs)
+                pi->BRG_BCR_m = v;
+        writel(v, pi->brg_base + BRG_BCR);
+        return;
+}
+
+static void
+mpsc_brg_disable(struct mpsc_port_info *pi)
+{
+        u32     v;
+
+        v = (pi->mirror_regs) ? pi->BRG_BCR_m : readl(pi->brg_base + BRG_BCR);
+        v &= ~(1 << 16);
+
+        if (pi->mirror_regs)
+                pi->BRG_BCR_m = v;
+        writel(v, pi->brg_base + BRG_BCR);
+        return;
+}
+
+static inline void
+mpsc_set_baudrate(struct mpsc_port_info *pi, u32 baud)
+{
+        /*
+         * To set the baud, we adjust the CDV field in the BRG_BCR reg.
+         * From manual: Baud = clk / ((CDV+1)*2) ==> CDV = (clk / (baud*2)) - 1.
+         * However, the input clock is divided by 16 in the MPSC b/c of how
+         * 'MPSC_MMCRH' was set up so we have to divide the 'clk' used in our
+         * calculation by 16 to account for that.  So the real calculation
+         * that accounts for the way the mpsc is set up is:
+         * CDV = (clk / (baud*2*16)) - 1 ==> CDV = (clk / (baud << 5)) - 1.
+         */
+        u32     cdv = (pi->port.uartclk / (baud << 5)) - 1;
+        u32     v;
+
+        mpsc_brg_disable(pi);
+        v = (pi->mirror_regs) ? pi->BRG_BCR_m : readl(pi->brg_base + BRG_BCR);
+        v = (v & 0xffff0000) | (cdv & 0xffff);
+
+        if (pi->mirror_regs)
+                pi->BRG_BCR_m = v;
+        writel(v, pi->brg_base + BRG_BCR);
+        mpsc_brg_enable(pi);
+
+        return;
+}
+
+/*
+ ******************************************************************************
+ *
+ * Serial DMA Routines (SDMA)
+ *
+ ******************************************************************************
+ */
+
+static void
+mpsc_sdma_burstsize(struct mpsc_port_info *pi, u32 burst_size)
+{
+        u32     v;
+
+        pr_debug("mpsc_sdma_burstsize[%d]: burst_size: %d\n",
+            pi->port.line, burst_size);
+
+        burst_size >>= 3; /* Divide by 8 b/c reg values are 8-byte chunks */
+
+        if (burst_size < 2)
+                v = 0x0;        /* 1 64-bit word */
+        else if (burst_size < 4)
+                v = 0x1;        /* 2 64-bit words */
+        else if (burst_size < 8)
+                v = 0x2;        /* 4 64-bit words */
+        else
+                v = 0x3;        /* 8 64-bit words */
+
+        writel((readl(pi->sdma_base + SDMA_SDC) & (0x3 << 12)) | (v << 12),
+                pi->sdma_base + SDMA_SDC);
+        return;
+}
+
+static void
+mpsc_sdma_init(struct mpsc_port_info *pi, u32 burst_size)
+{
+        pr_debug("mpsc_sdma_init[%d]: burst_size: %d\n", pi->port.line,
+                burst_size);
+
+        writel((readl(pi->sdma_base + SDMA_SDC) & 0x3ff) | 0x03f,
+                pi->sdma_base + SDMA_SDC);
+        mpsc_sdma_burstsize(pi, burst_size);
+        return;
+}
+
+static inline u32
+mpsc_sdma_intr_mask(struct mpsc_port_info *pi, u32 mask)
+{
+        u32     old, v;
+
+        pr_debug("mpsc_sdma_intr_mask[%d]: mask: 0x%x\n", pi->port.line, mask);
+
+        old = v = (pi->mirror_regs) ? pi->shared_regs->SDMA_INTR_MASK_m :
+                readl(pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
+
+        mask &= 0xf;
+        if (pi->port.line)
+                mask <<= 8;
+        v &= ~mask;
+
+        if (pi->mirror_regs)
+                pi->shared_regs->SDMA_INTR_MASK_m = v;
+        writel(v, pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
+
+        if (pi->port.line)
+                old >>= 8;
+        return old & 0xf;
+}
+
+static inline void
+mpsc_sdma_intr_unmask(struct mpsc_port_info *pi, u32 mask)
+{
+        u32     v;
+
+        pr_debug("mpsc_sdma_intr_unmask[%d]: mask: 0x%x\n", pi->port.line,mask);
+
+        v = (pi->mirror_regs) ? pi->shared_regs->SDMA_INTR_MASK_m :
+                readl(pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
+
+        mask &= 0xf;
+        if (pi->port.line)
+                mask <<= 8;
+        v |= mask;
+
+        if (pi->mirror_regs)
+                pi->shared_regs->SDMA_INTR_MASK_m = v;
+        writel(v, pi->shared_regs->sdma_intr_base + SDMA_INTR_MASK);
+        return;
+}
+
+static inline void
+mpsc_sdma_intr_ack(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_sdma_intr_ack[%d]: Acknowledging IRQ\n", pi->port.line);
+
+        if (pi->mirror_regs)
+                pi->shared_regs->SDMA_INTR_CAUSE_m = 0;
+        writel(0, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE);
+        return;
+}
+
+static inline void
+mpsc_sdma_set_rx_ring(struct mpsc_port_info *pi, struct mpsc_rx_desc *rxre_p)
+{
+        pr_debug("mpsc_sdma_set_rx_ring[%d]: rxre_p: 0x%x\n",
+                pi->port.line, (u32) rxre_p);
+
+        writel((u32)rxre_p, pi->sdma_base + SDMA_SCRDP);
+        return;
+}
+
+static inline void
+mpsc_sdma_set_tx_ring(struct mpsc_port_info *pi, struct mpsc_tx_desc *txre_p)
+{
+        writel((u32)txre_p, pi->sdma_base + SDMA_SFTDP);
+        writel((u32)txre_p, pi->sdma_base + SDMA_SCTDP);
+        return;
+}
+
+static inline void
+mpsc_sdma_cmd(struct mpsc_port_info *pi, u32 val)
+{
+        u32     v;
+
+        v = readl(pi->sdma_base + SDMA_SDCM);
+        if (val)
+                v |= val;
+        else
+                v = 0;
+        wmb();
+        writel(v, pi->sdma_base + SDMA_SDCM);
+        wmb();
+        return;
+}
+
+static inline uint
+mpsc_sdma_tx_active(struct mpsc_port_info *pi)
+{
+        return readl(pi->sdma_base + SDMA_SDCM) & SDMA_SDCM_TXD;
+}
+
+static inline void
+mpsc_sdma_start_tx(struct mpsc_port_info *pi)
+{
+        struct mpsc_tx_desc *txre, *txre_p;
+
+        /* If tx isn't running & there's a desc ready to go, start it */
+        if (!mpsc_sdma_tx_active(pi)) {
+                txre = (struct mpsc_tx_desc *)(pi->txr +
+                        (pi->txr_tail * MPSC_TXRE_SIZE));
+                dma_cache_sync((void *) txre, MPSC_TXRE_SIZE, DMA_FROM_DEVICE);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        invalidate_dcache_range((ulong)txre,
+                                (ulong)txre + MPSC_TXRE_SIZE);
+#endif
+
+                if (be32_to_cpu(txre->cmdstat) & SDMA_DESC_CMDSTAT_O) {
+                        txre_p = (struct mpsc_tx_desc *)(pi->txr_p +
+                                                         (pi->txr_tail *
+                                                          MPSC_TXRE_SIZE));
+
+                        mpsc_sdma_set_tx_ring(pi, txre_p);
+                        mpsc_sdma_cmd(pi, SDMA_SDCM_STD | SDMA_SDCM_TXD);
+                }
+        }
+
+        return;
+}
+
+static inline void
+mpsc_sdma_stop(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_sdma_stop[%d]: Stopping SDMA\n", pi->port.line);
+
+        /* Abort any SDMA transfers */
+        mpsc_sdma_cmd(pi, 0);
+        mpsc_sdma_cmd(pi, SDMA_SDCM_AR | SDMA_SDCM_AT);
+
+        /* Clear the SDMA current and first TX and RX pointers */
+        mpsc_sdma_set_tx_ring(pi, 0);
+        mpsc_sdma_set_rx_ring(pi, 0);
+
+        /* Disable interrupts */
+        mpsc_sdma_intr_mask(pi, 0xf);
+        mpsc_sdma_intr_ack(pi);
+
+        return;
+}
+
+/*
+ ******************************************************************************
+ *
+ * Multi-Protocol Serial Controller Routines (MPSC)
+ *
+ ******************************************************************************
+ */
+
+static void
+mpsc_hw_init(struct mpsc_port_info *pi)
+{
+        u32     v;
+
+        pr_debug("mpsc_hw_init[%d]: Initializing hardware\n", pi->port.line);
+
+        /* Set up clock routing */
+        if (pi->mirror_regs) {
+                v = pi->shared_regs->MPSC_MRR_m;
+                v &= ~0x1c7;
+                pi->shared_regs->MPSC_MRR_m = v;
+                writel(v, pi->shared_regs->mpsc_routing_base + MPSC_MRR);
+
+                v = pi->shared_regs->MPSC_RCRR_m;
+                v = (v & ~0xf0f) | 0x100;
+                pi->shared_regs->MPSC_RCRR_m = v;
+                writel(v, pi->shared_regs->mpsc_routing_base + MPSC_RCRR);
+
+                v = pi->shared_regs->MPSC_TCRR_m;
+                v = (v & ~0xf0f) | 0x100;
+                pi->shared_regs->MPSC_TCRR_m = v;
+                writel(v, pi->shared_regs->mpsc_routing_base + MPSC_TCRR);
+        }
+        else {
+                v = readl(pi->shared_regs->mpsc_routing_base + MPSC_MRR);
+                v &= ~0x1c7;
+                writel(v, pi->shared_regs->mpsc_routing_base + MPSC_MRR);
+
+                v = readl(pi->shared_regs->mpsc_routing_base + MPSC_RCRR);
+                v = (v & ~0xf0f) | 0x100;
+                writel(v, pi->shared_regs->mpsc_routing_base + MPSC_RCRR);
+
+                v = readl(pi->shared_regs->mpsc_routing_base + MPSC_TCRR);
+                v = (v & ~0xf0f) | 0x100;
+                writel(v, pi->shared_regs->mpsc_routing_base + MPSC_TCRR);
+        }
+
+        /* Put MPSC in UART mode & enabel Tx/Rx egines */
+        writel(0x000004c4, pi->mpsc_base + MPSC_MMCRL);
+
+        /* No preamble, 16x divider, low-latency,  */
+        writel(0x04400400, pi->mpsc_base + MPSC_MMCRH);
+
+        if (pi->mirror_regs) {
+                pi->MPSC_CHR_1_m = 0;
+                pi->MPSC_CHR_2_m = 0;
+        }
+        writel(0, pi->mpsc_base + MPSC_CHR_1);
+        writel(0, pi->mpsc_base + MPSC_CHR_2);
+        writel(pi->mpsc_max_idle, pi->mpsc_base + MPSC_CHR_3);
+        writel(0, pi->mpsc_base + MPSC_CHR_4);
+        writel(0, pi->mpsc_base + MPSC_CHR_5);
+        writel(0, pi->mpsc_base + MPSC_CHR_6);
+        writel(0, pi->mpsc_base + MPSC_CHR_7);
+        writel(0, pi->mpsc_base + MPSC_CHR_8);
+        writel(0, pi->mpsc_base + MPSC_CHR_9);
+        writel(0, pi->mpsc_base + MPSC_CHR_10);
+
+        return;
+}
+
+static inline void
+mpsc_enter_hunt(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_enter_hunt[%d]: Hunting...\n", pi->port.line);
+
+        if (pi->mirror_regs) {
+                writel(pi->MPSC_CHR_2_m | MPSC_CHR_2_EH,
+                        pi->mpsc_base + MPSC_CHR_2);
+                /* Erratum prevents reading CHR_2 so just delay for a while */
+                udelay(100);
+        }
+        else {
+                writel(readl(pi->mpsc_base + MPSC_CHR_2) | MPSC_CHR_2_EH,
+                        pi->mpsc_base + MPSC_CHR_2);
+
+                while (readl(pi->mpsc_base + MPSC_CHR_2) & MPSC_CHR_2_EH)
+                        udelay(10);
+        }
+
+        return;
+}
+
+static inline void
+mpsc_freeze(struct mpsc_port_info *pi)
+{
+        u32     v;
+
+        pr_debug("mpsc_freeze[%d]: Freezing\n", pi->port.line);
+
+        v = (pi->mirror_regs) ? pi->MPSC_MPCR_m :
+                readl(pi->mpsc_base + MPSC_MPCR);
+        v |= MPSC_MPCR_FRZ;
+
+        if (pi->mirror_regs)
+                pi->MPSC_MPCR_m = v;
+        writel(v, pi->mpsc_base + MPSC_MPCR);
+        return;
+}
+
+static inline void
+mpsc_unfreeze(struct mpsc_port_info *pi)
+{
+        u32     v;
+
+        v = (pi->mirror_regs) ? pi->MPSC_MPCR_m :
+                readl(pi->mpsc_base + MPSC_MPCR);
+        v &= ~MPSC_MPCR_FRZ;
+
+        if (pi->mirror_regs)
+                pi->MPSC_MPCR_m = v;
+        writel(v, pi->mpsc_base + MPSC_MPCR);
+
+        pr_debug("mpsc_unfreeze[%d]: Unfrozen\n", pi->port.line);
+        return;
+}
+
+static inline void
+mpsc_set_char_length(struct mpsc_port_info *pi, u32 len)
+{
+        u32     v;
+
+        pr_debug("mpsc_set_char_length[%d]: char len: %d\n", pi->port.line,len);
+
+        v = (pi->mirror_regs) ? pi->MPSC_MPCR_m :
+                readl(pi->mpsc_base + MPSC_MPCR);
+        v = (v & ~(0x3 << 12)) | ((len & 0x3) << 12);
+
+        if (pi->mirror_regs)
+                pi->MPSC_MPCR_m = v;
+        writel(v, pi->mpsc_base + MPSC_MPCR);
+        return;
+}
+
+static inline void
+mpsc_set_stop_bit_length(struct mpsc_port_info *pi, u32 len)
+{
+        u32     v;
+
+        pr_debug("mpsc_set_stop_bit_length[%d]: stop bits: %d\n",
+                pi->port.line, len);
+
+        v = (pi->mirror_regs) ? pi->MPSC_MPCR_m :
+                readl(pi->mpsc_base + MPSC_MPCR);
+
+        v = (v & ~(1 << 14)) | ((len & 0x1) << 14);
+
+        if (pi->mirror_regs)
+                pi->MPSC_MPCR_m = v;
+        writel(v, pi->mpsc_base + MPSC_MPCR);
+        return;
+}
+
+static inline void
+mpsc_set_parity(struct mpsc_port_info *pi, u32 p)
+{
+        u32     v;
+
+        pr_debug("mpsc_set_parity[%d]: parity bits: 0x%x\n", pi->port.line, p);
+
+        v = (pi->mirror_regs) ? pi->MPSC_CHR_2_m :
+                readl(pi->mpsc_base + MPSC_CHR_2);
+
+        p &= 0x3;
+        v = (v & ~0xc000c) | (p << 18) | (p << 2);
+
+        if (pi->mirror_regs)
+                pi->MPSC_CHR_2_m = v;
+        writel(v, pi->mpsc_base + MPSC_CHR_2);
+        return;
+}
+
+/*
+ ******************************************************************************
+ *
+ * Driver Init Routines
+ *
+ ******************************************************************************
+ */
+
+static void
+mpsc_init_hw(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_init_hw[%d]: Initializing\n", pi->port.line);
+
+        mpsc_brg_init(pi, pi->brg_clk_src);
+        mpsc_brg_enable(pi);
+        mpsc_sdma_init(pi, dma_get_cache_alignment());  /* burst a cacheline */
+        mpsc_sdma_stop(pi);
+        mpsc_hw_init(pi);
+
+        return;
+}
+
+static int
+mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
+{
+        int rc = 0;
+        static void mpsc_free_ring_mem(struct mpsc_port_info *pi);
+
+        pr_debug("mpsc_alloc_ring_mem[%d]: Allocating ring mem\n",
+                pi->port.line);
+
+        if (!pi->dma_region) {
+                if (!dma_supported(pi->port.dev, 0xffffffff)) {
+                        printk(KERN_ERR "MPSC: Inadequate DMA support\n");
+                        rc = -ENXIO;
+                }
+                else if ((pi->dma_region = dma_alloc_noncoherent(pi->port.dev,
+                        MPSC_DMA_ALLOC_SIZE, &pi->dma_region_p, GFP_KERNEL))
+                        == NULL) {
+
+                        printk(KERN_ERR "MPSC: Can't alloc Desc region\n");
+                        rc = -ENOMEM;
+                }
+        }
+
+        return rc;
+}
+
+static void
+mpsc_free_ring_mem(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_free_ring_mem[%d]: Freeing ring mem\n", pi->port.line);
+
+        if (pi->dma_region) {
+                dma_free_noncoherent(pi->port.dev, MPSC_DMA_ALLOC_SIZE,
+                          pi->dma_region, pi->dma_region_p);
+                pi->dma_region = NULL;
+                pi->dma_region_p = (dma_addr_t) NULL;
+        }
+
+        return;
+}
+
+static void
+mpsc_init_rings(struct mpsc_port_info *pi)
+{
+        struct mpsc_rx_desc *rxre;
+        struct mpsc_tx_desc *txre;
+        dma_addr_t dp, dp_p;
+        u8 *bp, *bp_p;
+        int i;
+
+        pr_debug("mpsc_init_rings[%d]: Initializing rings\n", pi->port.line);
+
+        BUG_ON(pi->dma_region == NULL);
+
+        memset(pi->dma_region, 0, MPSC_DMA_ALLOC_SIZE);
+
+        /*
+         * Descriptors & buffers are multiples of cacheline size and must be
+         * cacheline aligned.
+         */
+        dp = ALIGN((u32) pi->dma_region, dma_get_cache_alignment());
+        dp_p = ALIGN((u32) pi->dma_region_p, dma_get_cache_alignment());
+
+        /*
+         * Partition dma region into rx ring descriptor, rx buffers,
+         * tx ring descriptors, and tx buffers.
+         */
+        pi->rxr = dp;
+        pi->rxr_p = dp_p;
+        dp += MPSC_RXR_SIZE;
+        dp_p += MPSC_RXR_SIZE;
+
+        pi->rxb = (u8 *) dp;
+        pi->rxb_p = (u8 *) dp_p;
+        dp += MPSC_RXB_SIZE;
+        dp_p += MPSC_RXB_SIZE;
+
+        pi->rxr_posn = 0;
+
+        pi->txr = dp;
+        pi->txr_p = dp_p;
+        dp += MPSC_TXR_SIZE;
+        dp_p += MPSC_TXR_SIZE;
+
+        pi->txb = (u8 *) dp;
+        pi->txb_p = (u8 *) dp_p;
+
+        pi->txr_head = 0;
+        pi->txr_tail = 0;
+
+        /* Init rx ring descriptors */
+        dp = pi->rxr;
+        dp_p = pi->rxr_p;
+        bp = pi->rxb;
+        bp_p = pi->rxb_p;
+
+        for (i = 0; i < MPSC_RXR_ENTRIES; i++) {
+                rxre = (struct mpsc_rx_desc *)dp;
+
+                rxre->bufsize = cpu_to_be16(MPSC_RXBE_SIZE);
+                rxre->bytecnt = cpu_to_be16(0);
+                rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O |
+                                            SDMA_DESC_CMDSTAT_EI |
+                                            SDMA_DESC_CMDSTAT_F |
+                                            SDMA_DESC_CMDSTAT_L);
+                rxre->link = cpu_to_be32(dp_p + MPSC_RXRE_SIZE);
+                rxre->buf_ptr = cpu_to_be32(bp_p);
+
+                dp += MPSC_RXRE_SIZE;
+                dp_p += MPSC_RXRE_SIZE;
+                bp += MPSC_RXBE_SIZE;
+                bp_p += MPSC_RXBE_SIZE;
+        }
+        rxre->link = cpu_to_be32(pi->rxr_p);    /* Wrap last back to first */
+
+        /* Init tx ring descriptors */
+        dp = pi->txr;
+        dp_p = pi->txr_p;
+        bp = pi->txb;
+        bp_p = pi->txb_p;
+
+        for (i = 0; i < MPSC_TXR_ENTRIES; i++) {
+                txre = (struct mpsc_tx_desc *)dp;
+
+                txre->link = cpu_to_be32(dp_p + MPSC_TXRE_SIZE);
+                txre->buf_ptr = cpu_to_be32(bp_p);
+
+                dp += MPSC_TXRE_SIZE;
+                dp_p += MPSC_TXRE_SIZE;
+                bp += MPSC_TXBE_SIZE;
+                bp_p += MPSC_TXBE_SIZE;
+        }
+        txre->link = cpu_to_be32(pi->txr_p);    /* Wrap last back to first */
+
+        dma_cache_sync((void *) pi->dma_region, MPSC_DMA_ALLOC_SIZE,
+                DMA_BIDIRECTIONAL);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        flush_dcache_range((ulong)pi->dma_region,
+                                (ulong)pi->dma_region + MPSC_DMA_ALLOC_SIZE);
+#endif
+
+        return;
+}
+
+static void
+mpsc_uninit_rings(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_uninit_rings[%d]: Uninitializing rings\n",pi->port.line);
+
+        BUG_ON(pi->dma_region == NULL);
+
+        pi->rxr = 0;
+        pi->rxr_p = 0;
+        pi->rxb = NULL;
+        pi->rxb_p = NULL;
+        pi->rxr_posn = 0;
+
+        pi->txr = 0;
+        pi->txr_p = 0;
+        pi->txb = NULL;
+        pi->txb_p = NULL;
+        pi->txr_head = 0;
+        pi->txr_tail = 0;
+
+        return;
+}
+
+static int
+mpsc_make_ready(struct mpsc_port_info *pi)
+{
+        int rc;
+
+        pr_debug("mpsc_make_ready[%d]: Making cltr ready\n", pi->port.line);
+
+        if (!pi->ready) {
+                mpsc_init_hw(pi);
+                if ((rc = mpsc_alloc_ring_mem(pi)))
+                        return rc;
+                mpsc_init_rings(pi);
+                pi->ready = 1;
+        }
+
+        return 0;
+}
+
+/*
+ ******************************************************************************
+ *
+ * Interrupt Handling Routines
+ *
+ ******************************************************************************
+ */
+
+static inline int
+mpsc_rx_intr(struct mpsc_port_info *pi, struct pt_regs *regs)
+{
+        struct mpsc_rx_desc *rxre;
+        struct tty_struct *tty = pi->port.info->tty;
+        u32     cmdstat, bytes_in, i;
+        int     rc = 0;
+        u8      *bp;
+        char    flag = TTY_NORMAL;
+        static void mpsc_start_rx(struct mpsc_port_info *pi);
+
+        pr_debug("mpsc_rx_intr[%d]: Handling Rx intr\n", pi->port.line);
+
+        rxre = (struct mpsc_rx_desc *)(pi->rxr + (pi->rxr_posn*MPSC_RXRE_SIZE));
+
+        dma_cache_sync((void *)rxre, MPSC_RXRE_SIZE, DMA_FROM_DEVICE);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+        if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                invalidate_dcache_range((ulong)rxre,
+                        (ulong)rxre + MPSC_RXRE_SIZE);
+#endif
+
+        /*
+         * Loop through Rx descriptors handling ones that have been completed.
+         */
+        while (!((cmdstat = be32_to_cpu(rxre->cmdstat)) & SDMA_DESC_CMDSTAT_O)){
+                bytes_in = be16_to_cpu(rxre->bytecnt);
+
+                /* Following use of tty struct directly is deprecated */
+                if (unlikely((tty->flip.count + bytes_in) >= TTY_FLIPBUF_SIZE)){
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /*
+                         * If this failed then we will throw awa the bytes
+                         * but mst do so to clear interrupts.
+                         */
+                }
+
+                bp = pi->rxb + (pi->rxr_posn * MPSC_RXBE_SIZE);
+                dma_cache_sync((void *) bp, MPSC_RXBE_SIZE, DMA_FROM_DEVICE);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        invalidate_dcache_range((ulong)bp,
+                                (ulong)bp + MPSC_RXBE_SIZE);
+#endif
+
+                /*
+                 * Other than for parity error, the manual provides little
+                 * info on what data will be in a frame flagged by any of
+                 * these errors.  For parity error, it is the last byte in
+                 * the buffer that had the error.  As for the rest, I guess
+                 * we'll assume there is no data in the buffer.
+                 * If there is...it gets lost.
+                 */
+                if (unlikely(cmdstat & (SDMA_DESC_CMDSTAT_BR |
+                        SDMA_DESC_CMDSTAT_FR | SDMA_DESC_CMDSTAT_OR))) {
+
+                        pi->port.icount.rx++;
+
+                        if (cmdstat & SDMA_DESC_CMDSTAT_BR) {   /* Break */
+                                pi->port.icount.brk++;
+
+                                if (uart_handle_break(&pi->port))
+                                        goto next_frame;
+                        }
+                        else if (cmdstat & SDMA_DESC_CMDSTAT_FR)/* Framing */
+                                pi->port.icount.frame++;
+                        else if (cmdstat & SDMA_DESC_CMDSTAT_OR) /* Overrun */
+                                pi->port.icount.overrun++;
+
+                        cmdstat &= pi->port.read_status_mask;
+
+                        if (cmdstat & SDMA_DESC_CMDSTAT_BR)
+                                flag = TTY_BREAK;
+                        else if (cmdstat & SDMA_DESC_CMDSTAT_FR)
+                                flag = TTY_FRAME;
+                        else if (cmdstat & SDMA_DESC_CMDSTAT_OR)
+                                flag = TTY_OVERRUN;
+                        else if (cmdstat & SDMA_DESC_CMDSTAT_PE)
+                                flag = TTY_PARITY;
+                }
+
+                if (uart_handle_sysrq_char(&pi->port, *bp, regs)) {
+                        bp++;
+                        bytes_in--;
+                        goto next_frame;
+                }
+
+                if ((unlikely(cmdstat & (SDMA_DESC_CMDSTAT_BR |
+                        SDMA_DESC_CMDSTAT_FR | SDMA_DESC_CMDSTAT_OR))) &&
+                        !(cmdstat & pi->port.ignore_status_mask))
+
+                        tty_insert_flip_char(tty, *bp, flag);
+                else {
+                        for (i=0; i<bytes_in; i++)
+                                tty_insert_flip_char(tty, *bp++, TTY_NORMAL);
+
+                        pi->port.icount.rx += bytes_in;
+                }
+
+next_frame:
+                rxre->bytecnt = cpu_to_be16(0);
+                wmb();
+                rxre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O |
+                                            SDMA_DESC_CMDSTAT_EI |
+                                            SDMA_DESC_CMDSTAT_F |
+                                            SDMA_DESC_CMDSTAT_L);
+                wmb();
+                dma_cache_sync((void *)rxre, MPSC_RXRE_SIZE, DMA_BIDIRECTIONAL);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        flush_dcache_range((ulong)rxre,
+                                (ulong)rxre + MPSC_RXRE_SIZE);
+#endif
+
+                /* Advance to next descriptor */
+                pi->rxr_posn = (pi->rxr_posn + 1) & (MPSC_RXR_ENTRIES - 1);
+                rxre = (struct mpsc_rx_desc *)(pi->rxr +
+                        (pi->rxr_posn * MPSC_RXRE_SIZE));
+                dma_cache_sync((void *)rxre, MPSC_RXRE_SIZE, DMA_FROM_DEVICE);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        invalidate_dcache_range((ulong)rxre,
+                                (ulong)rxre + MPSC_RXRE_SIZE);
+#endif
+
+                rc = 1;
+        }
+
+        /* Restart rx engine, if its stopped */
+        if ((readl(pi->sdma_base + SDMA_SDCM) & SDMA_SDCM_ERD) == 0)
+                mpsc_start_rx(pi);
+
+        tty_flip_buffer_push(tty);
+        return rc;
+}
+
+static inline void
+mpsc_setup_tx_desc(struct mpsc_port_info *pi, u32 count, u32 intr)
+{
+        struct mpsc_tx_desc *txre;
+
+        txre = (struct mpsc_tx_desc *)(pi->txr +
+                (pi->txr_head * MPSC_TXRE_SIZE));
+
+        txre->bytecnt = cpu_to_be16(count);
+        txre->shadow = txre->bytecnt;
+        wmb();                  /* ensure cmdstat is last field updated */
+        txre->cmdstat = cpu_to_be32(SDMA_DESC_CMDSTAT_O | SDMA_DESC_CMDSTAT_F |
+                                    SDMA_DESC_CMDSTAT_L | ((intr) ?
+                                                           SDMA_DESC_CMDSTAT_EI
+                                                           : 0));
+        wmb();
+        dma_cache_sync((void *) txre, MPSC_TXRE_SIZE, DMA_BIDIRECTIONAL);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+        if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                flush_dcache_range((ulong)txre,
+                        (ulong)txre + MPSC_TXRE_SIZE);
+#endif
+
+        return;
+}
+
+static inline void
+mpsc_copy_tx_data(struct mpsc_port_info *pi)
+{
+        struct circ_buf *xmit = &pi->port.info->xmit;
+        u8 *bp;
+        u32 i;
+
+        /* Make sure the desc ring isn't full */
+        while (CIRC_CNT(pi->txr_head, pi->txr_tail, MPSC_TXR_ENTRIES) <
+               (MPSC_TXR_ENTRIES - 1)) {
+                if (pi->port.x_char) {
+                        /*
+                         * Ideally, we should use the TCS field in
+                         * CHR_1 to put the x_char out immediately but
+                         * errata prevents us from being able to read
+                         * CHR_2 to know that its safe to write to
+                         * CHR_1.  Instead, just put it in-band with
+                         * all the other Tx data.
+                         */
+                        bp = pi->txb + (pi->txr_head * MPSC_TXBE_SIZE);
+                        *bp = pi->port.x_char;
+                        pi->port.x_char = 0;
+                        i = 1;
+                }
+                else if (!uart_circ_empty(xmit) && !uart_tx_stopped(&pi->port)){
+                        i = min((u32) MPSC_TXBE_SIZE,
+                                (u32) uart_circ_chars_pending(xmit));
+                        i = min(i, (u32) CIRC_CNT_TO_END(xmit->head, xmit->tail,
+                                UART_XMIT_SIZE));
+                        bp = pi->txb + (pi->txr_head * MPSC_TXBE_SIZE);
+                        memcpy(bp, &xmit->buf[xmit->tail], i);
+                        xmit->tail = (xmit->tail + i) & (UART_XMIT_SIZE - 1);
+
+                        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                                uart_write_wakeup(&pi->port);
+                }
+                else /* All tx data copied into ring bufs */
+                        return;
+
+                dma_cache_sync((void *) bp, MPSC_TXBE_SIZE, DMA_BIDIRECTIONAL);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        flush_dcache_range((ulong)bp,
+                                (ulong)bp + MPSC_TXBE_SIZE);
+#endif
+                mpsc_setup_tx_desc(pi, i, 1);
+
+                /* Advance to next descriptor */
+                pi->txr_head = (pi->txr_head + 1) & (MPSC_TXR_ENTRIES - 1);
+        }
+
+        return;
+}
+
+static inline int
+mpsc_tx_intr(struct mpsc_port_info *pi)
+{
+        struct mpsc_tx_desc *txre;
+        int rc = 0;
+
+        if (!mpsc_sdma_tx_active(pi)) {
+                txre = (struct mpsc_tx_desc *)(pi->txr +
+                        (pi->txr_tail * MPSC_TXRE_SIZE));
+
+                dma_cache_sync((void *) txre, MPSC_TXRE_SIZE, DMA_FROM_DEVICE);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        invalidate_dcache_range((ulong)txre,
+                                (ulong)txre + MPSC_TXRE_SIZE);
+#endif
+
+                while (!(be32_to_cpu(txre->cmdstat) & SDMA_DESC_CMDSTAT_O)) {
+                        rc = 1;
+                        pi->port.icount.tx += be16_to_cpu(txre->bytecnt);
+                        pi->txr_tail = (pi->txr_tail+1) & (MPSC_TXR_ENTRIES-1);
+
+                        /* If no more data to tx, fall out of loop */
+                        if (pi->txr_head == pi->txr_tail)
+                                break;
+
+                        txre = (struct mpsc_tx_desc *)(pi->txr +
+                                (pi->txr_tail * MPSC_TXRE_SIZE));
+                        dma_cache_sync((void *) txre, MPSC_TXRE_SIZE,
+                                DMA_FROM_DEVICE);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                        if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                                invalidate_dcache_range((ulong)txre,
+                                        (ulong)txre + MPSC_TXRE_SIZE);
+#endif
+                }
+
+                mpsc_copy_tx_data(pi);
+                mpsc_sdma_start_tx(pi); /* start next desc if ready */
+        }
+
+        return rc;
+}
+
+/*
+ * This is the driver's interrupt handler.  To avoid a race, we first clear
+ * the interrupt, then handle any completed Rx/Tx descriptors.  When done
+ * handling those descriptors, we restart the Rx/Tx engines if they're stopped.
+ */
+static irqreturn_t
+mpsc_sdma_intr(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct mpsc_port_info *pi = dev_id;
+        ulong iflags;
+        int rc = IRQ_NONE;
+
+        pr_debug("mpsc_sdma_intr[%d]: SDMA Interrupt Received\n",pi->port.line);
+
+        spin_lock_irqsave(&pi->port.lock, iflags);
+        mpsc_sdma_intr_ack(pi);
+        if (mpsc_rx_intr(pi, regs))
+                rc = IRQ_HANDLED;
+        if (mpsc_tx_intr(pi))
+                rc = IRQ_HANDLED;
+        spin_unlock_irqrestore(&pi->port.lock, iflags);
+
+        pr_debug("mpsc_sdma_intr[%d]: SDMA Interrupt Handled\n", pi->port.line);
+        return rc;
+}
+
+/*
+ ******************************************************************************
+ *
+ * serial_core.c Interface routines
+ *
+ ******************************************************************************
+ */
+static uint
+mpsc_tx_empty(struct uart_port *port)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        ulong iflags;
+        uint rc;
+
+        spin_lock_irqsave(&pi->port.lock, iflags);
+        rc = mpsc_sdma_tx_active(pi) ? 0 : TIOCSER_TEMT;
+        spin_unlock_irqrestore(&pi->port.lock, iflags);
+
+        return rc;
+}
+
+static void
+mpsc_set_mctrl(struct uart_port *port, uint mctrl)
+{
+        /* Have no way to set modem control lines AFAICT */
+        return;
+}
+
+static uint
+mpsc_get_mctrl(struct uart_port *port)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        u32 mflags, status;
+        ulong iflags;
+
+        spin_lock_irqsave(&pi->port.lock, iflags);
+        status = (pi->mirror_regs) ? pi->MPSC_CHR_10_m :
+                readl(pi->mpsc_base + MPSC_CHR_10);
+        spin_unlock_irqrestore(&pi->port.lock, iflags);
+
+        mflags = 0;
+        if (status & 0x1)
+                mflags |= TIOCM_CTS;
+        if (status & 0x2)
+                mflags |= TIOCM_CAR;
+
+        return mflags | TIOCM_DSR;      /* No way to tell if DSR asserted */
+}
+
+static void
+mpsc_stop_tx(struct uart_port *port, uint tty_start)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+
+        pr_debug("mpsc_stop_tx[%d]: tty_start: %d\n", port->line, tty_start);
+
+        mpsc_freeze(pi);
+        return;
+}
+
+static void
+mpsc_start_tx(struct uart_port *port, uint tty_start)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+
+        mpsc_unfreeze(pi);
+        mpsc_copy_tx_data(pi);
+        mpsc_sdma_start_tx(pi);
+
+        pr_debug("mpsc_start_tx[%d]: tty_start: %d\n", port->line, tty_start);
+        return;
+}
+
+static void
+mpsc_start_rx(struct mpsc_port_info *pi)
+{
+        pr_debug("mpsc_start_rx[%d]: Starting...\n", pi->port.line);
+
+        if (pi->rcv_data) {
+                mpsc_enter_hunt(pi);
+                mpsc_sdma_cmd(pi, SDMA_SDCM_ERD);
+        }
+        return;
+}
+
+static void
+mpsc_stop_rx(struct uart_port *port)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+
+        pr_debug("mpsc_stop_rx[%d]: Stopping...\n", port->line);
+
+        mpsc_sdma_cmd(pi, SDMA_SDCM_AR);
+        return;
+}
+
+static void
+mpsc_enable_ms(struct uart_port *port)
+{
+        return;                 /* Not supported */
+}
+
+static void
+mpsc_break_ctl(struct uart_port *port, int ctl)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        ulong   flags;
+        u32     v;
+
+        v = ctl ? 0x00ff0000 : 0;
+
+        spin_lock_irqsave(&pi->port.lock, flags);
+        if (pi->mirror_regs)
+                pi->MPSC_CHR_1_m = v;
+        writel(v, pi->mpsc_base + MPSC_CHR_1);
+        spin_unlock_irqrestore(&pi->port.lock, flags);
+
+        return;
+}
+
+static int
+mpsc_startup(struct uart_port *port)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        u32 flag = 0;
+        int rc;
+
+        pr_debug("mpsc_startup[%d]: Starting up MPSC, irq: %d\n",
+                port->line, pi->port.irq);
+
+        if ((rc = mpsc_make_ready(pi)) == 0) {
+                /* Setup IRQ handler */
+                mpsc_sdma_intr_ack(pi);
+
+                /* If irq's are shared, need to set flag */
+                if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq)
+                        flag = SA_SHIRQ;
+
+                if (request_irq(pi->port.irq, mpsc_sdma_intr, flag,
+                                "mpsc/sdma", pi))
+                        printk(KERN_ERR "MPSC: Can't get SDMA IRQ %d\n",
+                               pi->port.irq);
+
+                mpsc_sdma_intr_unmask(pi, 0xf);
+                mpsc_sdma_set_rx_ring(pi, (struct mpsc_rx_desc *)(pi->rxr_p +
+                        (pi->rxr_posn * MPSC_RXRE_SIZE)));
+        }
+
+        return rc;
+}
+
+static void
+mpsc_shutdown(struct uart_port *port)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        static void mpsc_release_port(struct uart_port *port);
+
+        pr_debug("mpsc_shutdown[%d]: Shutting down MPSC\n", port->line);
+
+        mpsc_sdma_stop(pi);
+        free_irq(pi->port.irq, pi);
+        return;
+}
+
+static void
+mpsc_set_termios(struct uart_port *port, struct termios *termios,
+                 struct termios *old)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        u32 baud;
+        ulong flags;
+        u32 chr_bits, stop_bits, par;
+
+        pi->c_iflag = termios->c_iflag;
+        pi->c_cflag = termios->c_cflag;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                chr_bits = MPSC_MPCR_CL_5;
+                break;
+        case CS6:
+                chr_bits = MPSC_MPCR_CL_6;
+                break;
+        case CS7:
+                chr_bits = MPSC_MPCR_CL_7;
+                break;
+        case CS8:
+        default:
+                chr_bits = MPSC_MPCR_CL_8;
+                break;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                stop_bits = MPSC_MPCR_SBL_2;
+        else
+                stop_bits = MPSC_MPCR_SBL_1;
+
+        par = MPSC_CHR_2_PAR_EVEN;
+        if (termios->c_cflag & PARENB)
+                if (termios->c_cflag & PARODD)
+                        par = MPSC_CHR_2_PAR_ODD;
+#ifdef  CMSPAR
+                if (termios->c_cflag & CMSPAR) {
+                        if (termios->c_cflag & PARODD)
+                                par = MPSC_CHR_2_PAR_MARK;
+                        else
+                                par = MPSC_CHR_2_PAR_SPACE;
+                }
+#endif
+
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk);
+
+        spin_lock_irqsave(&pi->port.lock, flags);
+
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        mpsc_set_char_length(pi, chr_bits);
+        mpsc_set_stop_bit_length(pi, stop_bits);
+        mpsc_set_parity(pi, par);
+        mpsc_set_baudrate(pi, baud);
+
+        /* Characters/events to read */
+        pi->rcv_data = 1;
+        pi->port.read_status_mask = SDMA_DESC_CMDSTAT_OR;
+
+        if (termios->c_iflag & INPCK)
+                pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE |
+                    SDMA_DESC_CMDSTAT_FR;
+
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_BR;
+
+        /* Characters/events to ignore */
+        pi->port.ignore_status_mask = 0;
+
+        if (termios->c_iflag & IGNPAR)
+                pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_PE |
+                    SDMA_DESC_CMDSTAT_FR;
+
+        if (termios->c_iflag & IGNBRK) {
+                pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_BR;
+
+                if (termios->c_iflag & IGNPAR)
+                        pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_OR;
+        }
+
+        /* Ignore all chars if CREAD not set */
+        if (!(termios->c_cflag & CREAD))
+                pi->rcv_data = 0;
+        else
+                mpsc_start_rx(pi);
+
+        spin_unlock_irqrestore(&pi->port.lock, flags);
+        return;
+}
+
+static const char *
+mpsc_type(struct uart_port *port)
+{
+        pr_debug("mpsc_type[%d]: port type: %s\n", port->line,MPSC_DRIVER_NAME);
+        return MPSC_DRIVER_NAME;
+}
+
+static int
+mpsc_request_port(struct uart_port *port)
+{
+        /* Should make chip/platform specific call */
+        return 0;
+}
+
+static void
+mpsc_release_port(struct uart_port *port)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+
+        if (pi->ready) {
+                mpsc_uninit_rings(pi);
+                mpsc_free_ring_mem(pi);
+                pi->ready = 0;
+        }
+
+        return;
+}
+
+static void
+mpsc_config_port(struct uart_port *port, int flags)
+{
+        return;
+}
+
+static int
+mpsc_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
+        int rc = 0;
+
+        pr_debug("mpsc_verify_port[%d]: Verifying port data\n", pi->port.line);
+
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_MPSC)
+                rc = -EINVAL;
+        else if (pi->port.irq != ser->irq)
+                rc = -EINVAL;
+        else if (ser->io_type != SERIAL_IO_MEM)
+                rc = -EINVAL;
+        else if (pi->port.uartclk / 16 != ser->baud_base) /* Not sure */
+                rc = -EINVAL;
+        else if ((void *)pi->port.mapbase != ser->iomem_base)
+                rc = -EINVAL;
+        else if (pi->port.iobase != ser->port)
+                rc = -EINVAL;
+        else if (ser->hub6 != 0)
+                rc = -EINVAL;
+
+        return rc;
+}
+
+static struct uart_ops mpsc_pops = {
+        .tx_empty     = mpsc_tx_empty,
+        .set_mctrl    = mpsc_set_mctrl,
+        .get_mctrl    = mpsc_get_mctrl,
+        .stop_tx      = mpsc_stop_tx,
+        .start_tx     = mpsc_start_tx,
+        .stop_rx      = mpsc_stop_rx,
+        .enable_ms    = mpsc_enable_ms,
+        .break_ctl    = mpsc_break_ctl,
+        .startup      = mpsc_startup,
+        .shutdown     = mpsc_shutdown,
+        .set_termios  = mpsc_set_termios,
+        .type         = mpsc_type,
+        .release_port = mpsc_release_port,
+        .request_port = mpsc_request_port,
+        .config_port  = mpsc_config_port,
+        .verify_port  = mpsc_verify_port,
+};
+
+/*
+ ******************************************************************************
+ *
+ * Console Interface Routines
+ *
+ ******************************************************************************
+ */
+
+#ifdef CONFIG_SERIAL_MPSC_CONSOLE
+static void
+mpsc_console_write(struct console *co, const char *s, uint count)
+{
+        struct mpsc_port_info *pi = &mpsc_ports[co->index];
+        u8 *bp, *dp, add_cr = 0;
+        int i;
+
+        while (mpsc_sdma_tx_active(pi))
+                udelay(100);
+
+        while (count > 0) {
+                bp = dp = pi->txb + (pi->txr_head * MPSC_TXBE_SIZE);
+
+                for (i = 0; i < MPSC_TXBE_SIZE; i++) {
+                        if (count == 0)
+                                break;
+
+                        if (add_cr) {
+                                *(dp++) = '\r';
+                                add_cr = 0;
+                        }
+                        else {
+                                *(dp++) = *s;
+
+                                if (*(s++) == '\n') { /* add '\r' after '\n' */
+                                        add_cr = 1;
+                                        count++;
+                                }
+                        }
+
+                        count--;
+                }
+
+                dma_cache_sync((void *) bp, MPSC_TXBE_SIZE, DMA_BIDIRECTIONAL);
+#if defined(CONFIG_PPC32) && !defined(CONFIG_NOT_COHERENT_CACHE)
+                if (pi->cache_mgmt) /* GT642[46]0 Res #COMM-2 */
+                        flush_dcache_range((ulong)bp,
+                                (ulong)bp + MPSC_TXBE_SIZE);
+#endif
+                mpsc_setup_tx_desc(pi, i, 0);
+                pi->txr_head = (pi->txr_head + 1) & (MPSC_TXR_ENTRIES - 1);
+                mpsc_sdma_start_tx(pi);
+
+                while (mpsc_sdma_tx_active(pi))
+                        udelay(100);
+
+                pi->txr_tail = (pi->txr_tail + 1) & (MPSC_TXR_ENTRIES - 1);
+        }
+
+        return;
+}
+
+static int __init
+mpsc_console_setup(struct console *co, char *options)
+{
+        struct mpsc_port_info *pi;
+        int baud, bits, parity, flow;
+
+        pr_debug("mpsc_console_setup[%d]: options: %s\n", co->index, options);
+
+        if (co->index >= MPSC_NUM_CTLRS)
+                co->index = 0;
+
+        pi = &mpsc_ports[co->index];
+
+        baud = pi->default_baud;
+        bits = pi->default_bits;
+        parity = pi->default_parity;
+        flow = pi->default_flow;
+
+        if (!pi->port.ops)
+                return -ENODEV;
+
+        spin_lock_init(&pi->port.lock); /* Temporary fix--copied from 8250.c */
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(&pi->port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver mpsc_reg;
+static struct console mpsc_console = {
+        .name   = MPSC_DEV_NAME,
+        .write  = mpsc_console_write,
+        .device = uart_console_device,
+        .setup  = mpsc_console_setup,
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,
+        .data   = &mpsc_reg,
+};
+
+static int __init
+mpsc_late_console_init(void)
+{
+        pr_debug("mpsc_late_console_init: Enter\n");
+
+        if (!(mpsc_console.flags & CON_ENABLED))
+                register_console(&mpsc_console);
+        return 0;
+}
+
+late_initcall(mpsc_late_console_init);
+
+#define MPSC_CONSOLE    &mpsc_console
+#else
+#define MPSC_CONSOLE    NULL
+#endif
+/*
+ ******************************************************************************
+ *
+ * Dummy Platform Driver to extract & map shared register regions
+ *
+ ******************************************************************************
+ */
+static void
+mpsc_resource_err(char *s)
+{
+        printk(KERN_WARNING "MPSC: Platform device resource error in %s\n", s);
+        return;
+}
+
+static int
+mpsc_shared_map_regs(struct platform_device *pd)
+{
+        struct resource *r;
+
+        if ((r = platform_get_resource(pd, IORESOURCE_MEM,
+                MPSC_ROUTING_BASE_ORDER)) && request_mem_region(r->start,
+                MPSC_ROUTING_REG_BLOCK_SIZE, "mpsc_routing_regs")) {
+
+                mpsc_shared_regs.mpsc_routing_base = ioremap(r->start,
+                        MPSC_ROUTING_REG_BLOCK_SIZE);
+                mpsc_shared_regs.mpsc_routing_base_p = r->start;
+        }
+        else {
+                mpsc_resource_err("MPSC routing base");
+                return -ENOMEM;
+        }
+
+        if ((r = platform_get_resource(pd, IORESOURCE_MEM,
+                MPSC_SDMA_INTR_BASE_ORDER)) && request_mem_region(r->start,
+                MPSC_SDMA_INTR_REG_BLOCK_SIZE, "sdma_intr_regs")) {
+
+                mpsc_shared_regs.sdma_intr_base = ioremap(r->start,
+                        MPSC_SDMA_INTR_REG_BLOCK_SIZE);
+                mpsc_shared_regs.sdma_intr_base_p = r->start;
+        }
+        else {
+                iounmap(mpsc_shared_regs.mpsc_routing_base);
+                release_mem_region(mpsc_shared_regs.mpsc_routing_base_p,
+                        MPSC_ROUTING_REG_BLOCK_SIZE);
+                mpsc_resource_err("SDMA intr base");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void
+mpsc_shared_unmap_regs(void)
+{
+        if (!mpsc_shared_regs.mpsc_routing_base) {
+                iounmap(mpsc_shared_regs.mpsc_routing_base);
+                release_mem_region(mpsc_shared_regs.mpsc_routing_base_p,
+                        MPSC_ROUTING_REG_BLOCK_SIZE);
+        }
+        if (!mpsc_shared_regs.sdma_intr_base) {
+                iounmap(mpsc_shared_regs.sdma_intr_base);
+                release_mem_region(mpsc_shared_regs.sdma_intr_base_p,
+                        MPSC_SDMA_INTR_REG_BLOCK_SIZE);
+        }
+
+        mpsc_shared_regs.mpsc_routing_base = 0;
+        mpsc_shared_regs.sdma_intr_base = 0;
+
+        mpsc_shared_regs.mpsc_routing_base_p = 0;
+        mpsc_shared_regs.sdma_intr_base_p = 0;
+
+        return;
+}
+
+static int
+mpsc_shared_drv_probe(struct device *dev)
+{
+        struct platform_device          *pd = to_platform_device(dev);
+        struct mpsc_shared_pdata        *pdata;
+        int                              rc = -ENODEV;
+
+        if (pd->id == 0) {
+                if (!(rc = mpsc_shared_map_regs(pd)))  {
+                        pdata = (struct mpsc_shared_pdata *)dev->platform_data;
+
+                        mpsc_shared_regs.MPSC_MRR_m = pdata->mrr_val;
+                        mpsc_shared_regs.MPSC_RCRR_m= pdata->rcrr_val;
+                        mpsc_shared_regs.MPSC_TCRR_m= pdata->tcrr_val;
+                        mpsc_shared_regs.SDMA_INTR_CAUSE_m =
+                                pdata->intr_cause_val;
+                        mpsc_shared_regs.SDMA_INTR_MASK_m =
+                                pdata->intr_mask_val;
+
+                        rc = 0;
+                }
+        }
+
+        return rc;
+}
+
+static int
+mpsc_shared_drv_remove(struct device *dev)
+{
+        struct platform_device  *pd = to_platform_device(dev);
+        int     rc = -ENODEV;
+
+        if (pd->id == 0) {
+                mpsc_shared_unmap_regs();
+                mpsc_shared_regs.MPSC_MRR_m = 0;
+                mpsc_shared_regs.MPSC_RCRR_m = 0;
+                mpsc_shared_regs.MPSC_TCRR_m = 0;
+                mpsc_shared_regs.SDMA_INTR_CAUSE_m = 0;
+                mpsc_shared_regs.SDMA_INTR_MASK_m = 0;
+                rc = 0;
+        }
+
+        return rc;
+}
+
+static struct device_driver mpsc_shared_driver = {
+        .name   = MPSC_SHARED_NAME,
+        .bus    = &platform_bus_type,
+        .probe  = mpsc_shared_drv_probe,
+        .remove = mpsc_shared_drv_remove,
+};
+
+/*
+ ******************************************************************************
+ *
+ * Driver Interface Routines
+ *
+ ******************************************************************************
+ */
+static struct uart_driver mpsc_reg = {
+        .owner       = THIS_MODULE,
+        .driver_name = MPSC_DRIVER_NAME,
+        .devfs_name  = MPSC_DEVFS_NAME,
+        .dev_name    = MPSC_DEV_NAME,
+        .major       = MPSC_MAJOR,
+        .minor       = MPSC_MINOR_START,
+        .nr          = MPSC_NUM_CTLRS,
+        .cons        = MPSC_CONSOLE,
+};
+
+static int
+mpsc_drv_map_regs(struct mpsc_port_info *pi, struct platform_device *pd)
+{
+        struct resource *r;
+
+        if ((r = platform_get_resource(pd, IORESOURCE_MEM, MPSC_BASE_ORDER)) &&
+                request_mem_region(r->start, MPSC_REG_BLOCK_SIZE, "mpsc_regs")){
+
+                pi->mpsc_base = ioremap(r->start, MPSC_REG_BLOCK_SIZE);
+                pi->mpsc_base_p = r->start;
+        }
+        else {
+                mpsc_resource_err("MPSC base");
+                return -ENOMEM;
+        }
+
+        if ((r = platform_get_resource(pd, IORESOURCE_MEM,
+                MPSC_SDMA_BASE_ORDER)) && request_mem_region(r->start,
+                MPSC_SDMA_REG_BLOCK_SIZE, "sdma_regs")) {
+
+                pi->sdma_base = ioremap(r->start,MPSC_SDMA_REG_BLOCK_SIZE);
+                pi->sdma_base_p = r->start;
+        }
+        else {
+                mpsc_resource_err("SDMA base");
+                return -ENOMEM;
+        }
+
+        if ((r = platform_get_resource(pd,IORESOURCE_MEM,MPSC_BRG_BASE_ORDER))
+                && request_mem_region(r->start, MPSC_BRG_REG_BLOCK_SIZE,
+                "brg_regs")) {
+
+                pi->brg_base = ioremap(r->start, MPSC_BRG_REG_BLOCK_SIZE);
+                pi->brg_base_p = r->start;
+        }
+        else {
+                mpsc_resource_err("BRG base");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void
+mpsc_drv_unmap_regs(struct mpsc_port_info *pi)
+{
+        if (!pi->mpsc_base) {
+                iounmap(pi->mpsc_base);
+                release_mem_region(pi->mpsc_base_p, MPSC_REG_BLOCK_SIZE);
+        }
+        if (!pi->sdma_base) {
+                iounmap(pi->sdma_base);
+                release_mem_region(pi->sdma_base_p, MPSC_SDMA_REG_BLOCK_SIZE);
+        }
+        if (!pi->brg_base) {
+                iounmap(pi->brg_base);
+                release_mem_region(pi->brg_base_p, MPSC_BRG_REG_BLOCK_SIZE);
+        }
+
+        pi->mpsc_base = 0;
+        pi->sdma_base = 0;
+        pi->brg_base = 0;
+
+        pi->mpsc_base_p = 0;
+        pi->sdma_base_p = 0;
+        pi->brg_base_p = 0;
+
+        return;
+}
+
+static void
+mpsc_drv_get_platform_data(struct mpsc_port_info *pi,
+        struct platform_device *pd, int num)
+{
+        struct mpsc_pdata       *pdata;
+
+        pdata = (struct mpsc_pdata *)pd->dev.platform_data;
+
+        pi->port.uartclk = pdata->brg_clk_freq;
+        pi->port.iotype = UPIO_MEM;
+        pi->port.line = num;
+        pi->port.type = PORT_MPSC;
+        pi->port.fifosize = MPSC_TXBE_SIZE;
+        pi->port.membase = pi->mpsc_base;
+        pi->port.mapbase = (ulong)pi->mpsc_base;
+        pi->port.ops = &mpsc_pops;
+
+        pi->mirror_regs = pdata->mirror_regs;
+        pi->cache_mgmt = pdata->cache_mgmt;
+        pi->brg_can_tune = pdata->brg_can_tune;
+        pi->brg_clk_src = pdata->brg_clk_src;
+        pi->mpsc_max_idle = pdata->max_idle;
+        pi->default_baud = pdata->default_baud;
+        pi->default_bits = pdata->default_bits;
+        pi->default_parity = pdata->default_parity;
+        pi->default_flow = pdata->default_flow;
+
+        /* Initial values of mirrored regs */
+        pi->MPSC_CHR_1_m = pdata->chr_1_val;
+        pi->MPSC_CHR_2_m = pdata->chr_2_val;
+        pi->MPSC_CHR_10_m = pdata->chr_10_val;
+        pi->MPSC_MPCR_m = pdata->mpcr_val;
+        pi->BRG_BCR_m = pdata->bcr_val;
+
+        pi->shared_regs = &mpsc_shared_regs;
+
+        pi->port.irq = platform_get_irq(pd, 0);
+
+        return;
+}
+
+static int
+mpsc_drv_probe(struct device *dev)
+{
+        struct platform_device  *pd = to_platform_device(dev);
+        struct mpsc_port_info   *pi;
+        int                     rc = -ENODEV;
+
+        pr_debug("mpsc_drv_probe: Adding MPSC %d\n", pd->id);
+
+        if (pd->id < MPSC_NUM_CTLRS) {
+                pi = &mpsc_ports[pd->id];
+
+                if (!(rc = mpsc_drv_map_regs(pi, pd))) {
+                        mpsc_drv_get_platform_data(pi, pd, pd->id);
+
+                        if (!(rc = mpsc_make_ready(pi)))
+                                if (!(rc = uart_add_one_port(&mpsc_reg,
+                                        &pi->port)))
+                                        rc = 0;
+                                else {
+                                        mpsc_release_port(
+                                                (struct uart_port *)pi);
+                                        mpsc_drv_unmap_regs(pi);
+                                }
+                        else
+                                mpsc_drv_unmap_regs(pi);
+                }
+        }
+
+        return rc;
+}
+
+static int
+mpsc_drv_remove(struct device *dev)
+{
+        struct platform_device  *pd = to_platform_device(dev);
+
+        pr_debug("mpsc_drv_exit: Removing MPSC %d\n", pd->id);
+
+        if (pd->id < MPSC_NUM_CTLRS) {
+                uart_remove_one_port(&mpsc_reg, &mpsc_ports[pd->id].port);
+                mpsc_release_port((struct uart_port *)&mpsc_ports[pd->id].port);
+                mpsc_drv_unmap_regs(&mpsc_ports[pd->id]);
+                return 0;
+        }
+        else
+                return -ENODEV;
+}
+
+static struct device_driver mpsc_driver = {
+        .name   = MPSC_CTLR_NAME,
+        .bus    = &platform_bus_type,
+        .probe  = mpsc_drv_probe,
+        .remove = mpsc_drv_remove,
+};
+
+static int __init
+mpsc_drv_init(void)
+{
+        int     rc;
+
+        printk(KERN_INFO "Serial: MPSC driver $Revision: 1.00 $\n");
+
+        memset(mpsc_ports, 0, sizeof(mpsc_ports));
+        memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
+
+        if (!(rc = uart_register_driver(&mpsc_reg))) {
+                if (!(rc = driver_register(&mpsc_shared_driver))) {
+                        if ((rc = driver_register(&mpsc_driver))) {
+                                driver_unregister(&mpsc_shared_driver);
+                                uart_unregister_driver(&mpsc_reg);
+                        }
+                }
+                else
+                        uart_unregister_driver(&mpsc_reg);
+        }
+
+        return rc;
+
+}
+
+static void __exit
+mpsc_drv_exit(void)
+{
+        driver_unregister(&mpsc_driver);
+        driver_unregister(&mpsc_shared_driver);
+        uart_unregister_driver(&mpsc_reg);
+        memset(mpsc_ports, 0, sizeof(mpsc_ports));
+        memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
+        return;
+}
+
+module_init(mpsc_drv_init);
+module_exit(mpsc_drv_exit);
+
+MODULE_AUTHOR("Mark A. Greer <mgreer@mvista.com>");
+MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver $Revision: 1.00 $");
+MODULE_VERSION(MPSC_VERSION);
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV_MAJOR(MPSC_MAJOR);
diff --git a/drivers/serial/mpsc.h b/drivers/serial/mpsc.h
new file mode 100644
index 000000000000..1f7294b7095f
--- /dev/null
+++ b/drivers/serial/mpsc.h
@@ -0,0 +1,289 @@
+/*
+ * drivers/serial/mpsc.h
+ *
+ * Author: Mark A. Greer <mgreer@mvista.com>
+ *
+ * 2004 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#ifndef __MPSC_H__
+#define __MPSC_H__
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/mv643xx.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#define MPSC_NUM_CTLRS          2
+
+/*
+ * Descriptors and buffers must be cache line aligned.
+ * Buffers lengths must be multiple of cache line size.
+ * Number of Tx & Rx descriptors must be powers of 2.
+ */
+#define MPSC_RXR_ENTRIES        32
+#define MPSC_RXRE_SIZE          dma_get_cache_alignment()
+#define MPSC_RXR_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXRE_SIZE)
+#define MPSC_RXBE_SIZE          dma_get_cache_alignment()
+#define MPSC_RXB_SIZE           (MPSC_RXR_ENTRIES * MPSC_RXBE_SIZE)
+
+#define MPSC_TXR_ENTRIES        32
+#define MPSC_TXRE_SIZE          dma_get_cache_alignment()
+#define MPSC_TXR_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXRE_SIZE)
+#define MPSC_TXBE_SIZE          dma_get_cache_alignment()
+#define MPSC_TXB_SIZE           (MPSC_TXR_ENTRIES * MPSC_TXBE_SIZE)
+
+#define MPSC_DMA_ALLOC_SIZE     (MPSC_RXR_SIZE + MPSC_RXB_SIZE +        \
+                                MPSC_TXR_SIZE + MPSC_TXB_SIZE +         \
+                                dma_get_cache_alignment() /* for alignment */)
+
+/* Rx and Tx Ring entry descriptors -- assume entry size is <= cacheline size */
+struct mpsc_rx_desc {
+        u16 bufsize;
+        u16 bytecnt;
+        u32 cmdstat;
+        u32 link;
+        u32 buf_ptr;
+} __attribute((packed));
+
+struct mpsc_tx_desc {
+        u16 bytecnt;
+        u16 shadow;
+        u32 cmdstat;
+        u32 link;
+        u32 buf_ptr;
+} __attribute((packed));
+
+/*
+ * Some regs that have the erratum that you can't read them are are shared
+ * between the two MPSC controllers.  This struct contains those shared regs.
+ */
+struct mpsc_shared_regs {
+        phys_addr_t mpsc_routing_base_p;
+        phys_addr_t sdma_intr_base_p;
+
+        void *mpsc_routing_base;
+        void *sdma_intr_base;
+
+        u32 MPSC_MRR_m;
+        u32 MPSC_RCRR_m;
+        u32 MPSC_TCRR_m;
+        u32 SDMA_INTR_CAUSE_m;
+        u32 SDMA_INTR_MASK_m;
+};
+
+/* The main driver data structure */
+struct mpsc_port_info {
+        struct uart_port port;  /* Overlay uart_port structure */
+
+        /* Internal driver state for this ctlr */
+        u8 ready;
+        u8 rcv_data;
+        tcflag_t c_iflag;       /* save termios->c_iflag */
+        tcflag_t c_cflag;       /* save termios->c_cflag */
+
+        /* Info passed in from platform */
+        u8 mirror_regs;         /* Need to mirror regs? */
+        u8 cache_mgmt;          /* Need manual cache mgmt? */
+        u8 brg_can_tune;        /* BRG has baud tuning? */
+        u32 brg_clk_src;
+        u16 mpsc_max_idle;
+        int default_baud;
+        int default_bits;
+        int default_parity;
+        int default_flow;
+
+        /* Physical addresses of various blocks of registers (from platform) */
+        phys_addr_t mpsc_base_p;
+        phys_addr_t sdma_base_p;
+        phys_addr_t brg_base_p;
+
+        /* Virtual addresses of various blocks of registers (from platform) */
+        void *mpsc_base;
+        void *sdma_base;
+        void *brg_base;
+
+        /* Descriptor ring and buffer allocations */
+        void *dma_region;
+        dma_addr_t dma_region_p;
+
+        dma_addr_t rxr;         /* Rx descriptor ring */
+        dma_addr_t rxr_p;       /* Phys addr of rxr */
+        u8 *rxb;                /* Rx Ring I/O buf */
+        u8 *rxb_p;              /* Phys addr of rxb */
+        u32 rxr_posn;           /* First desc w/ Rx data */
+
+        dma_addr_t txr;         /* Tx descriptor ring */
+        dma_addr_t txr_p;       /* Phys addr of txr */
+        u8 *txb;                /* Tx Ring I/O buf */
+        u8 *txb_p;              /* Phys addr of txb */
+        int txr_head;           /* Where new data goes */
+        int txr_tail;           /* Where sent data comes off */
+
+        /* Mirrored values of regs we can't read (if 'mirror_regs' set) */
+        u32 MPSC_MPCR_m;
+        u32 MPSC_CHR_1_m;
+        u32 MPSC_CHR_2_m;
+        u32 MPSC_CHR_10_m;
+        u32 BRG_BCR_m;
+        struct mpsc_shared_regs *shared_regs;
+};
+
+/* Hooks to platform-specific code */
+int mpsc_platform_register_driver(void);
+void mpsc_platform_unregister_driver(void);
+
+/* Hooks back in to mpsc common to be called by platform-specific code */
+struct mpsc_port_info *mpsc_device_probe(int index);
+struct mpsc_port_info *mpsc_device_remove(int index);
+
+/*
+ *****************************************************************************
+ *
+ *      Multi-Protocol Serial Controller Interface Registers
+ *
+ *****************************************************************************
+ */
+
+/* Main Configuratino Register Offsets */
+#define MPSC_MMCRL                      0x0000
+#define MPSC_MMCRH                      0x0004
+#define MPSC_MPCR                       0x0008
+#define MPSC_CHR_1                      0x000c
+#define MPSC_CHR_2                      0x0010
+#define MPSC_CHR_3                      0x0014
+#define MPSC_CHR_4                      0x0018
+#define MPSC_CHR_5                      0x001c
+#define MPSC_CHR_6                      0x0020
+#define MPSC_CHR_7                      0x0024
+#define MPSC_CHR_8                      0x0028
+#define MPSC_CHR_9                      0x002c
+#define MPSC_CHR_10                     0x0030
+#define MPSC_CHR_11                     0x0034
+
+#define MPSC_MPCR_FRZ                   (1 << 9)
+#define MPSC_MPCR_CL_5                  0
+#define MPSC_MPCR_CL_6                  1
+#define MPSC_MPCR_CL_7                  2
+#define MPSC_MPCR_CL_8                  3
+#define MPSC_MPCR_SBL_1                 0
+#define MPSC_MPCR_SBL_2                 1
+
+#define MPSC_CHR_2_TEV                  (1<<1)
+#define MPSC_CHR_2_TA                   (1<<7)
+#define MPSC_CHR_2_TTCS                 (1<<9)
+#define MPSC_CHR_2_REV                  (1<<17)
+#define MPSC_CHR_2_RA                   (1<<23)
+#define MPSC_CHR_2_CRD                  (1<<25)
+#define MPSC_CHR_2_EH                   (1<<31)
+#define MPSC_CHR_2_PAR_ODD              0
+#define MPSC_CHR_2_PAR_SPACE            1
+#define MPSC_CHR_2_PAR_EVEN             2
+#define MPSC_CHR_2_PAR_MARK             3
+
+/* MPSC Signal Routing */
+#define MPSC_MRR                        0x0000
+#define MPSC_RCRR                       0x0004
+#define MPSC_TCRR                       0x0008
+
+/*
+ *****************************************************************************
+ *
+ *      Serial DMA Controller Interface Registers
+ *
+ *****************************************************************************
+ */
+
+#define SDMA_SDC                        0x0000
+#define SDMA_SDCM                       0x0008
+#define SDMA_RX_DESC                    0x0800
+#define SDMA_RX_BUF_PTR                 0x0808
+#define SDMA_SCRDP                      0x0810
+#define SDMA_TX_DESC                    0x0c00
+#define SDMA_SCTDP                      0x0c10
+#define SDMA_SFTDP                      0x0c14
+
+#define SDMA_DESC_CMDSTAT_PE            (1<<0)
+#define SDMA_DESC_CMDSTAT_CDL           (1<<1)
+#define SDMA_DESC_CMDSTAT_FR            (1<<3)
+#define SDMA_DESC_CMDSTAT_OR            (1<<6)
+#define SDMA_DESC_CMDSTAT_BR            (1<<9)
+#define SDMA_DESC_CMDSTAT_MI            (1<<10)
+#define SDMA_DESC_CMDSTAT_A             (1<<11)
+#define SDMA_DESC_CMDSTAT_AM            (1<<12)
+#define SDMA_DESC_CMDSTAT_CT            (1<<13)
+#define SDMA_DESC_CMDSTAT_C             (1<<14)
+#define SDMA_DESC_CMDSTAT_ES            (1<<15)
+#define SDMA_DESC_CMDSTAT_L             (1<<16)
+#define SDMA_DESC_CMDSTAT_F             (1<<17)
+#define SDMA_DESC_CMDSTAT_P             (1<<18)
+#define SDMA_DESC_CMDSTAT_EI            (1<<23)
+#define SDMA_DESC_CMDSTAT_O             (1<<31)
+
+#define SDMA_DESC_DFLT                  (SDMA_DESC_CMDSTAT_O |  \
+                                        SDMA_DESC_CMDSTAT_EI)
+
+#define SDMA_SDC_RFT                    (1<<0)
+#define SDMA_SDC_SFM                    (1<<1)
+#define SDMA_SDC_BLMR                   (1<<6)
+#define SDMA_SDC_BLMT                   (1<<7)
+#define SDMA_SDC_POVR                   (1<<8)
+#define SDMA_SDC_RIFB                   (1<<9)
+
+#define SDMA_SDCM_ERD                   (1<<7)
+#define SDMA_SDCM_AR                    (1<<15)
+#define SDMA_SDCM_STD                   (1<<16)
+#define SDMA_SDCM_TXD                   (1<<23)
+#define SDMA_SDCM_AT                    (1<<31)
+
+#define SDMA_0_CAUSE_RXBUF              (1<<0)
+#define SDMA_0_CAUSE_RXERR              (1<<1)
+#define SDMA_0_CAUSE_TXBUF              (1<<2)
+#define SDMA_0_CAUSE_TXEND              (1<<3)
+#define SDMA_1_CAUSE_RXBUF              (1<<8)
+#define SDMA_1_CAUSE_RXERR              (1<<9)
+#define SDMA_1_CAUSE_TXBUF              (1<<10)
+#define SDMA_1_CAUSE_TXEND              (1<<11)
+
+#define SDMA_CAUSE_RX_MASK      (SDMA_0_CAUSE_RXBUF | SDMA_0_CAUSE_RXERR | \
+        SDMA_1_CAUSE_RXBUF | SDMA_1_CAUSE_RXERR)
+#define SDMA_CAUSE_TX_MASK      (SDMA_0_CAUSE_TXBUF | SDMA_0_CAUSE_TXEND | \
+        SDMA_1_CAUSE_TXBUF | SDMA_1_CAUSE_TXEND)
+
+/* SDMA Interrupt registers */
+#define SDMA_INTR_CAUSE                 0x0000
+#define SDMA_INTR_MASK                  0x0080
+
+/*
+ *****************************************************************************
+ *
+ *      Baud Rate Generator Interface Registers
+ *
+ *****************************************************************************
+ */
+
+#define BRG_BCR                         0x0000
+#define BRG_BTR                         0x0004
+
+#endif                          /* __MPSC_H__ */
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
new file mode 100644
index 000000000000..dadd7e19714e
--- /dev/null
+++ b/drivers/serial/mux.c
@@ -0,0 +1,539 @@
+/*
+** mux.c:
+**      serial driver for the Mux console found in some PA-RISC servers.
+**
+**      (c) Copyright 2002 Ryan Bradetich
+**      (c) Copyright 2002 Hewlett-Packard Company
+**
+** 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.
+**
+** This Driver currently only supports the console (port 0) on the MUX.
+** Additional work will be needed on this driver to enable the full
+** functionality of the MUX.
+**
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/slab.h>
+#include <linux/delay.h> /* for udelay */
+#include <linux/device.h>
+#include <asm/io.h>
+#include <asm/parisc-device.h>
+
+#ifdef CONFIG_MAGIC_SYSRQ
+#include <linux/sysrq.h>
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+#define MUX_OFFSET 0x800
+#define MUX_LINE_OFFSET 0x80
+
+#define MUX_FIFO_SIZE 255
+#define MUX_POLL_DELAY (30 * HZ / 1000)
+
+#define IO_DATA_REG_OFFSET 0x3c
+#define IO_DCOUNT_REG_OFFSET 0x40
+
+#define MUX_EOFIFO(status) ((status & 0xF000) == 0xF000)
+#define MUX_STATUS(status) ((status & 0xF000) == 0x8000)
+#define MUX_BREAK(status) ((status & 0xF000) == 0x2000)
+
+#define MUX_NR 256
+static unsigned int port_cnt = 0;
+static struct uart_port mux_ports[MUX_NR];
+
+static struct uart_driver mux_driver = {
+        .owner = THIS_MODULE,
+        .driver_name = "ttyB",
+        .dev_name = "ttyB",
+        .major = MUX_MAJOR,
+        .minor = 0,
+        .nr = MUX_NR,
+};
+
+static struct timer_list mux_timer;
+
+#define UART_PUT_CHAR(p, c) __raw_writel((c), (unsigned long)(p)->membase + IO_DATA_REG_OFFSET)
+#define UART_GET_FIFO_CNT(p) __raw_readl((unsigned long)(p)->membase + IO_DCOUNT_REG_OFFSET)
+#define GET_MUX_PORTS(iodc_data) ((((iodc_data)[4] & 0xf0) >> 4) * 8) + 8
+
+/**
+ * mux_tx_empty - Check if the transmitter fifo is empty.
+ * @port: Ptr to the uart_port.
+ *
+ * This function test if the transmitter fifo for the port
+ * described by 'port' is empty.  If it is empty, this function
+ * should return TIOCSER_TEMT, otherwise return 0.
+ */
+static unsigned int mux_tx_empty(struct uart_port *port)
+{
+        unsigned int cnt = __raw_readl((unsigned long)port->membase 
+                                + IO_DCOUNT_REG_OFFSET);
+
+        return cnt ? 0 : TIOCSER_TEMT;
+} 
+
+/**
+ * mux_set_mctrl - Set the current state of the modem control inputs.
+ * @ports: Ptr to the uart_port.
+ * @mctrl: Modem control bits.
+ *
+ * The Serial MUX does not support CTS, DCD or DSR so this function
+ * is ignored.
+ */
+static void mux_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+/**
+ * mux_get_mctrl - Returns the current state of modem control inputs.
+ * @port: Ptr to the uart_port.
+ *
+ * The Serial MUX does not support CTS, DCD or DSR so these lines are
+ * treated as permanently active.
+ */
+static unsigned int mux_get_mctrl(struct uart_port *port)
+{ 
+        return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+}
+
+/**
+ * mux_stop_tx - Stop transmitting characters.
+ * @port: Ptr to the uart_port.
+ * @tty_stop: tty layer issue this command?
+ *
+ * The Serial MUX does not support this function.
+ */
+static void mux_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+}
+
+/**
+ * mux_start_tx - Start transmitting characters.
+ * @port: Ptr to the uart_port.
+ * @tty_start: tty layer issue this command?
+ *
+ * The Serial Mux does not support this function.
+ */
+static void mux_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+}
+
+/**
+ * mux_stop_rx - Stop receiving characters.
+ * @port: Ptr to the uart_port.
+ *
+ * The Serial Mux does not support this function.
+ */
+static void mux_stop_rx(struct uart_port *port)
+{
+}
+
+/**
+ * mux_enable_ms - Enable modum status interrupts.
+ * @port: Ptr to the uart_port.
+ *
+ * The Serial Mux does not support this function.
+ */
+static void mux_enable_ms(struct uart_port *port)
+{
+}
+
+/**
+ * mux_break_ctl - Control the transmitssion of a break signal.
+ * @port: Ptr to the uart_port.
+ * @break_state: Raise/Lower the break signal.
+ *
+ * The Serial Mux does not support this function.
+ */
+static void mux_break_ctl(struct uart_port *port, int break_state)
+{
+}
+
+/**
+ * mux_write - Write chars to the mux fifo.
+ * @port: Ptr to the uart_port.
+ *
+ * This function writes all the data from the uart buffer to
+ * the mux fifo.
+ */
+static void mux_write(struct uart_port *port)
+{
+        int count;
+        struct circ_buf *xmit = &port->info->xmit;
+
+        if(port->x_char) {
+                UART_PUT_CHAR(port, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                return;
+        }
+
+        if(uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                mux_stop_tx(port, 0);
+                return;
+        }
+
+        count = (port->fifosize) - UART_GET_FIFO_CNT(port);
+        do {
+                UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if(uart_circ_empty(xmit))
+                        break;
+
+        } while(--count > 0);
+
+        while(UART_GET_FIFO_CNT(port)) 
+                udelay(1);
+
+        if(uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                mux_stop_tx(port, 0);
+}
+
+/**
+ * mux_read - Read chars from the mux fifo.
+ * @port: Ptr to the uart_port.
+ *
+ * This reads all available data from the mux's fifo and pushes
+ * the data to the tty layer.
+ */
+static void mux_read(struct uart_port *port)
+{
+        int data;
+        struct tty_struct *tty = port->info->tty;
+        __u32 start_count = port->icount.rx;
+
+        while(1) {
+                data = __raw_readl((unsigned long)port->membase
+                                                + IO_DATA_REG_OFFSET);
+
+                if (MUX_STATUS(data))
+                        continue;
+
+                if (MUX_EOFIFO(data))
+                        break;
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        continue;
+
+                *tty->flip.char_buf_ptr = data & 0xffu;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                port->icount.rx++;
+
+                if (MUX_BREAK(data)) {
+                        port->icount.brk++;
+                        if(uart_handle_break(port))
+                                continue;
+                }
+
+                if (uart_handle_sysrq_char(port, data & 0xffu, NULL))
+                        continue;
+
+                tty->flip.flag_buf_ptr++;
+                tty->flip.char_buf_ptr++;
+                tty->flip.count++;
+        }
+        
+        if (start_count != port->icount.rx) {
+                tty_flip_buffer_push(tty);
+        }
+}
+
+/**
+ * mux_startup - Initialize the port.
+ * @port: Ptr to the uart_port.
+ *
+ * Grab any resources needed for this port and start the
+ * mux timer.
+ */
+static int mux_startup(struct uart_port *port)
+{
+        mod_timer(&mux_timer, jiffies + MUX_POLL_DELAY);
+        return 0;
+}
+
+/**
+ * mux_shutdown - Disable the port.
+ * @port: Ptr to the uart_port.
+ *
+ * Release any resources needed for the port.
+ */
+static void mux_shutdown(struct uart_port *port)
+{
+}
+
+/**
+ * mux_set_termios - Chane port parameters.
+ * @port: Ptr to the uart_port.
+ * @termios: new termios settings.
+ * @old: old termios settings.
+ *
+ * The Serial Mux does not support this function.
+ */
+static void
+mux_set_termios(struct uart_port *port, struct termios *termios,
+                struct termios *old)
+{
+}
+
+/**
+ * mux_type - Describe the port.
+ * @port: Ptr to the uart_port.
+ *
+ * Return a pointer to a string constant describing the
+ * specified port.
+ */
+static const char *mux_type(struct uart_port *port)
+{
+        return "Mux";
+}
+
+/**
+ * mux_release_port - Release memory and IO regions.
+ * @port: Ptr to the uart_port.
+ * 
+ * Release any memory and IO region resources currently in use by
+ * the port.
+ */
+static void mux_release_port(struct uart_port *port)
+{
+}
+
+/**
+ * mux_request_port - Request memory and IO regions.
+ * @port: Ptr to the uart_port.
+ *
+ * Request any memory and IO region resources required by the port.
+ * If any fail, no resources should be registered when this function
+ * returns, and it should return -EBUSY on failure.
+ */
+static int mux_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/**
+ * mux_config_port - Perform port autoconfiguration.
+ * @port: Ptr to the uart_port.
+ * @type: Bitmask of required configurations.
+ *
+ * Perform any autoconfiguration steps for the port.  This functino is
+ * called if the UPF_BOOT_AUTOCONF flag is specified for the port.
+ * [Note: This is required for now because of a bug in the Serial core.
+ *  rmk has already submitted a patch to linus, should be available for
+ *  2.5.47.]
+ */
+static void mux_config_port(struct uart_port *port, int type)
+{
+        port->type = PORT_MUX;
+}
+
+/**
+ * mux_verify_port - Verify the port information.
+ * @port: Ptr to the uart_port.
+ * @ser: Ptr to the serial information.
+ *
+ * Verify the new serial port information contained within serinfo is
+ * suitable for this port type.
+ */
+static int mux_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        if(port->membase == NULL)
+                return -EINVAL;
+
+        return 0;
+}
+
+/**
+ * mux_drv_poll - Mux poll function.
+ * @unused: Unused variable
+ *
+ * This function periodically polls the Serial MUX to check for new data.
+ */
+static void mux_poll(unsigned long unused)
+{  
+        int i;
+
+        for(i = 0; i < port_cnt; ++i) {
+                if(!mux_ports[i].info)
+                        continue;
+
+                mux_read(&mux_ports[i]);
+                mux_write(&mux_ports[i]);
+        }
+
+        mod_timer(&mux_timer, jiffies + MUX_POLL_DELAY);
+}
+
+
+#ifdef CONFIG_SERIAL_MUX_CONSOLE
+static void mux_console_write(struct console *co, const char *s, unsigned count)
+{
+        while(count--)
+                pdc_iodc_putc(*s++);
+}
+
+static int mux_console_setup(struct console *co, char *options)
+{
+        return 0;
+}
+
+struct tty_driver *mux_console_device(struct console *co, int *index)
+{
+        *index = co->index;
+        return mux_driver.tty_driver;
+}
+
+static struct console mux_console = {
+        .name =         "ttyB",
+        .write =        mux_console_write,
+        .device =       mux_console_device,
+        .setup =        mux_console_setup,
+        .flags =        CON_ENABLED | CON_PRINTBUFFER,
+        .index =        0,
+};
+
+#define MUX_CONSOLE     &mux_console
+#else
+#define MUX_CONSOLE     NULL
+#endif
+
+static struct uart_ops mux_pops = {
+        .tx_empty =             mux_tx_empty,
+        .set_mctrl =            mux_set_mctrl,
+        .get_mctrl =            mux_get_mctrl,
+        .stop_tx =              mux_stop_tx,
+        .start_tx =             mux_start_tx,
+        .stop_rx =              mux_stop_rx,
+        .enable_ms =            mux_enable_ms,
+        .break_ctl =            mux_break_ctl,
+        .startup =              mux_startup,
+        .shutdown =             mux_shutdown,
+        .set_termios =          mux_set_termios,
+        .type =                 mux_type,
+        .release_port =         mux_release_port,
+        .request_port =         mux_request_port,
+        .config_port =          mux_config_port,
+        .verify_port =          mux_verify_port,
+};
+
+/**
+ * mux_probe - Determine if the Serial Mux should claim this device.
+ * @dev: The parisc device.
+ *
+ * Deterimine if the Serial Mux should claim this chip (return 0)
+ * or not (return 1).
+ */
+static int __init mux_probe(struct parisc_device *dev)
+{
+        int i, status, ports;
+        u8 iodc_data[32];
+        unsigned long bytecnt;
+        struct uart_port *port;
+
+        status = pdc_iodc_read(&bytecnt, dev->hpa, 0, iodc_data, 32);
+        if(status != PDC_OK) {
+                printk(KERN_ERR "Serial mux: Unable to read IODC.\n");
+                return 1;
+        }
+
+        ports = GET_MUX_PORTS(iodc_data);
+        printk(KERN_INFO "Serial mux driver (%d ports) Revision: 0.3\n", ports);
+
+        if(!port_cnt) {
+                mux_driver.cons = MUX_CONSOLE;
+
+                status = uart_register_driver(&mux_driver);
+                if(status) {
+                        printk(KERN_ERR "Serial mux: Unable to register driver.\n");
+                        return 1;
+                }
+
+                init_timer(&mux_timer);
+                mux_timer.function = mux_poll;
+        }
+
+        for(i = 0; i < ports; ++i, ++port_cnt) {
+                port = &mux_ports[port_cnt];
+                port->iobase    = 0;
+                port->mapbase   = dev->hpa + MUX_OFFSET + (i * MUX_LINE_OFFSET);
+                port->membase   = ioremap(port->mapbase, MUX_LINE_OFFSET);
+                port->iotype    = SERIAL_IO_MEM;
+                port->type      = PORT_MUX;
+                port->irq       = SERIAL_IRQ_NONE;
+                port->uartclk   = 0;
+                port->fifosize  = MUX_FIFO_SIZE;
+                port->ops       = &mux_pops;
+                port->flags     = UPF_BOOT_AUTOCONF;
+                port->line      = port_cnt;
+                status = uart_add_one_port(&mux_driver, port);
+                BUG_ON(status);
+        }
+
+#ifdef CONFIG_SERIAL_MUX_CONSOLE
+        register_console(&mux_console);
+#endif
+        return 0;
+}
+
+static struct parisc_device_id mux_tbl[] = {
+        { HPHW_A_DIRECT, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0000D },
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(parisc, mux_tbl);
+
+static struct parisc_driver serial_mux_driver = {
+        .name =         "Serial MUX",
+        .id_table =     mux_tbl,
+        .probe =        mux_probe,
+};
+
+/**
+ * mux_init - Serial MUX initalization procedure.
+ *
+ * Register the Serial MUX driver.
+ */
+static int __init mux_init(void)
+{
+        return register_parisc_driver(&serial_mux_driver);
+}
+
+/**
+ * mux_exit - Serial MUX cleanup procedure.
+ *
+ * Unregister the Serial MUX driver from the tty layer.
+ */
+static void __exit mux_exit(void)
+{
+        int i;
+
+        for (i = 0; i < port_cnt; i++) {
+                uart_remove_one_port(&mux_driver, &mux_ports[i]);
+        }
+
+        uart_unregister_driver(&mux_driver);
+}
+
+module_init(mux_init);
+module_exit(mux_exit);
+
+MODULE_AUTHOR("Ryan Bradetich");
+MODULE_DESCRIPTION("Serial MUX driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV_MAJOR(MUX_MAJOR);
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
new file mode 100644
index 000000000000..0a6b9f0ed23f
--- /dev/null
+++ b/drivers/serial/pmac_zilog.c
@@ -0,0 +1,2048 @@
+/*
+ * linux/drivers/serial/pmac_zilog.c
+ * 
+ * Driver for PowerMac Z85c30 based ESCC cell found in the
+ * "macio" ASICs of various PowerMac models
+ * 
+ * Copyright (C) 2003 Ben. Herrenschmidt (benh@kernel.crashing.org)
+ *
+ * Derived from drivers/macintosh/macserial.c by Paul Mackerras
+ * and drivers/serial/sunzilog.c by David S. Miller
+ *
+ * Hrm... actually, I ripped most of sunzilog (Thanks David !) and
+ * adapted special tweaks needed for us. I don't think it's worth
+ * merging back those though. The DMA code still has to get in
+ * and once done, I expect that driver to remain fairly stable in
+ * the long term, unless we change the driver model again...
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * 2004-08-06 Harald Welte <laforge@gnumonks.org>
+ *      - Enable BREAK interrupt
+ *      - Add support for sysreq
+ *
+ * TODO:   - Add DMA support
+ *         - Defer port shutdown to a few seconds after close
+ *         - maybe put something right into uap->clk_divisor
+ */
+
+#undef DEBUG
+#undef DEBUG_HARD
+#undef USE_CTRL_O_SYSRQ
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+
+#include <linux/tty_flip.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/fcntl.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/slab.h>
+#include <linux/adb.h>
+#include <linux/pmu.h>
+#include <linux/bitops.h>
+#include <linux/sysrq.h>
+#include <asm/sections.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/pmac_feature.h>
+#include <asm/dbdma.h>
+#include <asm/macio.h>
+#include <asm/semaphore.h>
+
+#if defined (CONFIG_SERIAL_PMACZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+
+#include "pmac_zilog.h"
+
+/* Not yet implemented */
+#undef HAS_DBDMA
+
+static char version[] __initdata = "pmac_zilog: 0.6 (Benjamin Herrenschmidt <benh@kernel.crashing.org>)";
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("Driver for the PowerMac serial ports.");
+MODULE_LICENSE("GPL");
+
+#define PWRDBG(fmt, arg...)     printk(KERN_DEBUG fmt , ## arg)
+
+
+/*
+ * For the sake of early serial console, we can do a pre-probe
+ * (optional) of the ports at rather early boot time.
+ */
+static struct uart_pmac_port    pmz_ports[MAX_ZS_PORTS];
+static int                      pmz_ports_count;
+static DECLARE_MUTEX(pmz_irq_sem);
+
+static struct uart_driver pmz_uart_reg = {
+        .owner          =       THIS_MODULE,
+        .driver_name    =       "ttyS",
+        .devfs_name     =       "tts/",
+        .dev_name       =       "ttyS",
+        .major          =       TTY_MAJOR,
+};
+
+
+/* 
+ * Load all registers to reprogram the port
+ * This function must only be called when the TX is not busy.  The UART
+ * port lock must be held and local interrupts disabled.
+ */
+static void pmz_load_zsregs(struct uart_pmac_port *uap, u8 *regs)
+{
+        int i;
+
+        if (ZS_IS_ASLEEP(uap))
+                return;
+
+        /* Let pending transmits finish.  */
+        for (i = 0; i < 1000; i++) {
+                unsigned char stat = read_zsreg(uap, R1);
+                if (stat & ALL_SNT)
+                        break;
+                udelay(100);
+        }
+
+        ZS_CLEARERR(uap);
+        zssync(uap);
+        ZS_CLEARFIFO(uap);
+        zssync(uap);
+        ZS_CLEARERR(uap);
+
+        /* Disable all interrupts.  */
+        write_zsreg(uap, R1,
+                    regs[R1] & ~(RxINT_MASK | TxINT_ENAB | EXT_INT_ENAB));
+
+        /* Set parity, sync config, stop bits, and clock divisor.  */
+        write_zsreg(uap, R4, regs[R4]);
+
+        /* Set misc. TX/RX control bits.  */
+        write_zsreg(uap, R10, regs[R10]);
+
+        /* Set TX/RX controls sans the enable bits.  */
+        write_zsreg(uap, R3, regs[R3] & ~RxENABLE);
+        write_zsreg(uap, R5, regs[R5] & ~TxENABLE);
+
+        /* now set R7 "prime" on ESCC */
+        write_zsreg(uap, R15, regs[R15] | EN85C30);
+        write_zsreg(uap, R7, regs[R7P]);
+
+        /* make sure we use R7 "non-prime" on ESCC */
+        write_zsreg(uap, R15, regs[R15] & ~EN85C30);
+
+        /* Synchronous mode config.  */
+        write_zsreg(uap, R6, regs[R6]);
+        write_zsreg(uap, R7, regs[R7]);
+
+        /* Disable baud generator.  */
+        write_zsreg(uap, R14, regs[R14] & ~BRENAB);
+
+        /* Clock mode control.  */
+        write_zsreg(uap, R11, regs[R11]);
+
+        /* Lower and upper byte of baud rate generator divisor.  */
+        write_zsreg(uap, R12, regs[R12]);
+        write_zsreg(uap, R13, regs[R13]);
+        
+        /* Now rewrite R14, with BRENAB (if set).  */
+        write_zsreg(uap, R14, regs[R14]);
+
+        /* Reset external status interrupts.  */
+        write_zsreg(uap, R0, RES_EXT_INT);
+        write_zsreg(uap, R0, RES_EXT_INT);
+
+        /* Rewrite R3/R5, this time without enables masked.  */
+        write_zsreg(uap, R3, regs[R3]);
+        write_zsreg(uap, R5, regs[R5]);
+
+        /* Rewrite R1, this time without IRQ enabled masked.  */
+        write_zsreg(uap, R1, regs[R1]);
+
+        /* Enable interrupts */
+        write_zsreg(uap, R9, regs[R9]);
+}
+
+/* 
+ * We do like sunzilog to avoid disrupting pending Tx
+ * Reprogram the Zilog channel HW registers with the copies found in the
+ * software state struct.  If the transmitter is busy, we defer this update
+ * until the next TX complete interrupt.  Else, we do it right now.
+ *
+ * The UART port lock must be held and local interrupts disabled.
+ */
+static void pmz_maybe_update_regs(struct uart_pmac_port *uap)
+{
+        if (!ZS_REGS_HELD(uap)) {
+                if (ZS_TX_ACTIVE(uap)) {
+                        uap->flags |= PMACZILOG_FLAG_REGS_HELD;
+                } else {
+                        pmz_debug("pmz: maybe_update_regs: updating\n");
+                        pmz_load_zsregs(uap, uap->curregs);
+                }
+        }
+}
+
+static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap,
+                                            struct pt_regs *regs)
+{
+        struct tty_struct *tty = NULL;
+        unsigned char ch, r1, drop, error;
+        int loops = 0;
+
+ retry:
+        /* The interrupt can be enabled when the port isn't open, typically
+         * that happens when using one port is open and the other closed (stale
+         * interrupt) or when one port is used as a console.
+         */
+        if (!ZS_IS_OPEN(uap)) {
+                pmz_debug("pmz: draining input\n");
+                /* Port is closed, drain input data */
+                for (;;) {
+                        if ((++loops) > 1000)
+                                goto flood;
+                        (void)read_zsreg(uap, R1);
+                        write_zsreg(uap, R0, ERR_RES);
+                        (void)read_zsdata(uap);
+                        ch = read_zsreg(uap, R0);
+                        if (!(ch & Rx_CH_AV))
+                                break;
+                }
+                return NULL;
+        }
+
+        /* Sanity check, make sure the old bug is no longer happening */
+        if (uap->port.info == NULL || uap->port.info->tty == NULL) {
+                WARN_ON(1);
+                (void)read_zsdata(uap);
+                return NULL;
+        }
+        tty = uap->port.info->tty;
+
+        while (1) {
+                error = 0;
+                drop = 0;
+
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        /* Have to drop the lock here */
+                        pmz_debug("pmz: flip overflow\n");
+                        spin_unlock(&uap->port.lock);
+                        tty->flip.work.func((void *)tty);
+                        spin_lock(&uap->port.lock);
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                drop = 1;
+                        if (ZS_IS_ASLEEP(uap))
+                                return NULL;
+                        if (!ZS_IS_OPEN(uap))
+                                goto retry;
+                }
+
+                r1 = read_zsreg(uap, R1);
+                ch = read_zsdata(uap);
+
+                if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        write_zsreg(uap, R0, ERR_RES);
+                        zssync(uap);
+                }
+
+                ch &= uap->parity_mask;
+                if (ch == 0 && uap->flags & PMACZILOG_FLAG_BREAK) {
+                        uap->flags &= ~PMACZILOG_FLAG_BREAK;
+                }
+
+#if defined(CONFIG_MAGIC_SYSRQ) && defined(CONFIG_SERIAL_CORE_CONSOLE)
+#ifdef USE_CTRL_O_SYSRQ
+                /* Handle the SysRq ^O Hack */
+                if (ch == '\x0f') {
+                        uap->port.sysrq = jiffies + HZ*5;
+                        goto next_char;
+                }
+#endif /* USE_CTRL_O_SYSRQ */
+                if (uap->port.sysrq) {
+                        int swallow;
+                        spin_unlock(&uap->port.lock);
+                        swallow = uart_handle_sysrq_char(&uap->port, ch, regs);
+                        spin_lock(&uap->port.lock);
+                        if (swallow)
+                                goto next_char;
+                }
+#endif /* CONFIG_MAGIC_SYSRQ && CONFIG_SERIAL_CORE_CONSOLE */
+
+                /* A real serial line, record the character and status.  */
+                if (drop)
+                        goto next_char;
+
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                uap->port.icount.rx++;
+
+                if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR | BRK_ABRT)) {
+                        error = 1;
+                        if (r1 & BRK_ABRT) {
+                                pmz_debug("pmz: got break !\n");
+                                r1 &= ~(PAR_ERR | CRC_ERR);
+                                uap->port.icount.brk++;
+                                if (uart_handle_break(&uap->port))
+                                        goto next_char;
+                        }
+                        else if (r1 & PAR_ERR)
+                                uap->port.icount.parity++;
+                        else if (r1 & CRC_ERR)
+                                uap->port.icount.frame++;
+                        if (r1 & Rx_OVR)
+                                uap->port.icount.overrun++;
+                        r1 &= uap->port.read_status_mask;
+                        if (r1 & BRK_ABRT)
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        else if (r1 & PAR_ERR)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (r1 & CRC_ERR)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+
+                if (uap->port.ignore_status_mask == 0xff ||
+                    (r1 & uap->port.ignore_status_mask) == 0) {
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((r1 & Rx_OVR) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        next_char:
+                /* We can get stuck in an infinite loop getting char 0 when the
+                 * line is in a wrong HW state, we break that here.
+                 * When that happens, I disable the receive side of the driver.
+                 * Note that what I've been experiencing is a real irq loop where
+                 * I'm getting flooded regardless of the actual port speed.
+                 * Something stange is going on with the HW
+                 */
+                if ((++loops) > 1000)
+                        goto flood;
+                ch = read_zsreg(uap, R0);
+                if (!(ch & Rx_CH_AV))
+                        break;
+        }
+
+        return tty;
+ flood:
+        uap->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+        write_zsreg(uap, R1, uap->curregs[R1]);
+        zssync(uap);
+        dev_err(&uap->dev->ofdev.dev, "pmz: rx irq flood !\n");
+        return tty;
+}
+
+static void pmz_status_handle(struct uart_pmac_port *uap, struct pt_regs *regs)
+{
+        unsigned char status;
+
+        status = read_zsreg(uap, R0);
+        write_zsreg(uap, R0, RES_EXT_INT);
+        zssync(uap);
+
+        if (ZS_IS_OPEN(uap) && ZS_WANTS_MODEM_STATUS(uap)) {
+                if (status & SYNC_HUNT)
+                        uap->port.icount.dsr++;
+
+                /* The Zilog just gives us an interrupt when DCD/CTS/etc. change.
+                 * But it does not tell us which bit has changed, we have to keep
+                 * track of this ourselves.
+                 * The CTS input is inverted for some reason.  -- paulus
+                 */
+                if ((status ^ uap->prev_status) & DCD)
+                        uart_handle_dcd_change(&uap->port,
+                                               (status & DCD));
+                if ((status ^ uap->prev_status) & CTS)
+                        uart_handle_cts_change(&uap->port,
+                                               !(status & CTS));
+
+                wake_up_interruptible(&uap->port.info->delta_msr_wait);
+        }
+
+        if (status & BRK_ABRT)
+                uap->flags |= PMACZILOG_FLAG_BREAK;
+
+        uap->prev_status = status;
+}
+
+static void pmz_transmit_chars(struct uart_pmac_port *uap)
+{
+        struct circ_buf *xmit;
+
+        if (ZS_IS_ASLEEP(uap))
+                return;
+        if (ZS_IS_CONS(uap)) {
+                unsigned char status = read_zsreg(uap, R0);
+
+                /* TX still busy?  Just wait for the next TX done interrupt.
+                 *
+                 * It can occur because of how we do serial console writes.  It would
+                 * be nice to transmit console writes just like we normally would for
+                 * a TTY line. (ie. buffered and TX interrupt driven).  That is not
+                 * easy because console writes cannot sleep.  One solution might be
+                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 */
+                if (!(status & Tx_BUF_EMP))
+                        return;
+        }
+
+        uap->flags &= ~PMACZILOG_FLAG_TX_ACTIVE;
+
+        if (ZS_REGS_HELD(uap)) {
+                pmz_load_zsregs(uap, uap->curregs);
+                uap->flags &= ~PMACZILOG_FLAG_REGS_HELD;
+        }
+
+        if (ZS_TX_STOPPED(uap)) {
+                uap->flags &= ~PMACZILOG_FLAG_TX_STOPPED;
+                goto ack_tx_int;
+        }
+
+        if (uap->port.x_char) {
+                uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
+                write_zsdata(uap, uap->port.x_char);
+                zssync(uap);
+                uap->port.icount.tx++;
+                uap->port.x_char = 0;
+                return;
+        }
+
+        if (uap->port.info == NULL)
+                goto ack_tx_int;
+        xmit = &uap->port.info->xmit;
+        if (uart_circ_empty(xmit)) {
+                uart_write_wakeup(&uap->port);
+                goto ack_tx_int;
+        }
+        if (uart_tx_stopped(&uap->port))
+                goto ack_tx_int;
+
+        uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
+        write_zsdata(uap, xmit->buf[xmit->tail]);
+        zssync(uap);
+
+        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+        uap->port.icount.tx++;
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&uap->port);
+
+        return;
+
+ack_tx_int:
+        write_zsreg(uap, R0, RES_Tx_P);
+        zssync(uap);
+}
+
+/* Hrm... we register that twice, fixme later.... */
+static irqreturn_t pmz_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_pmac_port *uap = dev_id;
+        struct uart_pmac_port *uap_a;
+        struct uart_pmac_port *uap_b;
+        int rc = IRQ_NONE;
+        struct tty_struct *tty;
+        u8 r3;
+
+        uap_a = pmz_get_port_A(uap);
+        uap_b = uap_a->mate;
+       
+        spin_lock(&uap_a->port.lock);
+        r3 = read_zsreg(uap_a, R3);
+
+#ifdef DEBUG_HARD
+        pmz_debug("irq, r3: %x\n", r3);
+#endif
+        /* Channel A */
+        tty = NULL;
+        if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
+                write_zsreg(uap_a, R0, RES_H_IUS);
+                zssync(uap_a);          
+                if (r3 & CHAEXT)
+                        pmz_status_handle(uap_a, regs);
+                if (r3 & CHARxIP)
+                        tty = pmz_receive_chars(uap_a, regs);
+                if (r3 & CHATxIP)
+                        pmz_transmit_chars(uap_a);
+                rc = IRQ_HANDLED;
+        }
+        spin_unlock(&uap_a->port.lock);
+        if (tty != NULL)
+                tty_flip_buffer_push(tty);
+
+        if (uap_b->node == NULL)
+                goto out;
+
+        spin_lock(&uap_b->port.lock);
+        tty = NULL;
+        if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) {
+                write_zsreg(uap_b, R0, RES_H_IUS);
+                zssync(uap_b);
+                if (r3 & CHBEXT)
+                        pmz_status_handle(uap_b, regs);
+                if (r3 & CHBRxIP)
+                        tty = pmz_receive_chars(uap_b, regs);
+                if (r3 & CHBTxIP)
+                        pmz_transmit_chars(uap_b);
+                rc = IRQ_HANDLED;
+        }
+        spin_unlock(&uap_b->port.lock);
+        if (tty != NULL)
+                tty_flip_buffer_push(tty);
+
+ out:
+#ifdef DEBUG_HARD
+        pmz_debug("irq done.\n");
+#endif
+        return rc;
+}
+
+/*
+ * Peek the status register, lock not held by caller
+ */
+static inline u8 pmz_peek_status(struct uart_pmac_port *uap)
+{
+        unsigned long flags;
+        u8 status;
+        
+        spin_lock_irqsave(&uap->port.lock, flags);
+        status = read_zsreg(uap, R0);
+        spin_unlock_irqrestore(&uap->port.lock, flags);
+
+        return status;
+}
+
+/* 
+ * Check if transmitter is empty
+ * The port lock is not held.
+ */
+static unsigned int pmz_tx_empty(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned char status;
+
+        if (ZS_IS_ASLEEP(uap) || uap->node == NULL)
+                return TIOCSER_TEMT;
+
+        status = pmz_peek_status(to_pmz(port));
+        if (status & Tx_BUF_EMP)
+                return TIOCSER_TEMT;
+        return 0;
+}
+
+/* 
+ * Set Modem Control (RTS & DTR) bits
+ * The port lock is held and interrupts are disabled.
+ * Note: Shall we really filter out RTS on external ports or
+ * should that be dealt at higher level only ?
+ */
+static void pmz_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned char set_bits, clear_bits;
+
+        /* Do nothing for irda for now... */
+        if (ZS_IS_IRDA(uap))
+                return;
+        /* We get called during boot with a port not up yet */
+        if (ZS_IS_ASLEEP(uap) ||
+            !(ZS_IS_OPEN(uap) || ZS_IS_CONS(uap)))
+                return;
+
+        set_bits = clear_bits = 0;
+
+        if (ZS_IS_INTMODEM(uap)) {
+                if (mctrl & TIOCM_RTS)
+                        set_bits |= RTS;
+                else
+                        clear_bits |= RTS;
+        }
+        if (mctrl & TIOCM_DTR)
+                set_bits |= DTR;
+        else
+                clear_bits |= DTR;
+
+        /* NOTE: Not subject to 'transmitter active' rule.  */ 
+        uap->curregs[R5] |= set_bits;
+        uap->curregs[R5] &= ~clear_bits;
+        if (ZS_IS_ASLEEP(uap))
+                return;
+        write_zsreg(uap, R5, uap->curregs[R5]);
+        pmz_debug("pmz_set_mctrl: set bits: %x, clear bits: %x -> %x\n",
+                  set_bits, clear_bits, uap->curregs[R5]);
+        zssync(uap);
+}
+
+/* 
+ * Get Modem Control bits (only the input ones, the core will
+ * or that with a cached value of the control ones)
+ * The port lock is not held.
+ */
+static unsigned int pmz_get_mctrl(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned char status;
+        unsigned int ret;
+
+        if (ZS_IS_ASLEEP(uap) || uap->node == NULL)
+                return 0;
+
+        status = pmz_peek_status(to_pmz(port));
+
+        ret = 0;
+        if (status & DCD)
+                ret |= TIOCM_CAR;
+        if (status & SYNC_HUNT)
+                ret |= TIOCM_DSR;
+        if (!(status & CTS))
+                ret |= TIOCM_CTS;
+
+        return ret;
+}
+
+/* 
+ * Stop TX side. Dealt like sunzilog at next Tx interrupt,
+ * though for DMA, we will have to do a bit more. What is
+ * the meaning of the tty_stop bit ? XXX
+ * The port lock is held and interrupts are disabled.
+ */
+static void pmz_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        to_pmz(port)->flags |= PMACZILOG_FLAG_TX_STOPPED;
+}
+
+/* 
+ * Kick the Tx side.
+ * The port lock is held and interrupts are disabled.
+ */
+static void pmz_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned char status;
+
+        pmz_debug("pmz: start_tx()\n");
+
+        uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
+        uap->flags &= ~PMACZILOG_FLAG_TX_STOPPED;
+
+        if (ZS_IS_ASLEEP(uap) || uap->node == NULL)
+                return;
+
+        status = read_zsreg(uap, R0);
+
+        /* TX busy?  Just wait for the TX done interrupt.  */
+        if (!(status & Tx_BUF_EMP))
+                return;
+
+        /* Send the first character to jump-start the TX done
+         * IRQ sending engine.
+         */
+        if (port->x_char) {
+                write_zsdata(uap, port->x_char);
+                zssync(uap);
+                port->icount.tx++;
+                port->x_char = 0;
+        } else {
+                struct circ_buf *xmit = &port->info->xmit;
+
+                write_zsdata(uap, xmit->buf[xmit->tail]);
+                zssync(uap);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+
+                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                        uart_write_wakeup(&uap->port);
+        }
+        pmz_debug("pmz: start_tx() done.\n");
+}
+
+/* 
+ * Stop Rx side, basically disable emitting of
+ * Rx interrupts on the port. We don't disable the rx
+ * side of the chip proper though
+ * The port lock is held.
+ */
+static void pmz_stop_rx(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+
+        if (ZS_IS_ASLEEP(uap) || uap->node == NULL)
+                return;
+
+        pmz_debug("pmz: stop_rx()()\n");
+
+        /* Disable all RX interrupts.  */
+        uap->curregs[R1] &= ~RxINT_MASK;
+        pmz_maybe_update_regs(uap);
+
+        pmz_debug("pmz: stop_rx() done.\n");
+}
+
+/* 
+ * Enable modem status change interrupts
+ * The port lock is held.
+ */
+static void pmz_enable_ms(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned char new_reg;
+
+        if (ZS_IS_IRDA(uap) || uap->node == NULL)
+                return;
+        new_reg = uap->curregs[R15] | (DCDIE | SYNCIE | CTSIE);
+        if (new_reg != uap->curregs[R15]) {
+                uap->curregs[R15] = new_reg;
+
+                if (ZS_IS_ASLEEP(uap))
+                        return;
+                /* NOTE: Not subject to 'transmitter active' rule.  */ 
+                write_zsreg(uap, R15, uap->curregs[R15]);
+        }
+}
+
+/* 
+ * Control break state emission
+ * The port lock is not held.
+ */
+static void pmz_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned char set_bits, clear_bits, new_reg;
+        unsigned long flags;
+
+        if (uap->node == NULL)
+                return;
+        set_bits = clear_bits = 0;
+
+        if (break_state)
+                set_bits |= SND_BRK;
+        else
+                clear_bits |= SND_BRK;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        new_reg = (uap->curregs[R5] | set_bits) & ~clear_bits;
+        if (new_reg != uap->curregs[R5]) {
+                uap->curregs[R5] = new_reg;
+
+                /* NOTE: Not subject to 'transmitter active' rule.  */ 
+                if (ZS_IS_ASLEEP(uap))
+                        return;
+                write_zsreg(uap, R5, uap->curregs[R5]);
+        }
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+/*
+ * Turn power on or off to the SCC and associated stuff
+ * (port drivers, modem, IR port, etc.)
+ * Returns the number of milliseconds we should wait before
+ * trying to use the port.
+ */
+static int pmz_set_scc_power(struct uart_pmac_port *uap, int state)
+{
+        int delay = 0;
+        int rc;
+
+        if (state) {
+                rc = pmac_call_feature(
+                        PMAC_FTR_SCC_ENABLE, uap->node, uap->port_type, 1);
+                pmz_debug("port power on result: %d\n", rc);
+                if (ZS_IS_INTMODEM(uap)) {
+                        rc = pmac_call_feature(
+                                PMAC_FTR_MODEM_ENABLE, uap->node, 0, 1);
+                        delay = 2500;   /* wait for 2.5s before using */
+                        pmz_debug("modem power result: %d\n", rc);
+                }
+        } else {
+                /* TODO: Make that depend on a timer, don't power down
+                 * immediately
+                 */
+                if (ZS_IS_INTMODEM(uap)) {
+                        rc = pmac_call_feature(
+                                PMAC_FTR_MODEM_ENABLE, uap->node, 0, 0);
+                        pmz_debug("port power off result: %d\n", rc);
+                }
+                pmac_call_feature(PMAC_FTR_SCC_ENABLE, uap->node, uap->port_type, 0);
+        }
+        return delay;
+}
+
+/*
+ * FixZeroBug....Works around a bug in the SCC receving channel.
+ * Inspired from Darwin code, 15 Sept. 2000  -DanM
+ *
+ * The following sequence prevents a problem that is seen with O'Hare ASICs
+ * (most versions -- also with some Heathrow and Hydra ASICs) where a zero
+ * at the input to the receiver becomes 'stuck' and locks up the receiver.
+ * This problem can occur as a result of a zero bit at the receiver input
+ * coincident with any of the following events:
+ *
+ *      The SCC is initialized (hardware or software).
+ *      A framing error is detected.
+ *      The clocking option changes from synchronous or X1 asynchronous
+ *              clocking to X16, X32, or X64 asynchronous clocking.
+ *      The decoding mode is changed among NRZ, NRZI, FM0, or FM1.
+ *
+ * This workaround attempts to recover from the lockup condition by placing
+ * the SCC in synchronous loopback mode with a fast clock before programming
+ * any of the asynchronous modes.
+ */
+static void pmz_fix_zero_bug_scc(struct uart_pmac_port *uap)
+{
+        write_zsreg(uap, 9, ZS_IS_CHANNEL_A(uap) ? CHRA : CHRB);
+        zssync(uap);
+        udelay(10);
+        write_zsreg(uap, 9, (ZS_IS_CHANNEL_A(uap) ? CHRA : CHRB) | NV);
+        zssync(uap);
+
+        write_zsreg(uap, 4, X1CLK | MONSYNC);
+        write_zsreg(uap, 3, Rx8);
+        write_zsreg(uap, 5, Tx8 | RTS);
+        write_zsreg(uap, 9, NV);        /* Didn't we already do this? */
+        write_zsreg(uap, 11, RCBR | TCBR);
+        write_zsreg(uap, 12, 0);
+        write_zsreg(uap, 13, 0);
+        write_zsreg(uap, 14, (LOOPBAK | BRSRC));
+        write_zsreg(uap, 14, (LOOPBAK | BRSRC | BRENAB));
+        write_zsreg(uap, 3, Rx8 | RxENABLE);
+        write_zsreg(uap, 0, RES_EXT_INT);
+        write_zsreg(uap, 0, RES_EXT_INT);
+        write_zsreg(uap, 0, RES_EXT_INT);       /* to kill some time */
+
+        /* The channel should be OK now, but it is probably receiving
+         * loopback garbage.
+         * Switch to asynchronous mode, disable the receiver,
+         * and discard everything in the receive buffer.
+         */
+        write_zsreg(uap, 9, NV);
+        write_zsreg(uap, 4, X16CLK | SB_MASK);
+        write_zsreg(uap, 3, Rx8);
+
+        while (read_zsreg(uap, 0) & Rx_CH_AV) {
+                (void)read_zsreg(uap, 8);
+                write_zsreg(uap, 0, RES_EXT_INT);
+                write_zsreg(uap, 0, ERR_RES);
+        }
+}
+
+/*
+ * Real startup routine, powers up the hardware and sets up
+ * the SCC. Returns a delay in ms where you need to wait before
+ * actually using the port, this is typically the internal modem
+ * powerup delay. This routine expect the lock to be taken.
+ */
+static int __pmz_startup(struct uart_pmac_port *uap)
+{
+        int pwr_delay = 0;
+
+        memset(&uap->curregs, 0, sizeof(uap->curregs));
+
+        /* Power up the SCC & underlying hardware (modem/irda) */
+        pwr_delay = pmz_set_scc_power(uap, 1);
+
+        /* Nice buggy HW ... */
+        pmz_fix_zero_bug_scc(uap);
+
+        /* Reset the channel */
+        uap->curregs[R9] = 0;
+        write_zsreg(uap, 9, ZS_IS_CHANNEL_A(uap) ? CHRA : CHRB);
+        zssync(uap);
+        udelay(10);
+        write_zsreg(uap, 9, 0);
+        zssync(uap);
+
+        /* Clear the interrupt registers */
+        write_zsreg(uap, R1, 0);
+        write_zsreg(uap, R0, ERR_RES);
+        write_zsreg(uap, R0, ERR_RES);
+        write_zsreg(uap, R0, RES_H_IUS);
+        write_zsreg(uap, R0, RES_H_IUS);
+
+        /* Setup some valid baud rate */
+        uap->curregs[R4] = X16CLK | SB1;
+        uap->curregs[R3] = Rx8;
+        uap->curregs[R5] = Tx8 | RTS;
+        if (!ZS_IS_IRDA(uap))
+                uap->curregs[R5] |= DTR;
+        uap->curregs[R12] = 0;
+        uap->curregs[R13] = 0;
+        uap->curregs[R14] = BRENAB;
+
+        /* Clear handshaking, enable BREAK interrupts */
+        uap->curregs[R15] = BRKIE;
+
+        /* Master interrupt enable */
+        uap->curregs[R9] |= NV | MIE;
+
+        pmz_load_zsregs(uap, uap->curregs);
+
+        /* Enable receiver and transmitter.  */
+        write_zsreg(uap, R3, uap->curregs[R3] |= RxENABLE);
+        write_zsreg(uap, R5, uap->curregs[R5] |= TxENABLE);
+
+        /* Remember status for DCD/CTS changes */
+        uap->prev_status = read_zsreg(uap, R0);
+
+
+        return pwr_delay;
+}
+
+static void pmz_irda_reset(struct uart_pmac_port *uap)
+{
+        uap->curregs[R5] |= DTR;
+        write_zsreg(uap, R5, uap->curregs[R5]);
+        zssync(uap);
+        mdelay(110);
+        uap->curregs[R5] &= ~DTR;
+        write_zsreg(uap, R5, uap->curregs[R5]);
+        zssync(uap);
+        mdelay(10);
+}
+
+/*
+ * This is the "normal" startup routine, using the above one
+ * wrapped with the lock and doing a schedule delay
+ */
+static int pmz_startup(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned long flags;
+        int pwr_delay = 0;
+
+        pmz_debug("pmz: startup()\n");
+
+        if (ZS_IS_ASLEEP(uap))
+                return -EAGAIN;
+        if (uap->node == NULL)
+                return -ENODEV;
+
+        down(&pmz_irq_sem);
+
+        uap->flags |= PMACZILOG_FLAG_IS_OPEN;
+
+        /* A console is never powered down. Else, power up and
+         * initialize the chip
+         */
+        if (!ZS_IS_CONS(uap)) {
+                spin_lock_irqsave(&port->lock, flags);
+                pwr_delay = __pmz_startup(uap);
+                spin_unlock_irqrestore(&port->lock, flags);
+        }       
+
+        pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON;
+        if (request_irq(uap->port.irq, pmz_interrupt, SA_SHIRQ, "PowerMac Zilog", uap)) {
+                dev_err(&uap->dev->ofdev.dev,
+                        "Unable to register zs interrupt handler.\n");
+                pmz_set_scc_power(uap, 0);
+                up(&pmz_irq_sem);
+                return -ENXIO;
+        }
+
+        up(&pmz_irq_sem);
+
+        /* Right now, we deal with delay by blocking here, I'll be
+         * smarter later on
+         */
+        if (pwr_delay != 0) {
+                pmz_debug("pmz: delaying %d ms\n", pwr_delay);
+                msleep(pwr_delay);
+        }
+
+        /* IrDA reset is done now */
+        if (ZS_IS_IRDA(uap))
+                pmz_irda_reset(uap);
+
+        /* Enable interrupts emission from the chip */
+        spin_lock_irqsave(&port->lock, flags);
+        uap->curregs[R1] |= INT_ALL_Rx | TxINT_ENAB;
+        if (!ZS_IS_EXTCLK(uap))
+                uap->curregs[R1] |= EXT_INT_ENAB;
+        write_zsreg(uap, R1, uap->curregs[R1]);
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        pmz_debug("pmz: startup() done.\n");
+
+        return 0;
+}
+
+static void pmz_shutdown(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned long flags;
+
+        pmz_debug("pmz: shutdown()\n");
+
+        if (uap->node == NULL)
+                return;
+
+        down(&pmz_irq_sem);
+
+        /* Release interrupt handler */
+        free_irq(uap->port.irq, uap);
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        uap->flags &= ~PMACZILOG_FLAG_IS_OPEN;
+
+        if (!ZS_IS_OPEN(uap->mate))
+                pmz_get_port_A(uap)->flags &= ~PMACZILOG_FLAG_IS_IRQ_ON;
+
+        /* Disable interrupts */
+        if (!ZS_IS_ASLEEP(uap)) {
+                uap->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+                write_zsreg(uap, R1, uap->curregs[R1]);
+                zssync(uap);
+        }
+
+        if (ZS_IS_CONS(uap) || ZS_IS_ASLEEP(uap)) {
+                spin_unlock_irqrestore(&port->lock, flags);
+                up(&pmz_irq_sem);
+                return;
+        }
+
+        /* Disable receiver and transmitter.  */
+        uap->curregs[R3] &= ~RxENABLE;
+        uap->curregs[R5] &= ~TxENABLE;
+
+        /* Disable all interrupts and BRK assertion.  */
+        uap->curregs[R5] &= ~SND_BRK;
+        pmz_maybe_update_regs(uap);
+
+        /* Shut the chip down */
+        pmz_set_scc_power(uap, 0);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        up(&pmz_irq_sem);
+
+        pmz_debug("pmz: shutdown() done.\n");
+}
+
+/* Shared by TTY driver and serial console setup.  The port lock is held
+ * and local interrupts are disabled.
+ */
+static void pmz_convert_to_zs(struct uart_pmac_port *uap, unsigned int cflag,
+                              unsigned int iflag, unsigned long baud)
+{
+        int brg;
+
+
+        /* Switch to external clocking for IrDA high clock rates. That
+         * code could be re-used for Midi interfaces with different
+         * multipliers
+         */
+        if (baud >= 115200 && ZS_IS_IRDA(uap)) {
+                uap->curregs[R4] = X1CLK;
+                uap->curregs[R11] = RCTRxCP | TCTRxCP;
+                uap->curregs[R14] = 0; /* BRG off */
+                uap->curregs[R12] = 0;
+                uap->curregs[R13] = 0;
+                uap->flags |= PMACZILOG_FLAG_IS_EXTCLK;
+        } else {
+                switch (baud) {
+                case ZS_CLOCK/16:       /* 230400 */
+                        uap->curregs[R4] = X16CLK;
+                        uap->curregs[R11] = 0;
+                        uap->curregs[R14] = 0;
+                        break;
+                case ZS_CLOCK/32:       /* 115200 */
+                        uap->curregs[R4] = X32CLK;
+                        uap->curregs[R11] = 0;
+                        uap->curregs[R14] = 0;
+                        break;
+                default:
+                        uap->curregs[R4] = X16CLK;
+                        uap->curregs[R11] = TCBR | RCBR;
+                        brg = BPS_TO_BRG(baud, ZS_CLOCK / 16);
+                        uap->curregs[R12] = (brg & 255);
+                        uap->curregs[R13] = ((brg >> 8) & 255);
+                        uap->curregs[R14] = BRENAB;
+                }
+                uap->flags &= ~PMACZILOG_FLAG_IS_EXTCLK;
+        }
+
+        /* Character size, stop bits, and parity. */
+        uap->curregs[3] &= ~RxN_MASK;
+        uap->curregs[5] &= ~TxN_MASK;
+
+        switch (cflag & CSIZE) {
+        case CS5:
+                uap->curregs[3] |= Rx5;
+                uap->curregs[5] |= Tx5;
+                uap->parity_mask = 0x1f;
+                break;
+        case CS6:
+                uap->curregs[3] |= Rx6;
+                uap->curregs[5] |= Tx6;
+                uap->parity_mask = 0x3f;
+                break;
+        case CS7:
+                uap->curregs[3] |= Rx7;
+                uap->curregs[5] |= Tx7;
+                uap->parity_mask = 0x7f;
+                break;
+        case CS8:
+        default:
+                uap->curregs[3] |= Rx8;
+                uap->curregs[5] |= Tx8;
+                uap->parity_mask = 0xff;
+                break;
+        };
+        uap->curregs[4] &= ~(SB_MASK);
+        if (cflag & CSTOPB)
+                uap->curregs[4] |= SB2;
+        else
+                uap->curregs[4] |= SB1;
+        if (cflag & PARENB)
+                uap->curregs[4] |= PAR_ENAB;
+        else
+                uap->curregs[4] &= ~PAR_ENAB;
+        if (!(cflag & PARODD))
+                uap->curregs[4] |= PAR_EVEN;
+        else
+                uap->curregs[4] &= ~PAR_EVEN;
+
+        uap->port.read_status_mask = Rx_OVR;
+        if (iflag & INPCK)
+                uap->port.read_status_mask |= CRC_ERR | PAR_ERR;
+        if (iflag & (BRKINT | PARMRK))
+                uap->port.read_status_mask |= BRK_ABRT;
+
+        uap->port.ignore_status_mask = 0;
+        if (iflag & IGNPAR)
+                uap->port.ignore_status_mask |= CRC_ERR | PAR_ERR;
+        if (iflag & IGNBRK) {
+                uap->port.ignore_status_mask |= BRK_ABRT;
+                if (iflag & IGNPAR)
+                        uap->port.ignore_status_mask |= Rx_OVR;
+        }
+
+        if ((cflag & CREAD) == 0)
+                uap->port.ignore_status_mask = 0xff;
+}
+
+
+/*
+ * Set the irda codec on the imac to the specified baud rate.
+ */
+static void pmz_irda_setup(struct uart_pmac_port *uap, unsigned long *baud)
+{
+        u8 cmdbyte;
+        int t, version;
+
+        switch (*baud) {
+        /* SIR modes */
+        case 2400:
+                cmdbyte = 0x53;
+                break;
+        case 4800:
+                cmdbyte = 0x52;
+                break;
+        case 9600:
+                cmdbyte = 0x51;
+                break;
+        case 19200:
+                cmdbyte = 0x50;
+                break;
+        case 38400:
+                cmdbyte = 0x4f;
+                break;
+        case 57600:
+                cmdbyte = 0x4e;
+                break;
+        case 115200:
+                cmdbyte = 0x4d;
+                break;
+        /* The FIR modes aren't really supported at this point, how
+         * do we select the speed ? via the FCR on KeyLargo ?
+         */
+        case 1152000:
+                cmdbyte = 0;
+                break;
+        case 4000000:
+                cmdbyte = 0;
+                break;
+        default: /* 9600 */
+                cmdbyte = 0x51;
+                *baud = 9600;
+                break;
+        }
+
+        /* Wait for transmitter to drain */
+        t = 10000;
+        while ((read_zsreg(uap, R0) & Tx_BUF_EMP) == 0
+               || (read_zsreg(uap, R1) & ALL_SNT) == 0) {
+                if (--t <= 0) {
+                        dev_err(&uap->dev->ofdev.dev, "transmitter didn't drain\n");
+                        return;
+                }
+                udelay(10);
+        }
+
+        /* Drain the receiver too */
+        t = 100;
+        (void)read_zsdata(uap);
+        (void)read_zsdata(uap);
+        (void)read_zsdata(uap);
+        mdelay(10);
+        while (read_zsreg(uap, R0) & Rx_CH_AV) {
+                read_zsdata(uap);
+                mdelay(10);
+                if (--t <= 0) {
+                        dev_err(&uap->dev->ofdev.dev, "receiver didn't drain\n");
+                        return;
+                }
+        }
+
+        /* Switch to command mode */
+        uap->curregs[R5] |= DTR;
+        write_zsreg(uap, R5, uap->curregs[R5]);
+        zssync(uap);
+        mdelay(1);
+
+        /* Switch SCC to 19200 */
+        pmz_convert_to_zs(uap, CS8, 0, 19200);          
+        pmz_load_zsregs(uap, uap->curregs);
+        mdelay(1);
+
+        /* Write get_version command byte */
+        write_zsdata(uap, 1);
+        t = 5000;
+        while ((read_zsreg(uap, R0) & Rx_CH_AV) == 0) {
+                if (--t <= 0) {
+                        dev_err(&uap->dev->ofdev.dev,
+                                "irda_setup timed out on get_version byte\n");
+                        goto out;
+                }
+                udelay(10);
+        }
+        version = read_zsdata(uap);
+
+        if (version < 4) {
+                dev_info(&uap->dev->ofdev.dev, "IrDA: dongle version %d not supported\n",
+                         version);
+                goto out;
+        }
+
+        /* Send speed mode */
+        write_zsdata(uap, cmdbyte);
+        t = 5000;
+        while ((read_zsreg(uap, R0) & Rx_CH_AV) == 0) {
+                if (--t <= 0) {
+                        dev_err(&uap->dev->ofdev.dev,
+                                "irda_setup timed out on speed mode byte\n");
+                        goto out;
+                }
+                udelay(10);
+        }
+        t = read_zsdata(uap);
+        if (t != cmdbyte)
+                dev_err(&uap->dev->ofdev.dev,
+                        "irda_setup speed mode byte = %x (%x)\n", t, cmdbyte);
+
+        dev_info(&uap->dev->ofdev.dev, "IrDA setup for %ld bps, dongle version: %d\n",
+                 *baud, version);
+
+        (void)read_zsdata(uap);
+        (void)read_zsdata(uap);
+        (void)read_zsdata(uap);
+
+ out:
+        /* Switch back to data mode */
+        uap->curregs[R5] &= ~DTR;
+        write_zsreg(uap, R5, uap->curregs[R5]);
+        zssync(uap);
+
+        (void)read_zsdata(uap);
+        (void)read_zsdata(uap);
+        (void)read_zsdata(uap);
+}
+
+
+static void __pmz_set_termios(struct uart_port *port, struct termios *termios,
+                              struct termios *old)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned long baud;
+
+        pmz_debug("pmz: set_termios()\n");
+
+        if (ZS_IS_ASLEEP(uap))
+                return;
+
+        memcpy(&uap->termios_cache, termios, sizeof(struct termios));
+
+        /* XXX Check which revs of machines actually allow 1 and 4Mb speeds
+         * on the IR dongle. Note that the IRTTY driver currently doesn't know
+         * about the FIR mode and high speed modes. So these are unused. For
+         * implementing proper support for these, we should probably add some
+         * DMA as well, at least on the Rx side, which isn't a simple thing
+         * at this point.
+         */
+        if (ZS_IS_IRDA(uap)) {
+                /* Calc baud rate */
+                baud = uart_get_baud_rate(port, termios, old, 1200, 4000000);
+                pmz_debug("pmz: switch IRDA to %ld bauds\n", baud);
+                /* Cet the irda codec to the right rate */
+                pmz_irda_setup(uap, &baud);
+                /* Set final baud rate */
+                pmz_convert_to_zs(uap, termios->c_cflag, termios->c_iflag, baud);
+                pmz_load_zsregs(uap, uap->curregs);
+                zssync(uap);
+        } else {
+                baud = uart_get_baud_rate(port, termios, old, 1200, 230400);
+                pmz_convert_to_zs(uap, termios->c_cflag, termios->c_iflag, baud);
+                /* Make sure modem status interrupts are correctly configured */
+                if (UART_ENABLE_MS(&uap->port, termios->c_cflag)) {
+                        uap->curregs[R15] |= DCDIE | SYNCIE | CTSIE;
+                        uap->flags |= PMACZILOG_FLAG_MODEM_STATUS;
+                } else {
+                        uap->curregs[R15] &= ~(DCDIE | SYNCIE | CTSIE);
+                        uap->flags &= ~PMACZILOG_FLAG_MODEM_STATUS;
+                }
+
+                /* Load registers to the chip */
+                pmz_maybe_update_regs(uap);
+        }
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        pmz_debug("pmz: set_termios() done.\n");
+}
+
+/* The port lock is not held.  */
+static void pmz_set_termios(struct uart_port *port, struct termios *termios,
+                            struct termios *old)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);  
+
+        /* Disable IRQs on the port */
+        uap->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+        write_zsreg(uap, R1, uap->curregs[R1]);
+
+        /* Setup new port configuration */
+        __pmz_set_termios(port, termios, old);
+
+        /* Re-enable IRQs on the port */
+        if (ZS_IS_OPEN(uap)) {
+                uap->curregs[R1] |= INT_ALL_Rx | TxINT_ENAB;
+                if (!ZS_IS_EXTCLK(uap))
+                        uap->curregs[R1] |= EXT_INT_ENAB;
+                write_zsreg(uap, R1, uap->curregs[R1]);
+        }
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *pmz_type(struct uart_port *port)
+{
+        struct uart_pmac_port *uap = to_pmz(port);
+
+        if (ZS_IS_IRDA(uap))
+                return "Z85c30 ESCC - Infrared port";
+        else if (ZS_IS_INTMODEM(uap))
+                return "Z85c30 ESCC - Internal modem";
+        return "Z85c30 ESCC - Serial port";
+}
+
+/* We do not request/release mappings of the registers here, this
+ * happens at early serial probe time.
+ */
+static void pmz_release_port(struct uart_port *port)
+{
+}
+
+static int pmz_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/* These do not need to do anything interesting either.  */
+static void pmz_config_port(struct uart_port *port, int flags)
+{
+}
+
+/* We do not support letting the user mess with the divisor, IRQ, etc. */
+static int pmz_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        return -EINVAL;
+}
+
+static struct uart_ops pmz_pops = {
+        .tx_empty       =       pmz_tx_empty,
+        .set_mctrl      =       pmz_set_mctrl,
+        .get_mctrl      =       pmz_get_mctrl,
+        .stop_tx        =       pmz_stop_tx,
+        .start_tx       =       pmz_start_tx,
+        .stop_rx        =       pmz_stop_rx,
+        .enable_ms      =       pmz_enable_ms,
+        .break_ctl      =       pmz_break_ctl,
+        .startup        =       pmz_startup,
+        .shutdown       =       pmz_shutdown,
+        .set_termios    =       pmz_set_termios,
+        .type           =       pmz_type,
+        .release_port   =       pmz_release_port,
+        .request_port   =       pmz_request_port,
+        .config_port    =       pmz_config_port,
+        .verify_port    =       pmz_verify_port,
+};
+
+/*
+ * Setup one port structure after probing, HW is down at this point,
+ * Unlike sunzilog, we don't need to pre-init the spinlock as we don't
+ * register our console before uart_add_one_port() is called
+ */
+static int __init pmz_init_port(struct uart_pmac_port *uap)
+{
+        struct device_node *np = uap->node;
+        char *conn;
+        struct slot_names_prop {
+                int     count;
+                char    name[1];
+        } *slots;
+        int len;
+
+        /*
+         * Request & map chip registers
+         */
+        uap->port.mapbase = np->addrs[0].address;
+        uap->port.membase = ioremap(uap->port.mapbase, 0x1000);
+      
+        uap->control_reg = uap->port.membase;
+        uap->data_reg = uap->control_reg + 0x10;
+        
+        /*
+         * Request & map DBDMA registers
+         */
+#ifdef HAS_DBDMA
+        if (np->n_addrs >= 3 && np->n_intrs >= 3)
+                uap->flags |= PMACZILOG_FLAG_HAS_DMA;
+#endif  
+        if (ZS_HAS_DMA(uap)) {
+                uap->tx_dma_regs = ioremap(np->addrs[np->n_addrs - 2].address, 0x1000);
+                if (uap->tx_dma_regs == NULL) { 
+                        uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
+                        goto no_dma;
+                }
+                uap->rx_dma_regs = ioremap(np->addrs[np->n_addrs - 1].address, 0x1000);
+                if (uap->rx_dma_regs == NULL) { 
+                        iounmap(uap->tx_dma_regs);
+                        uap->tx_dma_regs = NULL;
+                        uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
+                        goto no_dma;
+                }
+                uap->tx_dma_irq = np->intrs[1].line;
+                uap->rx_dma_irq = np->intrs[2].line;
+        }
+no_dma:
+
+        /*
+         * Detect port type
+         */
+        if (device_is_compatible(np, "cobalt"))
+                uap->flags |= PMACZILOG_FLAG_IS_INTMODEM;
+        conn = get_property(np, "AAPL,connector", &len);
+        if (conn && (strcmp(conn, "infrared") == 0))
+                uap->flags |= PMACZILOG_FLAG_IS_IRDA;
+        uap->port_type = PMAC_SCC_ASYNC;
+        /* 1999 Powerbook G3 has slot-names property instead */
+        slots = (struct slot_names_prop *)get_property(np, "slot-names", &len);
+        if (slots && slots->count > 0) {
+                if (strcmp(slots->name, "IrDA") == 0)
+                        uap->flags |= PMACZILOG_FLAG_IS_IRDA;
+                else if (strcmp(slots->name, "Modem") == 0)
+                        uap->flags |= PMACZILOG_FLAG_IS_INTMODEM;
+        }
+        if (ZS_IS_IRDA(uap))
+                uap->port_type = PMAC_SCC_IRDA;
+        if (ZS_IS_INTMODEM(uap)) {
+                struct device_node* i2c_modem = find_devices("i2c-modem");
+                if (i2c_modem) {
+                        char* mid = get_property(i2c_modem, "modem-id", NULL);
+                        if (mid) switch(*mid) {
+                        case 0x04 :
+                        case 0x05 :
+                        case 0x07 :
+                        case 0x08 :
+                        case 0x0b :
+                        case 0x0c :
+                                uap->port_type = PMAC_SCC_I2S1;
+                        }
+                        printk(KERN_INFO "pmac_zilog: i2c-modem detected, id: %d\n",
+                                mid ? (*mid) : 0);
+                } else {
+                        printk(KERN_INFO "pmac_zilog: serial modem detected\n");
+                }
+        }
+
+        /*
+         * Init remaining bits of "port" structure
+         */
+        uap->port.iotype = SERIAL_IO_MEM;
+        uap->port.irq = np->intrs[0].line;
+        uap->port.uartclk = ZS_CLOCK;
+        uap->port.fifosize = 1;
+        uap->port.ops = &pmz_pops;
+        uap->port.type = PORT_PMAC_ZILOG;
+        uap->port.flags = 0;
+
+        /* Setup some valid baud rate information in the register
+         * shadows so we don't write crap there before baud rate is
+         * first initialized.
+         */
+        pmz_convert_to_zs(uap, CS8, 0, 9600);
+
+        return 0;
+}
+
+/*
+ * Get rid of a port on module removal
+ */
+static void pmz_dispose_port(struct uart_pmac_port *uap)
+{
+        struct device_node *np;
+
+        np = uap->node;
+        iounmap(uap->rx_dma_regs);
+        iounmap(uap->tx_dma_regs);
+        iounmap(uap->control_reg);
+        uap->node = NULL;
+        of_node_put(np);
+        memset(uap, 0, sizeof(struct uart_pmac_port));
+}
+
+/*
+ * Called upon match with an escc node in the devive-tree.
+ */
+static int pmz_attach(struct macio_dev *mdev, const struct of_match *match)
+{
+        int i;
+        
+        /* Iterate the pmz_ports array to find a matching entry
+         */
+        for (i = 0; i < MAX_ZS_PORTS; i++)
+                if (pmz_ports[i].node == mdev->ofdev.node) {
+                        struct uart_pmac_port *uap = &pmz_ports[i];
+
+                        uap->dev = mdev;
+                        dev_set_drvdata(&mdev->ofdev.dev, uap);
+                        if (macio_request_resources(uap->dev, "pmac_zilog"))
+                                printk(KERN_WARNING "%s: Failed to request resource"
+                                       ", port still active\n",
+                                       uap->node->name);
+                        else
+                                uap->flags |= PMACZILOG_FLAG_RSRC_REQUESTED;                            
+                        return 0;
+                }
+        return -ENODEV;
+}
+
+/*
+ * That one should not be called, macio isn't really a hotswap device,
+ * we don't expect one of those serial ports to go away...
+ */
+static int pmz_detach(struct macio_dev *mdev)
+{
+        struct uart_pmac_port   *uap = dev_get_drvdata(&mdev->ofdev.dev);
+        
+        if (!uap)
+                return -ENODEV;
+
+        if (uap->flags & PMACZILOG_FLAG_RSRC_REQUESTED) {
+                macio_release_resources(uap->dev);
+                uap->flags &= ~PMACZILOG_FLAG_RSRC_REQUESTED;
+        }
+        dev_set_drvdata(&mdev->ofdev.dev, NULL);
+        uap->dev = NULL;
+        
+        return 0;
+}
+
+
+static int pmz_suspend(struct macio_dev *mdev, u32 pm_state)
+{
+        struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev);
+        struct uart_state *state;
+        unsigned long flags;
+
+        if (uap == NULL) {
+                printk("HRM... pmz_suspend with NULL uap\n");
+                return 0;
+        }
+
+        if (pm_state == mdev->ofdev.dev.power.power_state || pm_state < 2)
+                return 0;
+
+        pmz_debug("suspend, switching to state %d\n", pm_state);
+
+        state = pmz_uart_reg.state + uap->port.line;
+
+        down(&pmz_irq_sem);
+        down(&state->sem);
+
+        spin_lock_irqsave(&uap->port.lock, flags);
+
+        if (ZS_IS_OPEN(uap) || ZS_IS_CONS(uap)) {
+                /* Disable receiver and transmitter.  */
+                uap->curregs[R3] &= ~RxENABLE;
+                uap->curregs[R5] &= ~TxENABLE;
+
+                /* Disable all interrupts and BRK assertion.  */
+                uap->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+                uap->curregs[R5] &= ~SND_BRK;
+                pmz_load_zsregs(uap, uap->curregs);
+                uap->flags |= PMACZILOG_FLAG_IS_ASLEEP;
+                mb();
+        }
+
+        spin_unlock_irqrestore(&uap->port.lock, flags);
+
+        if (ZS_IS_OPEN(uap) || ZS_IS_OPEN(uap->mate))
+                if (ZS_IS_ASLEEP(uap->mate) && ZS_IS_IRQ_ON(pmz_get_port_A(uap))) {
+                        pmz_get_port_A(uap)->flags &= ~PMACZILOG_FLAG_IS_IRQ_ON;
+                        disable_irq(uap->port.irq);
+                }
+
+        if (ZS_IS_CONS(uap))
+                uap->port.cons->flags &= ~CON_ENABLED;
+
+        /* Shut the chip down */
+        pmz_set_scc_power(uap, 0);
+
+        up(&state->sem);
+        up(&pmz_irq_sem);
+
+        pmz_debug("suspend, switching complete\n");
+
+        mdev->ofdev.dev.power.power_state = pm_state;
+
+        return 0;
+}
+
+
+static int pmz_resume(struct macio_dev *mdev)
+{
+        struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev);
+        struct uart_state *state;
+        unsigned long flags;
+        int pwr_delay = 0;
+
+        if (uap == NULL)
+                return 0;
+
+        if (mdev->ofdev.dev.power.power_state == 0)
+                return 0;
+        
+        pmz_debug("resume, switching to state 0\n");
+
+        state = pmz_uart_reg.state + uap->port.line;
+
+        down(&pmz_irq_sem);
+        down(&state->sem);
+
+        spin_lock_irqsave(&uap->port.lock, flags);
+        if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
+                spin_unlock_irqrestore(&uap->port.lock, flags);
+                goto bail;
+        }
+        pwr_delay = __pmz_startup(uap);
+
+        /* Take care of config that may have changed while asleep */
+        __pmz_set_termios(&uap->port, &uap->termios_cache, NULL);
+
+        if (ZS_IS_OPEN(uap)) {
+                /* Enable interrupts */         
+                uap->curregs[R1] |= INT_ALL_Rx | TxINT_ENAB;
+                if (!ZS_IS_EXTCLK(uap))
+                        uap->curregs[R1] |= EXT_INT_ENAB;
+                write_zsreg(uap, R1, uap->curregs[R1]);
+        }
+
+        spin_unlock_irqrestore(&uap->port.lock, flags);
+
+        if (ZS_IS_CONS(uap))
+                uap->port.cons->flags |= CON_ENABLED;
+
+        /* Re-enable IRQ on the controller */
+        if (ZS_IS_OPEN(uap) && !ZS_IS_IRQ_ON(pmz_get_port_A(uap))) {
+                pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON;
+                enable_irq(uap->port.irq);
+        }
+
+ bail:
+        up(&state->sem);
+        up(&pmz_irq_sem);
+
+        /* Right now, we deal with delay by blocking here, I'll be
+         * smarter later on
+         */
+        if (pwr_delay != 0) {
+                pmz_debug("pmz: delaying %d ms\n", pwr_delay);
+                msleep(pwr_delay);
+        }
+
+        pmz_debug("resume, switching complete\n");
+
+        mdev->ofdev.dev.power.power_state = 0;
+
+        return 0;
+}
+
+/*
+ * Probe all ports in the system and build the ports array, we register
+ * with the serial layer at this point, the macio-type probing is only
+ * used later to "attach" to the sysfs tree so we get power management
+ * events
+ */
+static int __init pmz_probe(void)
+{
+        struct device_node      *node_p, *node_a, *node_b, *np;
+        int                     count = 0;
+        int                     rc;
+
+        /*
+         * Find all escc chips in the system
+         */
+        node_p = of_find_node_by_name(NULL, "escc");
+        while (node_p) {
+                /*
+                 * First get channel A/B node pointers
+                 * 
+                 * TODO: Add routines with proper locking to do that...
+                 */
+                node_a = node_b = NULL;
+                for (np = NULL; (np = of_get_next_child(node_p, np)) != NULL;) {
+                        if (strncmp(np->name, "ch-a", 4) == 0)
+                                node_a = of_node_get(np);
+                        else if (strncmp(np->name, "ch-b", 4) == 0)
+                                node_b = of_node_get(np);
+                }
+                if (!node_a && !node_b) {
+                        of_node_put(node_a);
+                        of_node_put(node_b);
+                        printk(KERN_ERR "pmac_zilog: missing node %c for escc %s\n",
+                                (!node_a) ? 'a' : 'b', node_p->full_name);
+                        goto next;
+                }
+
+                /*
+                 * Fill basic fields in the port structures
+                 */
+                pmz_ports[count].mate           = &pmz_ports[count+1];
+                pmz_ports[count+1].mate         = &pmz_ports[count];
+                pmz_ports[count].flags          = PMACZILOG_FLAG_IS_CHANNEL_A;
+                pmz_ports[count].node           = node_a;
+                pmz_ports[count+1].node         = node_b;
+                pmz_ports[count].port.line      = count;
+                pmz_ports[count+1].port.line    = count+1;
+
+                /*
+                 * Setup the ports for real
+                 */
+                rc = pmz_init_port(&pmz_ports[count]);
+                if (rc == 0 && node_b != NULL)
+                        rc = pmz_init_port(&pmz_ports[count+1]);
+                if (rc != 0) {
+                        of_node_put(node_a);
+                        of_node_put(node_b);
+                        memset(&pmz_ports[count], 0, sizeof(struct uart_pmac_port));
+                        memset(&pmz_ports[count+1], 0, sizeof(struct uart_pmac_port));
+                        goto next;
+                }
+                count += 2;
+next:
+                node_p = of_find_node_by_name(node_p, "escc");
+        }
+        pmz_ports_count = count;
+
+        return 0;
+}
+
+#ifdef CONFIG_SERIAL_PMACZILOG_CONSOLE
+
+static void pmz_console_write(struct console *con, const char *s, unsigned int count);
+static int __init pmz_console_setup(struct console *co, char *options);
+
+static struct console pmz_console = {
+        .name   =       "ttyS",
+        .write  =       pmz_console_write,
+        .device =       uart_console_device,
+        .setup  =       pmz_console_setup,
+        .flags  =       CON_PRINTBUFFER,
+        .index  =       -1,
+        .data   =       &pmz_uart_reg,
+};
+
+#define PMACZILOG_CONSOLE       &pmz_console
+#else /* CONFIG_SERIAL_PMACZILOG_CONSOLE */
+#define PMACZILOG_CONSOLE       (NULL)
+#endif /* CONFIG_SERIAL_PMACZILOG_CONSOLE */
+
+/*
+ * Register the driver, console driver and ports with the serial
+ * core
+ */
+static int __init pmz_register(void)
+{
+        int i, rc;
+        
+        pmz_uart_reg.nr = pmz_ports_count;
+        pmz_uart_reg.cons = PMACZILOG_CONSOLE;
+        pmz_uart_reg.minor = 64;
+
+        /*
+         * Register this driver with the serial core
+         */
+        rc = uart_register_driver(&pmz_uart_reg);
+        if (rc)
+                return rc;
+
+        /*
+         * Register each port with the serial core
+         */
+        for (i = 0; i < pmz_ports_count; i++) {
+                struct uart_pmac_port *uport = &pmz_ports[i];
+                /* NULL node may happen on wallstreet */
+                if (uport->node != NULL)
+                        rc = uart_add_one_port(&pmz_uart_reg, &uport->port);
+                if (rc)
+                        goto err_out;
+        }
+
+        return 0;
+err_out:
+        while (i-- > 0) {
+                struct uart_pmac_port *uport = &pmz_ports[i];
+                uart_remove_one_port(&pmz_uart_reg, &uport->port);
+        }
+        uart_unregister_driver(&pmz_uart_reg);
+        return rc;
+}
+
+static struct of_match pmz_match[] = 
+{
+        {
+        .name           = "ch-a",
+        .type           = OF_ANY_MATCH,
+        .compatible     = OF_ANY_MATCH
+        },
+        {
+        .name           = "ch-b",
+        .type           = OF_ANY_MATCH,
+        .compatible     = OF_ANY_MATCH
+        },
+        {},
+};
+
+static struct macio_driver pmz_driver = 
+{
+        .name           = "pmac_zilog",
+        .match_table    = pmz_match,
+        .probe          = pmz_attach,
+        .remove         = pmz_detach,
+        .suspend        = pmz_suspend,
+        .resume         = pmz_resume,
+};
+
+static int __init init_pmz(void)
+{
+        int rc, i;
+        printk(KERN_INFO "%s\n", version);
+
+        /* 
+         * First, we need to do a direct OF-based probe pass. We
+         * do that because we want serial console up before the
+         * macio stuffs calls us back, and since that makes it
+         * easier to pass the proper number of channels to
+         * uart_register_driver()
+         */
+        if (pmz_ports_count == 0)
+                pmz_probe();
+
+        /*
+         * Bail early if no port found
+         */
+        if (pmz_ports_count == 0)
+                return -ENODEV;
+
+        /*
+         * Now we register with the serial layer
+         */
+        rc = pmz_register();
+        if (rc) {
+                printk(KERN_ERR 
+                        "pmac_zilog: Error registering serial device, disabling pmac_zilog.\n"
+                        "pmac_zilog: Did another serial driver already claim the minors?\n"); 
+                /* effectively "pmz_unprobe()" */
+                for (i=0; i < pmz_ports_count; i++)
+                        pmz_dispose_port(&pmz_ports[i]);
+                return rc;
+        }
+        
+        /*
+         * Then we register the macio driver itself
+         */
+        return macio_register_driver(&pmz_driver);
+}
+
+static void __exit exit_pmz(void)
+{
+        int i;
+
+        /* Get rid of macio-driver (detach from macio) */
+        macio_unregister_driver(&pmz_driver);
+
+        for (i = 0; i < pmz_ports_count; i++) {
+                struct uart_pmac_port *uport = &pmz_ports[i];
+                if (uport->node != NULL) {
+                        uart_remove_one_port(&pmz_uart_reg, &uport->port);
+                        pmz_dispose_port(uport);
+                }
+        }
+        /* Unregister UART driver */
+        uart_unregister_driver(&pmz_uart_reg);
+}
+
+#ifdef CONFIG_SERIAL_PMACZILOG_CONSOLE
+
+/*
+ * Print a string to the serial port trying not to disturb
+ * any possible real use of the port...
+ */
+static void pmz_console_write(struct console *con, const char *s, unsigned int count)
+{
+        struct uart_pmac_port *uap = &pmz_ports[con->index];
+        unsigned long flags;
+        int i;
+
+        if (ZS_IS_ASLEEP(uap))
+                return;
+        spin_lock_irqsave(&uap->port.lock, flags);
+
+        /* Turn of interrupts and enable the transmitter. */
+        write_zsreg(uap, R1, uap->curregs[1] & ~TxINT_ENAB);
+        write_zsreg(uap, R5, uap->curregs[5] | TxENABLE | RTS | DTR);
+
+        for (i = 0; i < count; i++) {
+                /* Wait for the transmit buffer to empty. */
+                while ((read_zsreg(uap, R0) & Tx_BUF_EMP) == 0)
+                        udelay(5);
+                write_zsdata(uap, s[i]);
+                if (s[i] == 10) {
+                        while ((read_zsreg(uap, R0) & Tx_BUF_EMP) == 0)
+                                udelay(5);
+                        write_zsdata(uap, R13);
+                }
+        }
+
+        /* Restore the values in the registers. */
+        write_zsreg(uap, R1, uap->curregs[1]);
+        /* Don't disable the transmitter. */
+
+        spin_unlock_irqrestore(&uap->port.lock, flags);
+}
+
+/*
+ * Setup the serial console
+ */
+static int __init pmz_console_setup(struct console *co, char *options)
+{
+        struct uart_pmac_port *uap;
+        struct uart_port *port;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+        unsigned long pwr_delay;
+
+        /*
+         * XServe's default to 57600 bps
+         */
+        if (machine_is_compatible("RackMac1,1")
+            || machine_is_compatible("RackMac1,2")
+            || machine_is_compatible("MacRISC4"))
+                baud = 57600;
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= pmz_ports_count)
+                co->index = 0;
+        uap = &pmz_ports[co->index];
+        if (uap->node == NULL)
+                return -ENODEV;
+        port = &uap->port;
+
+        /*
+         * Mark port as beeing a console
+         */
+        uap->flags |= PMACZILOG_FLAG_IS_CONS;
+
+        /*
+         * Temporary fix for uart layer who didn't setup the spinlock yet
+         */
+        spin_lock_init(&port->lock);
+
+        /*
+         * Enable the hardware
+         */
+        pwr_delay = __pmz_startup(uap);
+        if (pwr_delay)
+                mdelay(pwr_delay);
+        
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static int __init pmz_console_init(void)
+{
+        /* Probe ports */
+        pmz_probe();
+
+        /* TODO: Autoprobe console based on OF */
+        /* pmz_console.index = i; */
+        register_console(&pmz_console);
+
+        return 0;
+
+}
+console_initcall(pmz_console_init);
+#endif /* CONFIG_SERIAL_PMACZILOG_CONSOLE */
+
+module_init(init_pmz);
+module_exit(exit_pmz);
diff --git a/drivers/serial/pmac_zilog.h b/drivers/serial/pmac_zilog.h
new file mode 100644
index 000000000000..c03f9bfacdd8
--- /dev/null
+++ b/drivers/serial/pmac_zilog.h
@@ -0,0 +1,382 @@
+#ifndef __PMAC_ZILOG_H__
+#define __PMAC_ZILOG_H__
+
+#define pmz_debug(fmt,arg...)   dev_dbg(&uap->dev->ofdev.dev, fmt, ## arg)
+
+/*
+ * At most 2 ESCCs with 2 ports each
+ */
+#define MAX_ZS_PORTS    4
+
+/* 
+ * We wrap our port structure around the generic uart_port.
+ */
+#define NUM_ZSREGS    17
+
+struct uart_pmac_port {
+        struct uart_port                port;
+        struct uart_pmac_port           *mate;
+
+        /* macio_dev for the escc holding this port (maybe be null on
+         * early inited port)
+         */
+        struct macio_dev                *dev;
+        /* device node to this port, this points to one of 2 childs
+         * of "escc" node (ie. ch-a or ch-b)
+         */
+        struct device_node              *node;
+
+        /* Port type as obtained from device tree (IRDA, modem, ...) */
+        int                             port_type;
+        u8                              curregs[NUM_ZSREGS];
+
+        unsigned int                    flags;
+#define PMACZILOG_FLAG_IS_CONS          0x00000001
+#define PMACZILOG_FLAG_IS_KGDB          0x00000002
+#define PMACZILOG_FLAG_MODEM_STATUS     0x00000004
+#define PMACZILOG_FLAG_IS_CHANNEL_A     0x00000008
+#define PMACZILOG_FLAG_REGS_HELD        0x00000010
+#define PMACZILOG_FLAG_TX_STOPPED       0x00000020
+#define PMACZILOG_FLAG_TX_ACTIVE        0x00000040
+#define PMACZILOG_FLAG_ENABLED          0x00000080
+#define PMACZILOG_FLAG_IS_IRDA          0x00000100
+#define PMACZILOG_FLAG_IS_INTMODEM      0x00000200
+#define PMACZILOG_FLAG_HAS_DMA          0x00000400
+#define PMACZILOG_FLAG_RSRC_REQUESTED   0x00000800
+#define PMACZILOG_FLAG_IS_ASLEEP        0x00001000
+#define PMACZILOG_FLAG_IS_OPEN          0x00002000
+#define PMACZILOG_FLAG_IS_IRQ_ON        0x00004000
+#define PMACZILOG_FLAG_IS_EXTCLK        0x00008000
+#define PMACZILOG_FLAG_BREAK            0x00010000
+
+        unsigned char                   parity_mask;
+        unsigned char                   prev_status;
+
+        volatile u8                     __iomem *control_reg;
+        volatile u8                     __iomem *data_reg;
+
+        unsigned int                    tx_dma_irq;
+        unsigned int                    rx_dma_irq;
+        volatile struct dbdma_regs      __iomem *tx_dma_regs;
+        volatile struct dbdma_regs      __iomem *rx_dma_regs;
+
+        struct termios                  termios_cache;
+};
+
+#define to_pmz(p) ((struct uart_pmac_port *)(p))
+
+static inline struct uart_pmac_port *pmz_get_port_A(struct uart_pmac_port *uap)
+{
+        if (uap->flags & PMACZILOG_FLAG_IS_CHANNEL_A)
+                return uap;
+        return uap->mate;
+}
+
+/*
+ * Register acessors. Note that we don't need to enforce a recovery
+ * delay on PCI PowerMac hardware, it's dealt in HW by the MacIO chip,
+ * though if we try to use this driver on older machines, we might have
+ * to add it back
+ */
+static inline u8 read_zsreg(struct uart_pmac_port *port, u8 reg)
+{
+        if (reg != 0)
+                writeb(reg, port->control_reg);
+        return readb(port->control_reg);
+}
+
+static inline void write_zsreg(struct uart_pmac_port *port, u8 reg, u8 value)
+{
+        if (reg != 0)
+                writeb(reg, port->control_reg);
+        writeb(value, port->control_reg);
+}
+
+static inline u8 read_zsdata(struct uart_pmac_port *port)
+{
+        return readb(port->data_reg);
+}
+
+static inline void write_zsdata(struct uart_pmac_port *port, u8 data)
+{
+        writeb(data, port->data_reg);
+}
+
+static inline void zssync(struct uart_pmac_port *port)
+{
+        (void)readb(port->control_reg);
+}
+
+/* Conversion routines to/from brg time constants from/to bits
+ * per second.
+ */
+#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2))
+#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2)
+
+#define ZS_CLOCK         3686400        /* Z8530 RTxC input clock rate */
+
+/* The Zilog register set */
+
+#define FLAG    0x7e
+
+/* Write Register 0 */
+#define R0      0               /* Register selects */
+#define R1      1
+#define R2      2
+#define R3      3
+#define R4      4
+#define R5      5
+#define R6      6
+#define R7      7
+#define R8      8
+#define R9      9
+#define R10     10
+#define R11     11
+#define R12     12
+#define R13     13
+#define R14     14
+#define R15     15
+#define R7P     16
+
+#define NULLCODE        0       /* Null Code */
+#define POINT_HIGH      0x8     /* Select upper half of registers */
+#define RES_EXT_INT     0x10    /* Reset Ext. Status Interrupts */
+#define SEND_ABORT      0x18    /* HDLC Abort */
+#define RES_RxINT_FC    0x20    /* Reset RxINT on First Character */
+#define RES_Tx_P        0x28    /* Reset TxINT Pending */
+#define ERR_RES         0x30    /* Error Reset */
+#define RES_H_IUS       0x38    /* Reset highest IUS */
+
+#define RES_Rx_CRC      0x40    /* Reset Rx CRC Checker */
+#define RES_Tx_CRC      0x80    /* Reset Tx CRC Checker */
+#define RES_EOM_L       0xC0    /* Reset EOM latch */
+
+/* Write Register 1 */
+
+#define EXT_INT_ENAB    0x1     /* Ext Int Enable */
+#define TxINT_ENAB      0x2     /* Tx Int Enable */
+#define PAR_SPEC        0x4     /* Parity is special condition */
+
+#define RxINT_DISAB     0       /* Rx Int Disable */
+#define RxINT_FCERR     0x8     /* Rx Int on First Character Only or Error */
+#define INT_ALL_Rx      0x10    /* Int on all Rx Characters or error */
+#define INT_ERR_Rx      0x18    /* Int on error only */
+#define RxINT_MASK      0x18
+
+#define WT_RDY_RT       0x20    /* W/Req reflects recv if 1, xmit if 0 */
+#define WT_FN_RDYFN     0x40    /* W/Req pin is DMA request if 1, wait if 0 */
+#define WT_RDY_ENAB     0x80    /* Enable W/Req pin */
+
+/* Write Register #2 (Interrupt Vector) */
+
+/* Write Register 3 */
+
+#define RxENABLE        0x1     /* Rx Enable */
+#define SYNC_L_INH      0x2     /* Sync Character Load Inhibit */
+#define ADD_SM          0x4     /* Address Search Mode (SDLC) */
+#define RxCRC_ENAB      0x8     /* Rx CRC Enable */
+#define ENT_HM          0x10    /* Enter Hunt Mode */
+#define AUTO_ENAB       0x20    /* Auto Enables */
+#define Rx5             0x0     /* Rx 5 Bits/Character */
+#define Rx7             0x40    /* Rx 7 Bits/Character */
+#define Rx6             0x80    /* Rx 6 Bits/Character */
+#define Rx8             0xc0    /* Rx 8 Bits/Character */
+#define RxN_MASK        0xc0
+
+/* Write Register 4 */
+
+#define PAR_ENAB        0x1     /* Parity Enable */
+#define PAR_EVEN        0x2     /* Parity Even/Odd* */
+
+#define SYNC_ENAB       0       /* Sync Modes Enable */
+#define SB1             0x4     /* 1 stop bit/char */
+#define SB15            0x8     /* 1.5 stop bits/char */
+#define SB2             0xc     /* 2 stop bits/char */
+#define SB_MASK         0xc
+
+#define MONSYNC         0       /* 8 Bit Sync character */
+#define BISYNC          0x10    /* 16 bit sync character */
+#define SDLC            0x20    /* SDLC Mode (01111110 Sync Flag) */
+#define EXTSYNC         0x30    /* External Sync Mode */
+
+#define X1CLK           0x0     /* x1 clock mode */
+#define X16CLK          0x40    /* x16 clock mode */
+#define X32CLK          0x80    /* x32 clock mode */
+#define X64CLK          0xC0    /* x64 clock mode */
+#define XCLK_MASK       0xC0
+
+/* Write Register 5 */
+
+#define TxCRC_ENAB      0x1     /* Tx CRC Enable */
+#define RTS             0x2     /* RTS */
+#define SDLC_CRC        0x4     /* SDLC/CRC-16 */
+#define TxENABLE        0x8     /* Tx Enable */
+#define SND_BRK         0x10    /* Send Break */
+#define Tx5             0x0     /* Tx 5 bits (or less)/character */
+#define Tx7             0x20    /* Tx 7 bits/character */
+#define Tx6             0x40    /* Tx 6 bits/character */
+#define Tx8             0x60    /* Tx 8 bits/character */
+#define TxN_MASK        0x60
+#define DTR             0x80    /* DTR */
+
+/* Write Register 6 (Sync bits 0-7/SDLC Address Field) */
+
+/* Write Register 7 (Sync bits 8-15/SDLC 01111110) */
+
+/* Write Register 7' (Some enhanced feature control) */
+#define ENEXREAD        0x40    /* Enable read of some write registers */
+
+/* Write Register 8 (transmit buffer) */
+
+/* Write Register 9 (Master interrupt control) */
+#define VIS     1       /* Vector Includes Status */
+#define NV      2       /* No Vector */
+#define DLC     4       /* Disable Lower Chain */
+#define MIE     8       /* Master Interrupt Enable */
+#define STATHI  0x10    /* Status high */
+#define NORESET 0       /* No reset on write to R9 */
+#define CHRB    0x40    /* Reset channel B */
+#define CHRA    0x80    /* Reset channel A */
+#define FHWRES  0xc0    /* Force hardware reset */
+
+/* Write Register 10 (misc control bits) */
+#define BIT6    1       /* 6 bit/8bit sync */
+#define LOOPMODE 2      /* SDLC Loop mode */
+#define ABUNDER 4       /* Abort/flag on SDLC xmit underrun */
+#define MARKIDLE 8      /* Mark/flag on idle */
+#define GAOP    0x10    /* Go active on poll */
+#define NRZ     0       /* NRZ mode */
+#define NRZI    0x20    /* NRZI mode */
+#define FM1     0x40    /* FM1 (transition = 1) */
+#define FM0     0x60    /* FM0 (transition = 0) */
+#define CRCPS   0x80    /* CRC Preset I/O */
+
+/* Write Register 11 (Clock Mode control) */
+#define TRxCXT  0       /* TRxC = Xtal output */
+#define TRxCTC  1       /* TRxC = Transmit clock */
+#define TRxCBR  2       /* TRxC = BR Generator Output */
+#define TRxCDP  3       /* TRxC = DPLL output */
+#define TRxCOI  4       /* TRxC O/I */
+#define TCRTxCP 0       /* Transmit clock = RTxC pin */
+#define TCTRxCP 8       /* Transmit clock = TRxC pin */
+#define TCBR    0x10    /* Transmit clock = BR Generator output */
+#define TCDPLL  0x18    /* Transmit clock = DPLL output */
+#define RCRTxCP 0       /* Receive clock = RTxC pin */
+#define RCTRxCP 0x20    /* Receive clock = TRxC pin */
+#define RCBR    0x40    /* Receive clock = BR Generator output */
+#define RCDPLL  0x60    /* Receive clock = DPLL output */
+#define RTxCX   0x80    /* RTxC Xtal/No Xtal */
+
+/* Write Register 12 (lower byte of baud rate generator time constant) */
+
+/* Write Register 13 (upper byte of baud rate generator time constant) */
+
+/* Write Register 14 (Misc control bits) */
+#define BRENAB  1       /* Baud rate generator enable */
+#define BRSRC   2       /* Baud rate generator source */
+#define DTRREQ  4       /* DTR/Request function */
+#define AUTOECHO 8      /* Auto Echo */
+#define LOOPBAK 0x10    /* Local loopback */
+#define SEARCH  0x20    /* Enter search mode */
+#define RMC     0x40    /* Reset missing clock */
+#define DISDPLL 0x60    /* Disable DPLL */
+#define SSBR    0x80    /* Set DPLL source = BR generator */
+#define SSRTxC  0xa0    /* Set DPLL source = RTxC */
+#define SFMM    0xc0    /* Set FM mode */
+#define SNRZI   0xe0    /* Set NRZI mode */
+
+/* Write Register 15 (external/status interrupt control) */
+#define EN85C30 1       /* Enable some 85c30-enhanced registers */
+#define ZCIE    2       /* Zero count IE */
+#define ENSTFIFO 4      /* Enable status FIFO (SDLC) */
+#define DCDIE   8       /* DCD IE */
+#define SYNCIE  0x10    /* Sync/hunt IE */
+#define CTSIE   0x20    /* CTS IE */
+#define TxUIE   0x40    /* Tx Underrun/EOM IE */
+#define BRKIE   0x80    /* Break/Abort IE */
+
+
+/* Read Register 0 */
+#define Rx_CH_AV        0x1     /* Rx Character Available */
+#define ZCOUNT          0x2     /* Zero count */
+#define Tx_BUF_EMP      0x4     /* Tx Buffer empty */
+#define DCD             0x8     /* DCD */
+#define SYNC_HUNT       0x10    /* Sync/hunt */
+#define CTS             0x20    /* CTS */
+#define TxEOM           0x40    /* Tx underrun */
+#define BRK_ABRT        0x80    /* Break/Abort */
+
+/* Read Register 1 */
+#define ALL_SNT         0x1     /* All sent */
+/* Residue Data for 8 Rx bits/char programmed */
+#define RES3            0x8     /* 0/3 */
+#define RES4            0x4     /* 0/4 */
+#define RES5            0xc     /* 0/5 */
+#define RES6            0x2     /* 0/6 */
+#define RES7            0xa     /* 0/7 */
+#define RES8            0x6     /* 0/8 */
+#define RES18           0xe     /* 1/8 */
+#define RES28           0x0     /* 2/8 */
+/* Special Rx Condition Interrupts */
+#define PAR_ERR         0x10    /* Parity error */
+#define Rx_OVR          0x20    /* Rx Overrun Error */
+#define CRC_ERR         0x40    /* CRC/Framing Error */
+#define END_FR          0x80    /* End of Frame (SDLC) */
+
+/* Read Register 2 (channel b only) - Interrupt vector */
+#define CHB_Tx_EMPTY    0x00
+#define CHB_EXT_STAT    0x02
+#define CHB_Rx_AVAIL    0x04
+#define CHB_SPECIAL     0x06
+#define CHA_Tx_EMPTY    0x08
+#define CHA_EXT_STAT    0x0a
+#define CHA_Rx_AVAIL    0x0c
+#define CHA_SPECIAL     0x0e
+#define STATUS_MASK     0x06
+
+/* Read Register 3 (interrupt pending register) ch a only */
+#define CHBEXT  0x1             /* Channel B Ext/Stat IP */
+#define CHBTxIP 0x2             /* Channel B Tx IP */
+#define CHBRxIP 0x4             /* Channel B Rx IP */
+#define CHAEXT  0x8             /* Channel A Ext/Stat IP */
+#define CHATxIP 0x10            /* Channel A Tx IP */
+#define CHARxIP 0x20            /* Channel A Rx IP */
+
+/* Read Register 8 (receive data register) */
+
+/* Read Register 10  (misc status bits) */
+#define ONLOOP  2               /* On loop */
+#define LOOPSEND 0x10           /* Loop sending */
+#define CLK2MIS 0x40            /* Two clocks missing */
+#define CLK1MIS 0x80            /* One clock missing */
+
+/* Read Register 12 (lower byte of baud rate generator constant) */
+
+/* Read Register 13 (upper byte of baud rate generator constant) */
+
+/* Read Register 15 (value of WR 15) */
+
+/* Misc macros */
+#define ZS_CLEARERR(port)    (write_zsreg(port, 0, ERR_RES))
+#define ZS_CLEARFIFO(port)   do { volatile unsigned char garbage; \
+                                     garbage = read_zsdata(port); \
+                                     garbage = read_zsdata(port); \
+                                     garbage = read_zsdata(port); \
+                                } while(0)
+
+#define ZS_IS_CONS(UP)                  ((UP)->flags & PMACZILOG_FLAG_IS_CONS)
+#define ZS_IS_KGDB(UP)                  ((UP)->flags & PMACZILOG_FLAG_IS_KGDB)
+#define ZS_IS_CHANNEL_A(UP)             ((UP)->flags & PMACZILOG_FLAG_IS_CHANNEL_A)
+#define ZS_REGS_HELD(UP)                ((UP)->flags & PMACZILOG_FLAG_REGS_HELD)
+#define ZS_TX_STOPPED(UP)               ((UP)->flags & PMACZILOG_FLAG_TX_STOPPED)
+#define ZS_TX_ACTIVE(UP)                ((UP)->flags & PMACZILOG_FLAG_TX_ACTIVE)
+#define ZS_WANTS_MODEM_STATUS(UP)       ((UP)->flags & PMACZILOG_FLAG_MODEM_STATUS)
+#define ZS_IS_IRDA(UP)                  ((UP)->flags & PMACZILOG_FLAG_IS_IRDA)
+#define ZS_IS_INTMODEM(UP)              ((UP)->flags & PMACZILOG_FLAG_IS_INTMODEM)
+#define ZS_HAS_DMA(UP)                  ((UP)->flags & PMACZILOG_FLAG_HAS_DMA)
+#define ZS_IS_ASLEEP(UP)                ((UP)->flags & PMACZILOG_FLAG_IS_ASLEEP)
+#define ZS_IS_OPEN(UP)                  ((UP)->flags & PMACZILOG_FLAG_IS_OPEN)
+#define ZS_IS_IRQ_ON(UP)                ((UP)->flags & PMACZILOG_FLAG_IS_IRQ_ON)
+#define ZS_IS_EXTCLK(UP)                ((UP)->flags & PMACZILOG_FLAG_IS_EXTCLK)
+
+#endif /* __PMAC_ZILOG_H__ */
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
new file mode 100644
index 000000000000..68b25b2c26b1
--- /dev/null
+++ b/drivers/serial/pxa.c
@@ -0,0 +1,877 @@
+/*
+ *  linux/drivers/serial/pxa.c
+ *
+ *  Based on drivers/serial/8250.c by Russell King.
+ *
+ *  Author:     Nicolas Pitre
+ *  Created:    Feb 20, 2003
+ *  Copyright:  (C) 2003 Monta Vista Software, Inc.
+ *
+ * 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.
+ *
+ * Note 1: This driver is made separate from the already too overloaded
+ * 8250.c because it needs some kirks of its own and that'll make it
+ * easier to add DMA support.
+ *
+ * Note 2: I'm too sick of device allocation policies for serial ports.
+ * If someone else wants to request an "official" allocation of major/minor
+ * for this driver please be my guest.  And don't forget that new hardware
+ * to come from Intel might have more than 3 or 4 of those UARTs.  Let's
+ * hope for a better port registration and dynamic device allocation scheme
+ * with the serial core maintainer satisfaction to appear soon.
+ */
+
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/serial_reg.h>
+#include <linux/circ_buf.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/arch/pxa-regs.h>
+
+
+struct uart_pxa_port {
+        struct uart_port        port;
+        unsigned char           ier;
+        unsigned char           lcr;
+        unsigned char           mcr;
+        unsigned int            lsr_break_flag;
+        unsigned int            cken;
+        char                    *name;
+};
+
+static inline unsigned int serial_in(struct uart_pxa_port *up, int offset)
+{
+        offset <<= 2;
+        return readl(up->port.membase + offset);
+}
+
+static inline void serial_out(struct uart_pxa_port *up, int offset, int value)
+{
+        offset <<= 2;
+        writel(value, up->port.membase + offset);
+}
+
+static void serial_pxa_enable_ms(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+
+        up->ier |= UART_IER_MSI;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static void serial_pxa_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+
+        if (up->ier & UART_IER_THRI) {
+                up->ier &= ~UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+}
+
+static void serial_pxa_stop_rx(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+
+        up->ier &= ~UART_IER_RLSI;
+        up->port.read_status_mask &= ~UART_LSR_DR;
+        serial_out(up, UART_IER, up->ier);
+}
+
+static inline void
+receive_chars(struct uart_pxa_port *up, int *status, struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;
+        unsigned int ch, flag;
+        int max_count = 256;
+
+        do {
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /*
+                         * If this failed then we will throw away the
+                         * bytes but must do so to clear interrupts
+                         */
+                }
+                ch = serial_in(up, UART_RX);
+                flag = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
+                                       UART_LSR_FE | UART_LSR_OE))) {
+                        /*
+                         * For statistics only
+                         */
+                        if (*status & UART_LSR_BI) {
+                                *status &= ~(UART_LSR_FE | UART_LSR_PE);
+                                up->port.icount.brk++;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        goto ignore_char;
+                        } else if (*status & UART_LSR_PE)
+                                up->port.icount.parity++;
+                        else if (*status & UART_LSR_FE)
+                                up->port.icount.frame++;
+                        if (*status & UART_LSR_OE)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ignored.
+                         */
+                        *status &= up->port.read_status_mask;
+
+#ifdef CONFIG_SERIAL_PXA_CONSOLE
+                        if (up->port.line == up->port.cons->index) {
+                                /* Recover the break flag from console xmit */
+                                *status |= up->lsr_break_flag;
+                                up->lsr_break_flag = 0;
+                        }
+#endif
+                        if (*status & UART_LSR_BI) {
+                                flag = TTY_BREAK;
+                        } else if (*status & UART_LSR_PE)
+                                flag = TTY_PARITY;
+                        else if (*status & UART_LSR_FE)
+                                flag = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto ignore_char;
+                if ((*status & up->port.ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+                if ((*status & UART_LSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+        ignore_char:
+                *status = serial_in(up, UART_LSR);
+        } while ((*status & UART_LSR_DR) && (max_count-- > 0));
+        tty_flip_buffer_push(tty);
+}
+
+static void transmit_chars(struct uart_pxa_port *up)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int count;
+
+        if (up->port.x_char) {
+                serial_out(up, UART_TX, up->port.x_char);
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                serial_pxa_stop_tx(&up->port, 0);
+                return;
+        }
+
+        count = up->port.fifosize / 2;
+        do {
+                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+
+        if (uart_circ_empty(xmit))
+                serial_pxa_stop_tx(&up->port, 0);
+}
+
+static void serial_pxa_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+
+        if (!(up->ier & UART_IER_THRI)) {
+                up->ier |= UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+}
+
+static inline void check_modem_status(struct uart_pxa_port *up)
+{
+        int status;
+
+        status = serial_in(up, UART_MSR);
+
+        if ((status & UART_MSR_ANY_DELTA) == 0)
+                return;
+
+        if (status & UART_MSR_TERI)
+                up->port.icount.rng++;
+        if (status & UART_MSR_DDSR)
+                up->port.icount.dsr++;
+        if (status & UART_MSR_DDCD)
+                uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
+        if (status & UART_MSR_DCTS)
+                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+
+        wake_up_interruptible(&up->port.info->delta_msr_wait);
+}
+
+/*
+ * This handles the interrupt from one port.
+ */
+static inline irqreturn_t
+serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)dev_id;
+        unsigned int iir, lsr;
+
+        iir = serial_in(up, UART_IIR);
+        if (iir & UART_IIR_NO_INT)
+                return IRQ_NONE;
+        lsr = serial_in(up, UART_LSR);
+        if (lsr & UART_LSR_DR)
+                receive_chars(up, &lsr, regs);
+        check_modem_status(up);
+        if (lsr & UART_LSR_THRE)
+                transmit_chars(up);
+        return IRQ_HANDLED;
+}
+
+static unsigned int serial_pxa_tx_empty(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static unsigned int serial_pxa_get_mctrl(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned long flags;
+        unsigned char status;
+        unsigned int ret;
+
+return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+        spin_lock_irqsave(&up->port.lock, flags);
+        status = serial_in(up, UART_MSR);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        ret = 0;
+        if (status & UART_MSR_DCD)
+                ret |= TIOCM_CAR;
+        if (status & UART_MSR_RI)
+                ret |= TIOCM_RNG;
+        if (status & UART_MSR_DSR)
+                ret |= TIOCM_DSR;
+        if (status & UART_MSR_CTS)
+                ret |= TIOCM_CTS;
+        return ret;
+}
+
+static void serial_pxa_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned char mcr = 0;
+
+        if (mctrl & TIOCM_RTS)
+                mcr |= UART_MCR_RTS;
+        if (mctrl & TIOCM_DTR)
+                mcr |= UART_MCR_DTR;
+        if (mctrl & TIOCM_OUT1)
+                mcr |= UART_MCR_OUT1;
+        if (mctrl & TIOCM_OUT2)
+                mcr |= UART_MCR_OUT2;
+        if (mctrl & TIOCM_LOOP)
+                mcr |= UART_MCR_LOOP;
+
+        mcr |= up->mcr;
+
+        serial_out(up, UART_MCR, mcr);
+}
+
+static void serial_pxa_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (break_state == -1)
+                up->lcr |= UART_LCR_SBC;
+        else
+                up->lcr &= ~UART_LCR_SBC;
+        serial_out(up, UART_LCR, up->lcr);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+#if 0
+static void serial_pxa_dma_init(struct pxa_uart *up)
+{
+        up->rxdma =
+                pxa_request_dma(up->name, DMA_PRIO_LOW, pxa_receive_dma, up);
+        if (up->rxdma < 0)
+                goto out;
+        up->txdma =
+                pxa_request_dma(up->name, DMA_PRIO_LOW, pxa_transmit_dma, up);
+        if (up->txdma < 0)
+                goto err_txdma;
+        up->dmadesc = kmalloc(4 * sizeof(pxa_dma_desc), GFP_KERNEL);
+        if (!up->dmadesc)
+                goto err_alloc;
+
+        /* ... */
+err_alloc:
+        pxa_free_dma(up->txdma);
+err_rxdma:
+        pxa_free_dma(up->rxdma);
+out:
+        return;
+}
+#endif
+
+static int serial_pxa_startup(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned long flags;
+        int retval;
+
+        up->mcr = 0;
+
+        /*
+         * Allocate the IRQ
+         */
+        retval = request_irq(up->port.irq, serial_pxa_irq, 0, up->name, up);
+        if (retval)
+                return retval;
+
+        /*
+         * Clear the FIFO buffers and disable them.
+         * (they will be reenabled in set_termios())
+         */
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                        UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+        serial_out(up, UART_FCR, 0);
+
+        /*
+         * Clear the interrupt registers.
+         */
+        (void) serial_in(up, UART_LSR);
+        (void) serial_in(up, UART_RX);
+        (void) serial_in(up, UART_IIR);
+        (void) serial_in(up, UART_MSR);
+
+        /*
+         * Now, initialize the UART
+         */
+        serial_out(up, UART_LCR, UART_LCR_WLEN8);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        up->port.mctrl |= TIOCM_OUT2;
+        serial_pxa_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Finally, enable interrupts.  Note: Modem status interrupts
+         * are set via set_termios(), which will be occuring imminently
+         * anyway, so we don't enable them here.
+         */
+        up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE;
+        serial_out(up, UART_IER, up->ier);
+
+        /*
+         * And clear the interrupt registers again for luck.
+         */
+        (void) serial_in(up, UART_LSR);
+        (void) serial_in(up, UART_RX);
+        (void) serial_in(up, UART_IIR);
+        (void) serial_in(up, UART_MSR);
+
+        return 0;
+}
+
+static void serial_pxa_shutdown(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned long flags;
+
+        free_irq(up->port.irq, up);
+
+        /*
+         * Disable interrupts from this port
+         */
+        up->ier = 0;
+        serial_out(up, UART_IER, 0);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        up->port.mctrl &= ~TIOCM_OUT2;
+        serial_pxa_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Disable break condition and FIFOs
+         */
+        serial_out(up, UART_LCR, serial_in(up, UART_LCR) & ~UART_LCR_SBC);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                                  UART_FCR_CLEAR_RCVR |
+                                  UART_FCR_CLEAR_XMIT);
+        serial_out(up, UART_FCR, 0);
+}
+
+static void
+serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
+                       struct termios *old)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        unsigned char cval, fcr = 0;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                cval = 0x00;
+                break;
+        case CS6:
+                cval = 0x01;
+                break;
+        case CS7:
+                cval = 0x02;
+                break;
+        default:
+        case CS8:
+                cval = 0x03;
+                break;
+        }
+
+        if (termios->c_cflag & CSTOPB)
+                cval |= 0x04;
+        if (termios->c_cflag & PARENB)
+                cval |= UART_LCR_PARITY;
+        if (!(termios->c_cflag & PARODD))
+                cval |= UART_LCR_EPAR;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+
+        if ((up->port.uartclk / quot) < (2400 * 16))
+                fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR1;
+        else
+                fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR8;
+
+        /*
+         * Ok, we're now changing the port state.  Do it with
+         * interrupts disabled.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Ensure the port will be enabled.
+         * This is required especially for serial console.
+         */
+        up->ier |= IER_UUE;
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, quot);
+
+        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
+        if (termios->c_iflag & INPCK)
+                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= UART_LSR_BI;
+
+        /*
+         * Characters to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
+        if (termios->c_iflag & IGNBRK) {
+                up->port.ignore_status_mask |= UART_LSR_BI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        up->port.ignore_status_mask |= UART_LSR_OE;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= UART_LSR_DR;
+
+        /*
+         * CTS flow control flag and modem status interrupts
+         */
+        up->ier &= ~UART_IER_MSI;
+        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+                up->ier |= UART_IER_MSI;
+
+        serial_out(up, UART_IER, up->ier);
+
+        serial_out(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
+        serial_out(up, UART_DLL, quot & 0xff);          /* LS of divisor */
+        serial_out(up, UART_DLM, quot >> 8);            /* MS of divisor */
+        serial_out(up, UART_LCR, cval);         /* reset DLAB */
+        up->lcr = cval;                                 /* Save LCR */
+        serial_pxa_set_mctrl(&up->port, up->port.mctrl);
+        serial_out(up, UART_FCR, fcr);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void
+serial_pxa_pm(struct uart_port *port, unsigned int state,
+              unsigned int oldstate)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        pxa_set_cken(up->cken, !state);
+        if (!state)
+                udelay(1);
+}
+
+static void serial_pxa_release_port(struct uart_port *port)
+{
+}
+
+static int serial_pxa_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static void serial_pxa_config_port(struct uart_port *port, int flags)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        up->port.type = PORT_PXA;
+}
+
+static int
+serial_pxa_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        /* we don't want the core code to modify any port params */
+        return -EINVAL;
+}
+
+static const char *
+serial_pxa_type(struct uart_port *port)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+        return up->name;
+}
+
+#ifdef CONFIG_SERIAL_PXA_CONSOLE
+
+extern struct uart_pxa_port serial_pxa_ports[];
+extern struct uart_driver serial_pxa_reg;
+
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static inline void wait_for_xmitr(struct uart_pxa_port *up)
+{
+        unsigned int status, tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        do {
+                status = serial_in(up, UART_LSR);
+
+                if (status & UART_LSR_BI)
+                        up->lsr_break_flag = UART_LSR_BI;
+
+                if (--tmout == 0)
+                        break;
+                udelay(1);
+        } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & UPF_CONS_FLOW) {
+                tmout = 1000000;
+                while (--tmout &&
+                       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
+                        udelay(1);
+        }
+}
+
+/*
+ * Print a string to the serial port trying not to disturb
+ * any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ */
+static void
+serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_pxa_port *up = &serial_pxa_ports[co->index];
+        unsigned int ier;
+        int i;
+
+        /*
+         *      First save the UER then disable the interrupts
+         */
+        ier = serial_in(up, UART_IER);
+        serial_out(up, UART_IER, UART_IER_UUE);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++, s++) {
+                wait_for_xmitr(up);
+
+                /*
+                 *      Send the character out.
+                 *      If a LF, also do CR...
+                 */
+                serial_out(up, UART_TX, *s);
+                if (*s == 10) {
+                        wait_for_xmitr(up);
+                        serial_out(up, UART_TX, 13);
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(up);
+        serial_out(up, UART_IER, ier);
+}
+
+static int __init
+serial_pxa_console_setup(struct console *co, char *options)
+{
+        struct uart_pxa_port *up;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        if (co->index == -1 || co->index >= serial_pxa_reg.nr)
+                co->index = 0;
+        up = &serial_pxa_ports[co->index];
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(&up->port, co, baud, parity, bits, flow);
+}
+
+static struct console serial_pxa_console = {
+        .name           = "ttyS",
+        .write          = serial_pxa_console_write,
+        .device         = uart_console_device,
+        .setup          = serial_pxa_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &serial_pxa_reg,
+};
+
+static int __init
+serial_pxa_console_init(void)
+{
+        register_console(&serial_pxa_console);
+        return 0;
+}
+
+console_initcall(serial_pxa_console_init);
+
+#define PXA_CONSOLE     &serial_pxa_console
+#else
+#define PXA_CONSOLE     NULL
+#endif
+
+struct uart_ops serial_pxa_pops = {
+        .tx_empty       = serial_pxa_tx_empty,
+        .set_mctrl      = serial_pxa_set_mctrl,
+        .get_mctrl      = serial_pxa_get_mctrl,
+        .stop_tx        = serial_pxa_stop_tx,
+        .start_tx       = serial_pxa_start_tx,
+        .stop_rx        = serial_pxa_stop_rx,
+        .enable_ms      = serial_pxa_enable_ms,
+        .break_ctl      = serial_pxa_break_ctl,
+        .startup        = serial_pxa_startup,
+        .shutdown       = serial_pxa_shutdown,
+        .set_termios    = serial_pxa_set_termios,
+        .pm             = serial_pxa_pm,
+        .type           = serial_pxa_type,
+        .release_port   = serial_pxa_release_port,
+        .request_port   = serial_pxa_request_port,
+        .config_port    = serial_pxa_config_port,
+        .verify_port    = serial_pxa_verify_port,
+};
+
+static struct uart_pxa_port serial_pxa_ports[] = {
+     {  /* FFUART */
+        .name   = "FFUART",
+        .cken   = CKEN6_FFUART,
+        .port   = {
+                .type           = PORT_PXA,
+                .iotype         = UPIO_MEM,
+                .membase        = (void *)&FFUART,
+                .mapbase        = __PREG(FFUART),
+                .irq            = IRQ_FFUART,
+                .uartclk        = 921600 * 16,
+                .fifosize       = 64,
+                .ops            = &serial_pxa_pops,
+                .line           = 0,
+        },
+  }, {  /* BTUART */
+        .name   = "BTUART",
+        .cken   = CKEN7_BTUART,
+        .port   = {
+                .type           = PORT_PXA,
+                .iotype         = UPIO_MEM,
+                .membase        = (void *)&BTUART,
+                .mapbase        = __PREG(BTUART),
+                .irq            = IRQ_BTUART,
+                .uartclk        = 921600 * 16,
+                .fifosize       = 64,
+                .ops            = &serial_pxa_pops,
+                .line           = 1,
+        },
+  }, {  /* STUART */
+        .name   = "STUART",
+        .cken   = CKEN5_STUART,
+        .port   = {
+                .type           = PORT_PXA,
+                .iotype         = UPIO_MEM,
+                .membase        = (void *)&STUART,
+                .mapbase        = __PREG(STUART),
+                .irq            = IRQ_STUART,
+                .uartclk        = 921600 * 16,
+                .fifosize       = 64,
+                .ops            = &serial_pxa_pops,
+                .line           = 2,
+        },
+  }
+};
+
+static struct uart_driver serial_pxa_reg = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "PXA serial",
+        .devfs_name     = "tts/",
+        .dev_name       = "ttyS",
+        .major          = TTY_MAJOR,
+        .minor          = 64,
+        .nr             = ARRAY_SIZE(serial_pxa_ports),
+        .cons           = PXA_CONSOLE,
+};
+
+static int serial_pxa_suspend(struct device *_dev, u32 state, u32 level)
+{
+        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+
+        if (sport && level == SUSPEND_DISABLE)
+                uart_suspend_port(&serial_pxa_reg, &sport->port);
+
+        return 0;
+}
+
+static int serial_pxa_resume(struct device *_dev, u32 level)
+{
+        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+
+        if (sport && level == RESUME_ENABLE)
+                uart_resume_port(&serial_pxa_reg, &sport->port);
+
+        return 0;
+}
+
+static int serial_pxa_probe(struct device *_dev)
+{
+        struct platform_device *dev = to_platform_device(_dev);
+
+        serial_pxa_ports[dev->id].port.dev = _dev;
+        uart_add_one_port(&serial_pxa_reg, &serial_pxa_ports[dev->id].port);
+        dev_set_drvdata(_dev, &serial_pxa_ports[dev->id]);
+        return 0;
+}
+
+static int serial_pxa_remove(struct device *_dev)
+{
+        struct uart_pxa_port *sport = dev_get_drvdata(_dev);
+
+        dev_set_drvdata(_dev, NULL);
+
+        if (sport)
+                uart_remove_one_port(&serial_pxa_reg, &sport->port);
+
+        return 0;
+}
+
+static struct device_driver serial_pxa_driver = {
+        .name           = "pxa2xx-uart",
+        .bus            = &platform_bus_type,
+        .probe          = serial_pxa_probe,
+        .remove         = serial_pxa_remove,
+
+        .suspend        = serial_pxa_suspend,
+        .resume         = serial_pxa_resume,
+};
+
+int __init serial_pxa_init(void)
+{
+        int ret;
+
+        ret = uart_register_driver(&serial_pxa_reg);
+        if (ret != 0)
+                return ret;
+
+        ret = driver_register(&serial_pxa_driver);
+        if (ret != 0)
+                uart_unregister_driver(&serial_pxa_reg);
+
+        return ret;
+}
+
+void __exit serial_pxa_exit(void)
+{
+        driver_unregister(&serial_pxa_driver);
+        uart_unregister_driver(&serial_pxa_reg);
+}
+
+module_init(serial_pxa_init);
+module_exit(serial_pxa_exit);
+
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
new file mode 100644
index 000000000000..ffc61389614b
--- /dev/null
+++ b/drivers/serial/s3c2410.c
@@ -0,0 +1,1831 @@
+/*
+ * linux/drivers/serial/s3c2410.c
+ *
+ * Driver for onboard UARTs on the Samsung S3C24XX
+ *
+ * Based on drivers/char/serial.c and drivers/char/21285.c
+ *
+ * Ben Dooks, (c) 2003-2005 Simtec Electronics
+ *      http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * Changelog:
+ *
+ * 22-Jul-2004  BJD  Finished off device rewrite
+ *
+ * 21-Jul-2004  BJD  Thanks to <herbet@13thfloor.at> for pointing out
+ *                   problems with baud rate and loss of IR settings. Update
+ *                   to add configuration via platform_device structure
+ *
+ * 28-Sep-2004  BJD  Re-write for the following items
+ *                   - S3C2410 and S3C2440 serial support
+ *                   - Power Management support
+ *                   - Fix console via IrDA devices
+ *                   - SysReq (Herbert Pötzl)
+ *                   - Break character handling (Herbert Pötzl)
+ *                   - spin-lock initialisation (Dimitry Andric)
+ *                   - added clock control
+ *                   - updated init code to use platform_device info
+ *
+ * 06-Mar-2005  BJD  Add s3c2440 fclk clock source
+ *
+ * 09-Mar-2005  BJD  Add s3c2400 support
+ *
+ * 10-Mar-2005  LCVR Changed S3C2410_VA_UART to S3C24XX_VA_UART
+*/
+
+/* Note on 2440 fclk clock source handling
+ *
+ * Whilst it is possible to use the fclk as clock source, the method
+ * of properly switching too/from this is currently un-implemented, so
+ * whichever way is configured at startup is the one that will be used.
+*/
+
+/* Hote on 2410 error handling
+ *
+ * The s3c2410 manual has a love/hate affair with the contents of the
+ * UERSTAT register in the UART blocks, and keeps marking some of the
+ * error bits as reserved. Having checked with the s3c2410x01,
+ * it copes with BREAKs properly, so I am happy to ignore the RESERVED
+ * feature from the latter versions of the manual.
+ *
+ * If it becomes aparrent that latter versions of the 2410 remove these
+ * bits, then action will have to be taken to differentiate the versions
+ * and change the policy on BREAK
+ *
+ * BJD, 04-Nov-2004
+*/
+
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_S3C2410_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include <asm/hardware.h>
+#include <asm/hardware/clock.h>
+
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+
+#include <asm/mach-types.h>
+
+/* structures */
+
+struct s3c24xx_uart_info {
+        char                    *name;
+        unsigned int            type;
+        unsigned int            fifosize;
+        unsigned long           rx_fifomask;
+        unsigned long           rx_fifoshift;
+        unsigned long           rx_fifofull;
+        unsigned long           tx_fifomask;
+        unsigned long           tx_fifoshift;
+        unsigned long           tx_fifofull;
+
+        /* clock source control */
+
+        int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
+        int (*set_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
+
+        /* uart controls */
+        int (*reset_port)(struct uart_port *, struct s3c2410_uartcfg *);
+};
+
+struct s3c24xx_uart_port {
+        unsigned char                   rx_claimed;
+        unsigned char                   tx_claimed;
+
+        struct s3c24xx_uart_info        *info;
+        struct s3c24xx_uart_clksrc      *clksrc;
+        struct clk                      *clk;
+        struct clk                      *baudclk;
+        struct uart_port                port;
+};
+
+
+/* configuration defines */
+
+#if 0
+#if 1
+/* send debug to the low-level output routines */
+
+extern void printascii(const char *);
+
+static void
+s3c24xx_serial_dbg(const char *fmt, ...)
+{
+        va_list va;
+        char buff[256];
+
+        va_start(va, fmt);
+        vsprintf(buff, fmt, va);
+        va_end(va);
+
+        printascii(buff);
+}
+
+#define dbg(x...) s3c24xx_serial_dbg(x)
+
+#else
+#define dbg(x...) printk(KERN_DEBUG "s3c24xx: ");
+#endif
+#else /* no debug */
+#define dbg(x...) do {} while(0)
+#endif
+
+/* UART name and device definitions */
+
+#define S3C24XX_SERIAL_NAME     "ttySAC"
+#define S3C24XX_SERIAL_DEVFS    "tts/"
+#define S3C24XX_SERIAL_MAJOR    204
+#define S3C24XX_SERIAL_MINOR    64
+
+
+/* conversion functions */
+
+#define s3c24xx_dev_to_port(__dev) (struct uart_port *)dev_get_drvdata(__dev)
+#define s3c24xx_dev_to_cfg(__dev) (struct s3c2410_uartcfg *)((__dev)->platform_data)
+
+/* we can support 3 uarts, but not always use them */
+
+#define NR_PORTS (3)
+
+/* port irq numbers */
+
+#define TX_IRQ(port) ((port)->irq + 1)
+#define RX_IRQ(port) ((port)->irq)
+
+/* register access controls */
+
+#define portaddr(port, reg) ((port)->membase + (reg))
+
+#define rd_regb(port, reg) (__raw_readb(portaddr(port, reg)))
+#define rd_regl(port, reg) (__raw_readl(portaddr(port, reg)))
+
+#define wr_regb(port, reg, val) \
+  do { __raw_writeb(val, portaddr(port, reg)); } while(0)
+
+#define wr_regl(port, reg, val) \
+  do { __raw_writel(val, portaddr(port, reg)); } while(0)
+
+/* macros to change one thing to another */
+
+#define tx_enabled(port) ((port)->unused[0])
+#define rx_enabled(port) ((port)->unused[1])
+
+/* flag to ignore all characters comming in */
+#define RXSTAT_DUMMY_READ (0x10000000)
+
+static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port)
+{
+        return container_of(port, struct s3c24xx_uart_port, port);
+}
+
+/* translate a port to the device name */
+
+static inline char *s3c24xx_serial_portname(struct uart_port *port)
+{
+        return to_platform_device(port->dev)->name;
+}
+
+static int s3c24xx_serial_txempty_nofifo(struct uart_port *port)
+{
+        return (rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE);
+}
+
+static void s3c24xx_serial_rx_enable(struct uart_port *port)
+{
+        unsigned long flags;
+        unsigned int ucon, ufcon;
+        int count = 10000;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        while (--count && !s3c24xx_serial_txempty_nofifo(port))
+                udelay(100);
+
+        ufcon = rd_regl(port, S3C2410_UFCON);
+        ufcon |= S3C2410_UFCON_RESETRX;
+        wr_regl(port, S3C2410_UFCON, ufcon);
+
+        ucon = rd_regl(port, S3C2410_UCON);
+        ucon |= S3C2410_UCON_RXIRQMODE;
+        wr_regl(port, S3C2410_UCON, ucon);
+
+        rx_enabled(port) = 1;
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void s3c24xx_serial_rx_disable(struct uart_port *port)
+{
+        unsigned long flags;
+        unsigned int ucon;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ucon = rd_regl(port, S3C2410_UCON);
+        ucon &= ~S3C2410_UCON_RXIRQMODE;
+        wr_regl(port, S3C2410_UCON, ucon);
+
+        rx_enabled(port) = 0;
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void
+s3c24xx_serial_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        if (tx_enabled(port)) {
+                disable_irq(TX_IRQ(port));
+                tx_enabled(port) = 0;
+                if (port->flags & UPF_CONS_FLOW)
+                        s3c24xx_serial_rx_enable(port);
+        }
+}
+
+static void
+s3c24xx_serial_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        if (!tx_enabled(port)) {
+                if (port->flags & UPF_CONS_FLOW)
+                        s3c24xx_serial_rx_disable(port);
+
+                enable_irq(TX_IRQ(port));
+                tx_enabled(port) = 1;
+        }
+}
+
+
+static void s3c24xx_serial_stop_rx(struct uart_port *port)
+{
+        if (rx_enabled(port)) {
+                dbg("s3c24xx_serial_stop_rx: port=%p\n", port);
+                disable_irq(RX_IRQ(port));
+                rx_enabled(port) = 0;
+        }
+}
+
+static void s3c24xx_serial_enable_ms(struct uart_port *port)
+{
+}
+
+static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port)
+{
+        return to_ourport(port)->info;
+}
+
+static inline struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port)
+{
+        if (port->dev == NULL)
+                return NULL;
+
+        return (struct s3c2410_uartcfg *)port->dev->platform_data;
+}
+
+static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
+                                     unsigned long ufstat)
+{
+        struct s3c24xx_uart_info *info = ourport->info;
+
+        if (ufstat & info->rx_fifofull)
+                return info->fifosize;
+
+        return (ufstat & info->rx_fifomask) >> info->rx_fifoshift;
+}
+
+
+/* ? - where has parity gone?? */
+#define S3C2410_UERSTAT_PARITY (0x1000)
+
+static irqreturn_t
+s3c24xx_serial_rx_chars(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct s3c24xx_uart_port *ourport = dev_id;
+        struct uart_port *port = &ourport->port;
+        struct tty_struct *tty = port->info->tty;
+        unsigned int ufcon, ch, flag, ufstat, uerstat;
+        int max_count = 64;
+
+        while (max_count-- > 0) {
+                ufcon = rd_regl(port, S3C2410_UFCON);
+                ufstat = rd_regl(port, S3C2410_UFSTAT);
+
+                if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0)
+                        break;
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+
+                        /*
+                         * If this failed then we will throw away the
+                         * bytes but must do so to clear interrupts
+                         */
+                }
+
+                uerstat = rd_regl(port, S3C2410_UERSTAT);
+                ch = rd_regb(port, S3C2410_URXH);
+
+                if (port->flags & UPF_CONS_FLOW) {
+                        int txe = s3c24xx_serial_txempty_nofifo(port);
+
+                        if (rx_enabled(port)) {
+                                if (!txe) {
+                                        rx_enabled(port) = 0;
+                                        continue;
+                                }
+                        } else {
+                                if (txe) {
+                                        ufcon |= S3C2410_UFCON_RESETRX;
+                                        wr_regl(port, S3C2410_UFCON, ufcon);
+                                        rx_enabled(port) = 1;
+                                        goto out;
+                                }
+                                continue;
+                        }
+                }
+
+                /* insert the character into the buffer */
+
+                flag = TTY_NORMAL;
+                port->icount.rx++;
+
+                if (uerstat & S3C2410_UERSTAT_ANY) {
+                        dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n",
+                            ch, uerstat);
+
+                        /* check for break */
+                        if (uerstat & S3C2410_UERSTAT_BREAK) {
+                                dbg("break!\n");
+                                port->icount.brk++;
+                                if (uart_handle_break(port))
+                                    goto ignore_char;
+                        }
+
+                        if (uerstat & S3C2410_UERSTAT_FRAME)
+                                port->icount.frame++;
+                        if (uerstat & S3C2410_UERSTAT_OVERRUN)
+                                port->icount.overrun++;
+
+                        uerstat &= port->read_status_mask;
+
+                        if (uerstat & S3C2410_UERSTAT_BREAK)
+                                flag = TTY_BREAK;
+                        else if (uerstat & S3C2410_UERSTAT_PARITY)
+                                flag = TTY_PARITY;
+                        else if (uerstat & ( S3C2410_UERSTAT_FRAME | S3C2410_UERSTAT_OVERRUN))
+                                flag = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char(port, ch, regs))
+                        goto ignore_char;
+
+                if ((uerstat & port->ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+
+                if ((uerstat & S3C2410_UERSTAT_OVERRUN) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+
+        ignore_char:
+                continue;
+        }
+        tty_flip_buffer_push(tty);
+
+ out:
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id, struct pt_regs *regs)
+{
+        struct s3c24xx_uart_port *ourport = id;
+        struct uart_port *port = &ourport->port;
+        struct circ_buf *xmit = &port->info->xmit;
+        int count = 256;
+
+        if (port->x_char) {
+                wr_regb(port, S3C2410_UTXH, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                goto out;
+        }
+
+        /* if there isnt anything more to transmit, or the uart is now
+         * stopped, disable the uart and exit
+        */
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                s3c24xx_serial_stop_tx(port, 0);
+                goto out;
+        }
+
+        /* try and drain the buffer... */
+
+        while (!uart_circ_empty(xmit) && count-- > 0) {
+                if (rd_regl(port, S3C2410_UFSTAT) & ourport->info->tx_fifofull)
+                        break;
+
+                wr_regb(port, S3C2410_UTXH, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+        }
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                s3c24xx_serial_stop_tx(port, 0);
+
+ out:
+        return IRQ_HANDLED;
+}
+
+static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned long ufstat = rd_regl(port, S3C2410_UFSTAT);
+        unsigned long ufcon = rd_regl(port, S3C2410_UFCON);
+
+        if (ufcon & S3C2410_UFCON_FIFOMODE) {
+                if ((ufstat & info->tx_fifomask) != 0 ||
+                    (ufstat & info->tx_fifofull))
+                        return 0;
+
+                return 1;
+        }
+
+        return s3c24xx_serial_txempty_nofifo(port);
+}
+
+/* no modem control lines */
+static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port)
+{
+        unsigned int umstat = rd_regb(port,S3C2410_UMSTAT);
+
+        if (umstat & S3C2410_UMSTAT_CTS)
+                return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+        else
+                return TIOCM_CAR | TIOCM_DSR;
+}
+
+static void s3c24xx_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        /* todo - possibly remove AFC and do manual CTS */
+}
+
+static void s3c24xx_serial_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long flags;
+        unsigned int ucon;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ucon = rd_regl(port, S3C2410_UCON);
+
+        if (break_state)
+                ucon |= S3C2410_UCON_SBREAK;
+        else
+                ucon &= ~S3C2410_UCON_SBREAK;
+
+        wr_regl(port, S3C2410_UCON, ucon);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void s3c24xx_serial_shutdown(struct uart_port *port)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        if (ourport->tx_claimed) {
+                free_irq(TX_IRQ(port), ourport);
+                tx_enabled(port) = 0;
+                ourport->tx_claimed = 0;
+        }
+
+        if (ourport->rx_claimed) {
+                free_irq(RX_IRQ(port), ourport);
+                ourport->rx_claimed = 0;
+                rx_enabled(port) = 0;
+        }
+}
+
+
+static int s3c24xx_serial_startup(struct uart_port *port)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+        unsigned long flags;
+        int ret;
+
+        dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
+            port->mapbase, port->membase);
+
+        local_irq_save(flags);
+
+        rx_enabled(port) = 1;
+
+        ret = request_irq(RX_IRQ(port),
+                          s3c24xx_serial_rx_chars, 0,
+                          s3c24xx_serial_portname(port), ourport);
+
+        if (ret != 0) {
+                printk(KERN_ERR "cannot get irq %d\n", RX_IRQ(port));
+                return ret;
+        }
+
+        ourport->rx_claimed = 1;
+
+        dbg("requesting tx irq...\n");
+
+        tx_enabled(port) = 1;
+
+        ret = request_irq(TX_IRQ(port),
+                          s3c24xx_serial_tx_chars, 0,
+                          s3c24xx_serial_portname(port), ourport);
+
+        if (ret) {
+                printk(KERN_ERR "cannot get irq %d\n", TX_IRQ(port));
+                goto err;
+        }
+
+        ourport->tx_claimed = 1;
+
+        dbg("s3c24xx_serial_startup ok\n");
+
+        /* the port reset code should have done the correct
+         * register setup for the port controls */
+
+        local_irq_restore(flags);
+        return ret;
+
+ err:
+        s3c24xx_serial_shutdown(port);
+        local_irq_restore(flags);
+        return ret;
+}
+
+/* power power management control */
+
+static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
+                              unsigned int old)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        switch (level) {
+        case 3:
+                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
+                        clk_disable(ourport->baudclk);
+
+                clk_disable(ourport->clk);
+                break;
+
+        case 0:
+                clk_enable(ourport->clk);
+
+                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
+                        clk_enable(ourport->baudclk);
+
+                break;
+        default:
+                printk(KERN_ERR "s3c24xx_serial: unknown pm %d\n", level);
+        }
+}
+
+/* baud rate calculation
+ *
+ * The UARTs on the S3C2410/S3C2440 can take their clocks from a number
+ * of different sources, including the peripheral clock ("pclk") and an
+ * external clock ("uclk"). The S3C2440 also adds the core clock ("fclk")
+ * with a programmable extra divisor.
+ *
+ * The following code goes through the clock sources, and calculates the
+ * baud clocks (and the resultant actual baud rates) and then tries to
+ * pick the closest one and select that.
+ *
+*/
+
+
+#define MAX_CLKS (8)
+
+static struct s3c24xx_uart_clksrc tmp_clksrc = {
+        .name           = "pclk",
+        .min_baud       = 0,
+        .max_baud       = 0,
+        .divisor        = 1,
+};
+
+static inline int
+s3c24xx_serial_getsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        return (info->get_clksrc)(port, c);
+}
+
+static inline int
+s3c24xx_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        return (info->set_clksrc)(port, c);
+}
+
+struct baud_calc {
+        struct s3c24xx_uart_clksrc      *clksrc;
+        unsigned int                     calc;
+        unsigned int                     quot;
+        struct clk                      *src;
+};
+
+static int s3c24xx_serial_calcbaud(struct baud_calc *calc,
+                                   struct uart_port *port,
+                                   struct s3c24xx_uart_clksrc *clksrc,
+                                   unsigned int baud)
+{
+        unsigned long rate;
+
+        calc->src = clk_get(port->dev, clksrc->name);
+        if (calc->src == NULL || IS_ERR(calc->src))
+                return 0;
+
+        rate = clk_get_rate(calc->src);
+        rate /= clksrc->divisor;
+
+        calc->clksrc = clksrc;
+        calc->quot = (rate + (8 * baud)) / (16 * baud);
+        calc->calc = (rate / (calc->quot * 16));
+
+        calc->quot--;
+        return 1;
+}
+
+static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
+                                          struct s3c24xx_uart_clksrc **clksrc,
+                                          struct clk **clk,
+                                          unsigned int baud)
+{
+        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
+        struct s3c24xx_uart_clksrc *clkp;
+        struct baud_calc res[MAX_CLKS];
+        struct baud_calc *resptr, *best, *sptr;
+        int i;
+
+        clkp = cfg->clocks;
+        best = NULL;
+
+        if (cfg->clocks_size < 2) {
+                if (cfg->clocks_size == 0)
+                        clkp = &tmp_clksrc;
+
+                /* check to see if we're sourcing fclk, and if so we're
+                 * going to have to update the clock source
+                 */
+
+                if (strcmp(clkp->name, "fclk") == 0) {
+                        struct s3c24xx_uart_clksrc src;
+
+                        s3c24xx_serial_getsource(port, &src);
+
+                        /* check that the port already using fclk, and if
+                         * not, then re-select fclk
+                         */
+
+                        if (strcmp(src.name, clkp->name) == 0) {
+                                s3c24xx_serial_setsource(port, clkp);
+                                s3c24xx_serial_getsource(port, &src);
+                        }
+
+                        clkp->divisor = src.divisor;
+                }
+
+                s3c24xx_serial_calcbaud(res, port, clkp, baud);
+                best = res;
+                resptr = best + 1;
+        } else {
+                resptr = res;
+
+                for (i = 0; i < cfg->clocks_size; i++, clkp++) {
+                        if (s3c24xx_serial_calcbaud(resptr, port, clkp, baud))
+                                resptr++;
+                }
+        }
+
+        /* ok, we now need to select the best clock we found */
+
+        if (!best) {
+                unsigned int deviation = (1<<30)|((1<<30)-1);
+                int calc_deviation;
+
+                for (sptr = res; sptr < resptr; sptr++) {
+                        printk(KERN_DEBUG
+                               "found clk %p (%s) quot %d, calc %d\n",
+                               sptr->clksrc, sptr->clksrc->name,
+                               sptr->quot, sptr->calc);
+
+                        calc_deviation = baud - sptr->calc;
+                        if (calc_deviation < 0)
+                                calc_deviation = -calc_deviation;
+
+                        if (calc_deviation < deviation) {
+                                best = sptr;
+                                deviation = calc_deviation;
+                        }
+                }
+
+                printk(KERN_DEBUG "best %p (deviation %d)\n", best, deviation);
+        }
+
+        printk(KERN_DEBUG "selected clock %p (%s) quot %d, calc %d\n",
+               best->clksrc, best->clksrc->name, best->quot, best->calc);
+
+        /* store results to pass back */
+
+        *clksrc = best->clksrc;
+        *clk    = best->src;
+
+        return best->quot;
+}
+
+static void s3c24xx_serial_set_termios(struct uart_port *port,
+                                       struct termios *termios,
+                                       struct termios *old)
+{
+        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+        struct s3c24xx_uart_clksrc *clksrc;
+        struct clk *clk;
+        unsigned long flags;
+        unsigned int baud, quot;
+        unsigned int ulcon;
+        unsigned int umcon;
+
+        /*
+         * We don't support modem control lines.
+         */
+        termios->c_cflag &= ~(HUPCL | CMSPAR);
+        termios->c_cflag |= CLOCAL;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+
+        baud = uart_get_baud_rate(port, termios, old, 0, 115200*8);
+
+        if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
+                quot = port->custom_divisor;
+        else
+                quot = s3c24xx_serial_getclk(port, &clksrc, &clk, baud);
+
+        /* check to see if we need  to change clock source */
+
+        if (ourport->clksrc != clksrc || ourport->baudclk != clk) {
+                s3c24xx_serial_setsource(port, clksrc);
+
+                if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
+                        clk_disable(ourport->baudclk);
+                        clk_unuse(ourport->baudclk);
+                        ourport->baudclk  = NULL;
+                }
+
+                clk_use(clk);
+                clk_enable(clk);
+
+                ourport->clksrc = clksrc;
+                ourport->baudclk = clk;
+        }
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                dbg("config: 5bits/char\n");
+                ulcon = S3C2410_LCON_CS5;
+                break;
+        case CS6:
+                dbg("config: 6bits/char\n");
+                ulcon = S3C2410_LCON_CS6;
+                break;
+        case CS7:
+                dbg("config: 7bits/char\n");
+                ulcon = S3C2410_LCON_CS7;
+                break;
+        case CS8:
+        default:
+                dbg("config: 8bits/char\n");
+                ulcon = S3C2410_LCON_CS8;
+                break;
+        }
+
+        /* preserve original lcon IR settings */
+        ulcon |= (cfg->ulcon & S3C2410_LCON_IRM);
+
+        if (termios->c_cflag & CSTOPB)
+                ulcon |= S3C2410_LCON_STOPB;
+
+        umcon = (termios->c_cflag & CRTSCTS) ? S3C2410_UMCOM_AFC : 0;
+
+        if (termios->c_cflag & PARENB) {
+                if (termios->c_cflag & PARODD)
+                        ulcon |= S3C2410_LCON_PODD;
+                else
+                        ulcon |= S3C2410_LCON_PEVEN;
+        } else {
+                ulcon |= S3C2410_LCON_PNONE;
+        }
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        dbg("setting ulcon to %08x, brddiv to %d\n", ulcon, quot);
+
+        wr_regl(port, S3C2410_ULCON, ulcon);
+        wr_regl(port, S3C2410_UBRDIV, quot);
+        wr_regl(port, S3C2410_UMCON, umcon);
+
+        dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n",
+            rd_regl(port, S3C2410_ULCON),
+            rd_regl(port, S3C2410_UCON),
+            rd_regl(port, S3C2410_UFCON));
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        /*
+         * Which character status flags are we interested in?
+         */
+        port->read_status_mask = S3C2410_UERSTAT_OVERRUN;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= S3C2410_UERSTAT_FRAME | S3C2410_UERSTAT_PARITY;
+
+        /*
+         * Which character status flags should we ignore?
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= S3C2410_UERSTAT_OVERRUN;
+        if (termios->c_iflag & IGNBRK && termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= S3C2410_UERSTAT_FRAME;
+
+        /*
+         * Ignore all characters if CREAD is not set.
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= RXSTAT_DUMMY_READ;
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *s3c24xx_serial_type(struct uart_port *port)
+{
+        switch (port->type) {
+        case PORT_S3C2410:
+                return "S3C2410";
+        case PORT_S3C2440:
+                return "S3C2440";
+        default:
+                return NULL;
+        }
+}
+
+#define MAP_SIZE (0x100)
+
+static void s3c24xx_serial_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, MAP_SIZE);
+}
+
+static int s3c24xx_serial_request_port(struct uart_port *port)
+{
+        char *name = s3c24xx_serial_portname(port);
+        return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY;
+}
+
+static void s3c24xx_serial_config_port(struct uart_port *port, int flags)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        if (flags & UART_CONFIG_TYPE &&
+            s3c24xx_serial_request_port(port) == 0)
+                port->type = info->type;
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int
+s3c24xx_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        if (ser->type != PORT_UNKNOWN && ser->type != info->type)
+                return -EINVAL;
+
+        return 0;
+}
+
+
+#ifdef CONFIG_SERIAL_S3C2410_CONSOLE
+
+static struct console s3c24xx_serial_console;
+
+#define S3C24XX_SERIAL_CONSOLE &s3c24xx_serial_console
+#else
+#define S3C24XX_SERIAL_CONSOLE NULL
+#endif
+
+static struct uart_ops s3c24xx_serial_ops = {
+        .pm             = s3c24xx_serial_pm,
+        .tx_empty       = s3c24xx_serial_tx_empty,
+        .get_mctrl      = s3c24xx_serial_get_mctrl,
+        .set_mctrl      = s3c24xx_serial_set_mctrl,
+        .stop_tx        = s3c24xx_serial_stop_tx,
+        .start_tx       = s3c24xx_serial_start_tx,
+        .stop_rx        = s3c24xx_serial_stop_rx,
+        .enable_ms      = s3c24xx_serial_enable_ms,
+        .break_ctl      = s3c24xx_serial_break_ctl,
+        .startup        = s3c24xx_serial_startup,
+        .shutdown       = s3c24xx_serial_shutdown,
+        .set_termios    = s3c24xx_serial_set_termios,
+        .type           = s3c24xx_serial_type,
+        .release_port   = s3c24xx_serial_release_port,
+        .request_port   = s3c24xx_serial_request_port,
+        .config_port    = s3c24xx_serial_config_port,
+        .verify_port    = s3c24xx_serial_verify_port,
+};
+
+
+static struct uart_driver s3c24xx_uart_drv = {
+        .owner          = THIS_MODULE,
+        .dev_name       = "s3c2410_serial",
+        .nr             = 3,
+        .cons           = S3C24XX_SERIAL_CONSOLE,
+        .driver_name    = S3C24XX_SERIAL_NAME,
+        .devfs_name     = S3C24XX_SERIAL_DEVFS,
+        .major          = S3C24XX_SERIAL_MAJOR,
+        .minor          = S3C24XX_SERIAL_MINOR,
+};
+
+static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
+        [0] = {
+                .port = {
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX0,
+                        .uartclk        = 0,
+                        .fifosize       = 16,
+                        .ops            = &s3c24xx_serial_ops,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 0,
+                }
+        },
+        [1] = {
+                .port = {
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX1,
+                        .uartclk        = 0,
+                        .fifosize       = 16,
+                        .ops            = &s3c24xx_serial_ops,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 1,
+                }
+        },
+#if NR_PORTS > 2
+
+        [2] = {
+                .port = {
+                        .lock           = SPIN_LOCK_UNLOCKED,
+                        .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX2,
+                        .uartclk        = 0,
+                        .fifosize       = 16,
+                        .ops            = &s3c24xx_serial_ops,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 2,
+                }
+        }
+#endif
+};
+
+/* s3c24xx_serial_resetport
+ *
+ * wrapper to call the specific reset for this port (reset the fifos
+ * and the settings)
+*/
+
+static inline int s3c24xx_serial_resetport(struct uart_port * port,
+                                           struct s3c2410_uartcfg *cfg)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+
+        return (info->reset_port)(port, cfg);
+}
+
+/* s3c24xx_serial_init_port
+ *
+ * initialise a single serial port from the platform device given
+ */
+
+static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
+                                    struct s3c24xx_uart_info *info,
+                                    struct platform_device *platdev)
+{
+        struct uart_port *port = &ourport->port;
+        struct s3c2410_uartcfg *cfg;
+        struct resource *res;
+
+        dbg("s3c24xx_serial_init_port: port=%p, platdev=%p\n", port, platdev);
+
+        if (platdev == NULL)
+                return -ENODEV;
+
+        cfg = s3c24xx_dev_to_cfg(&platdev->dev);
+
+        if (port->mapbase != 0)
+                return 0;
+
+        if (cfg->hwport > 3)
+                return -EINVAL;
+
+        /* setup info for port */
+        port->dev       = &platdev->dev;
+        ourport->info   = info;
+
+        /* copy the info in from provided structure */
+        ourport->port.fifosize = info->fifosize;
+
+        dbg("s3c24xx_serial_init_port: %p (hw %d)...\n", port, cfg->hwport);
+
+        port->uartclk = 1;
+
+        if (cfg->uart_flags & UPF_CONS_FLOW) {
+                dbg("s3c24xx_serial_init_port: enabling flow control\n");
+                port->flags |= UPF_CONS_FLOW;
+        }
+
+        /* sort our the physical and virtual addresses for each UART */
+
+        res = platform_get_resource(platdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                printk(KERN_ERR "failed to find memory resource for uart\n");
+                return -EINVAL;
+        }
+
+        dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
+
+        port->mapbase   = res->start;
+        port->membase   = S3C24XX_VA_UART + (res->start - S3C2410_PA_UART);
+        port->irq       = platform_get_irq(platdev, 0);
+
+        ourport->clk    = clk_get(&platdev->dev, "uart");
+
+        if (ourport->clk != NULL && !IS_ERR(ourport->clk))
+                clk_use(ourport->clk);
+
+        dbg("port: map=%08x, mem=%08x, irq=%d, clock=%ld\n",
+            port->mapbase, port->membase, port->irq, port->uartclk);
+
+        /* reset the fifos (and setup the uart) */
+        s3c24xx_serial_resetport(port, cfg);
+        return 0;
+}
+
+/* Device driver serial port probe */
+
+static int probe_index = 0;
+
+int s3c24xx_serial_probe(struct device *_dev,
+                         struct s3c24xx_uart_info *info)
+{
+        struct s3c24xx_uart_port *ourport;
+        struct platform_device *dev = to_platform_device(_dev);
+        int ret;
+
+        dbg("s3c24xx_serial_probe(%p, %p) %d\n", _dev, info, probe_index);
+
+        ourport = &s3c24xx_serial_ports[probe_index];
+        probe_index++;
+
+        dbg("%s: initialising port %p...\n", __FUNCTION__, ourport);
+
+        ret = s3c24xx_serial_init_port(ourport, info, dev);
+        if (ret < 0)
+                goto probe_err;
+
+        dbg("%s: adding port\n", __FUNCTION__);
+        uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
+        dev_set_drvdata(_dev, &ourport->port);
+
+        return 0;
+
+ probe_err:
+        return ret;
+}
+
+int s3c24xx_serial_remove(struct device *_dev)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(_dev);
+
+        if (port)
+                uart_remove_one_port(&s3c24xx_uart_drv, port);
+
+        return 0;
+}
+
+/* UART power management code */
+
+#ifdef CONFIG_PM
+
+int s3c24xx_serial_suspend(struct device *dev, u32 state, u32 level)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(dev);
+
+        if (port && level == SUSPEND_DISABLE)
+                uart_suspend_port(&s3c24xx_uart_drv, port);
+
+        return 0;
+}
+
+int s3c24xx_serial_resume(struct device *dev, u32 level)
+{
+        struct uart_port *port = s3c24xx_dev_to_port(dev);
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+
+        if (port && level == RESUME_ENABLE) {
+                clk_enable(ourport->clk);
+                s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
+                clk_disable(ourport->clk);
+
+                uart_resume_port(&s3c24xx_uart_drv, port);
+        }
+
+        return 0;
+}
+
+#else
+#define s3c24xx_serial_suspend NULL
+#define s3c24xx_serial_resume  NULL
+#endif
+
+int s3c24xx_serial_init(struct device_driver *drv,
+                        struct s3c24xx_uart_info *info)
+{
+        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
+        return driver_register(drv);
+}
+
+
+/* now comes the code to initialise either the s3c2410 or s3c2440 serial
+ * port information
+*/
+
+/* cpu specific variations on the serial port support */
+
+#ifdef CONFIG_CPU_S3C2400
+
+static int s3c2400_serial_getsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        clk->divisor = 1;
+        clk->name = "pclk";
+
+        return 0;
+}
+
+static int s3c2400_serial_setsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        return 0;
+}
+
+static int s3c2400_serial_resetport(struct uart_port *port,
+                                    struct s3c2410_uartcfg *cfg)
+{
+        dbg("s3c2400_serial_resetport: port=%p (%08lx), cfg=%p\n",
+            port, port->mapbase, cfg);
+
+        wr_regl(port, S3C2410_UCON,  cfg->ucon);
+        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
+
+        /* reset both fifos */
+
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        return 0;
+}
+
+static struct s3c24xx_uart_info s3c2400_uart_inf = {
+        .name           = "Samsung S3C2400 UART",
+        .type           = PORT_S3C2400,
+        .fifosize       = 16,
+        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
+        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
+        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
+        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
+        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
+        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
+        .get_clksrc     = s3c2400_serial_getsource,
+        .set_clksrc     = s3c2400_serial_setsource,
+        .reset_port     = s3c2400_serial_resetport,
+};
+
+static int s3c2400_serial_probe(struct device *dev)
+{
+        return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);
+}
+
+static struct device_driver s3c2400_serial_drv = {
+        .name           = "s3c2400-uart",
+        .bus            = &platform_bus_type,
+        .probe          = s3c2400_serial_probe,
+        .remove         = s3c24xx_serial_remove,
+        .suspend        = s3c24xx_serial_suspend,
+        .resume         = s3c24xx_serial_resume,
+};
+
+static inline int s3c2400_serial_init(void)
+{
+        return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf);
+}
+
+static inline void s3c2400_serial_exit(void)
+{
+        driver_unregister(&s3c2400_serial_drv);
+}
+
+#define s3c2400_uart_inf_at &s3c2400_uart_inf
+#else
+
+static inline int s3c2400_serial_init(void)
+{
+        return 0;
+}
+
+static inline void s3c2400_serial_exit(void)
+{
+}
+
+#define s3c2400_uart_inf_at NULL
+
+#endif /* CONFIG_CPU_S3C2400 */
+
+/* S3C2410 support */
+
+#ifdef CONFIG_CPU_S3C2410
+
+static int s3c2410_serial_setsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        if (strcmp(clk->name, "uclk") == 0)
+                ucon |= S3C2410_UCON_UCLK;
+        else
+                ucon &= ~S3C2410_UCON_UCLK;
+
+        wr_regl(port, S3C2410_UCON, ucon);
+        return 0;
+}
+
+static int s3c2410_serial_getsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        clk->divisor = 1;
+        clk->name = (ucon & S3C2410_UCON_UCLK) ? "uclk" : "pclk";
+
+        return 0;
+}
+
+static int s3c2410_serial_resetport(struct uart_port *port,
+                                    struct s3c2410_uartcfg *cfg)
+{
+        dbg("s3c2410_serial_resetport: port=%p (%08lx), cfg=%p\n",
+            port, port->mapbase, cfg);
+
+        wr_regl(port, S3C2410_UCON,  cfg->ucon);
+        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
+
+        /* reset both fifos */
+
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        return 0;
+}
+
+static struct s3c24xx_uart_info s3c2410_uart_inf = {
+        .name           = "Samsung S3C2410 UART",
+        .type           = PORT_S3C2410,
+        .fifosize       = 16,
+        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
+        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
+        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
+        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
+        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
+        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
+        .get_clksrc     = s3c2410_serial_getsource,
+        .set_clksrc     = s3c2410_serial_setsource,
+        .reset_port     = s3c2410_serial_resetport,
+};
+
+/* device management */
+
+static int s3c2410_serial_probe(struct device *dev)
+{
+        return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);
+}
+
+static struct device_driver s3c2410_serial_drv = {
+        .name           = "s3c2410-uart",
+        .bus            = &platform_bus_type,
+        .probe          = s3c2410_serial_probe,
+        .remove         = s3c24xx_serial_remove,
+        .suspend        = s3c24xx_serial_suspend,
+        .resume         = s3c24xx_serial_resume,
+};
+
+static inline int s3c2410_serial_init(void)
+{
+        return s3c24xx_serial_init(&s3c2410_serial_drv, &s3c2410_uart_inf);
+}
+
+static inline void s3c2410_serial_exit(void)
+{
+        driver_unregister(&s3c2410_serial_drv);
+}
+
+#define s3c2410_uart_inf_at &s3c2410_uart_inf
+#else
+
+static inline int s3c2410_serial_init(void)
+{
+        return 0;
+}
+
+static inline void s3c2410_serial_exit(void)
+{
+}
+
+#define s3c2410_uart_inf_at NULL
+
+#endif /* CONFIG_CPU_S3C2410 */
+
+#ifdef CONFIG_CPU_S3C2440
+
+static int s3c2440_serial_setsource(struct uart_port *port,
+                                     struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        // todo - proper fclk<>nonfclk switch //
+
+        ucon &= ~S3C2440_UCON_CLKMASK;
+
+        if (strcmp(clk->name, "uclk") == 0)
+                ucon |= S3C2440_UCON_UCLK;
+        else if (strcmp(clk->name, "pclk") == 0)
+                ucon |= S3C2440_UCON_PCLK;
+        else if (strcmp(clk->name, "fclk") == 0)
+                ucon |= S3C2440_UCON_FCLK;
+        else {
+                printk(KERN_ERR "unknown clock source %s\n", clk->name);
+                return -EINVAL;
+        }
+
+        wr_regl(port, S3C2410_UCON, ucon);
+        return 0;
+}
+
+
+static int s3c2440_serial_getsource(struct uart_port *port,
+                                    struct s3c24xx_uart_clksrc *clk)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+        unsigned long ucon0, ucon1, ucon2;
+
+        switch (ucon & S3C2440_UCON_CLKMASK) {
+        case S3C2440_UCON_UCLK:
+                clk->divisor = 1;
+                clk->name = "uclk";
+                break;
+
+        case S3C2440_UCON_PCLK:
+        case S3C2440_UCON_PCLK2:
+                clk->divisor = 1;
+                clk->name = "pclk";
+                break;
+
+        case S3C2440_UCON_FCLK:
+                /* the fun of calculating the uart divisors on
+                 * the s3c2440 */
+
+                ucon0 = __raw_readl(S3C24XX_VA_UART0 + S3C2410_UCON);
+                ucon1 = __raw_readl(S3C24XX_VA_UART1 + S3C2410_UCON);
+                ucon2 = __raw_readl(S3C24XX_VA_UART2 + S3C2410_UCON);
+
+                printk("ucons: %08lx, %08lx, %08lx\n", ucon0, ucon1, ucon2);
+
+                ucon0 &= S3C2440_UCON0_DIVMASK;
+                ucon1 &= S3C2440_UCON1_DIVMASK;
+                ucon2 &= S3C2440_UCON2_DIVMASK;
+
+                if (ucon0 != 0) {
+                        clk->divisor = ucon0 >> S3C2440_UCON_DIVSHIFT;
+                        clk->divisor += 6;
+                } else if (ucon1 != 0) {
+                        clk->divisor = ucon1 >> S3C2440_UCON_DIVSHIFT;
+                        clk->divisor += 21;
+                } else if (ucon2 != 0) {
+                        clk->divisor = ucon2 >> S3C2440_UCON_DIVSHIFT;
+                        clk->divisor += 36;
+                } else {
+                        /* manual calims 44, seems to be 9 */
+                        clk->divisor = 9;
+                }
+
+                clk->name = "fclk";
+                break;
+        }
+
+        return 0;
+}
+
+static int s3c2440_serial_resetport(struct uart_port *port,
+                                    struct s3c2410_uartcfg *cfg)
+{
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+
+        dbg("s3c2440_serial_resetport: port=%p (%08lx), cfg=%p\n",
+            port, port->mapbase, cfg);
+
+        /* ensure we don't change the clock settings... */
+
+        ucon &= (S3C2440_UCON0_DIVMASK | (3<<10));
+
+        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
+        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
+
+        /* reset both fifos */
+
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        return 0;
+}
+
+static struct s3c24xx_uart_info s3c2440_uart_inf = {
+        .name           = "Samsung S3C2440 UART",
+        .type           = PORT_S3C2440,
+        .fifosize       = 64,
+        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
+        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
+        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
+        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
+        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
+        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
+        .get_clksrc     = s3c2440_serial_getsource,
+        .set_clksrc     = s3c2440_serial_setsource,
+        .reset_port     = s3c2440_serial_resetport,
+};
+
+/* device management */
+
+static int s3c2440_serial_probe(struct device *dev)
+{
+        dbg("s3c2440_serial_probe: dev=%p\n", dev);
+        return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
+}
+
+static struct device_driver s3c2440_serial_drv = {
+        .name           = "s3c2440-uart",
+        .bus            = &platform_bus_type,
+        .probe          = s3c2440_serial_probe,
+        .remove         = s3c24xx_serial_remove,
+        .suspend        = s3c24xx_serial_suspend,
+        .resume         = s3c24xx_serial_resume,
+};
+
+
+static inline int s3c2440_serial_init(void)
+{
+        return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf);
+}
+
+static inline void s3c2440_serial_exit(void)
+{
+        driver_unregister(&s3c2440_serial_drv);
+}
+
+#define s3c2440_uart_inf_at &s3c2440_uart_inf
+#else
+
+static inline int s3c2440_serial_init(void)
+{
+        return 0;
+}
+
+static inline void s3c2440_serial_exit(void)
+{
+}
+
+#define s3c2440_uart_inf_at NULL
+#endif /* CONFIG_CPU_S3C2440 */
+
+/* module initialisation code */
+
+static int __init s3c24xx_serial_modinit(void)
+{
+        int ret;
+
+        ret = uart_register_driver(&s3c24xx_uart_drv);
+        if (ret < 0) {
+                printk(KERN_ERR "failed to register UART driver\n");
+                return -1;
+        }
+
+        s3c2400_serial_init();
+        s3c2410_serial_init();
+        s3c2440_serial_init();
+
+        return 0;
+}
+
+static void __exit s3c24xx_serial_modexit(void)
+{
+        s3c2400_serial_exit();
+        s3c2410_serial_exit();
+        s3c2440_serial_exit();
+
+        uart_unregister_driver(&s3c24xx_uart_drv);
+}
+
+
+module_init(s3c24xx_serial_modinit);
+module_exit(s3c24xx_serial_modexit);
+
+/* Console code */
+
+#ifdef CONFIG_SERIAL_S3C2410_CONSOLE
+
+static struct uart_port *cons_uart;
+
+static int
+s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
+{
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned long ufstat, utrstat;
+
+        if (ufcon & S3C2410_UFCON_FIFOMODE) {
+                /* fifo mode - check ammount of data in fifo registers... */
+
+                ufstat = rd_regl(port, S3C2410_UFSTAT);
+                return (ufstat & info->tx_fifofull) ? 0 : 1;
+        }
+
+        /* in non-fifo mode, we go and use the tx buffer empty */
+
+        utrstat = rd_regl(port, S3C2410_UTRSTAT);
+        return (utrstat & S3C2410_UTRSTAT_TXE) ? 1 : 0;
+}
+
+static void
+s3c24xx_serial_console_write(struct console *co, const char *s,
+                             unsigned int count)
+{
+        int i;
+        unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
+
+        for (i = 0; i < count; i++) {
+                while (!s3c24xx_serial_console_txrdy(cons_uart, ufcon))
+                        barrier();
+
+                wr_regb(cons_uart, S3C2410_UTXH, s[i]);
+
+                if (s[i] == '\n') {
+                        while (!s3c24xx_serial_console_txrdy(cons_uart, ufcon))
+                                barrier();
+
+                        wr_regb(cons_uart, S3C2410_UTXH, '\r');
+                }
+        }
+}
+
+static void __init
+s3c24xx_serial_get_options(struct uart_port *port, int *baud,
+                           int *parity, int *bits)
+{
+        struct s3c24xx_uart_clksrc clksrc;
+        struct clk *clk;
+        unsigned int ulcon;
+        unsigned int ucon;
+        unsigned int ubrdiv;
+        unsigned long rate;
+
+        ulcon  = rd_regl(port, S3C2410_ULCON);
+        ucon   = rd_regl(port, S3C2410_UCON);
+        ubrdiv = rd_regl(port, S3C2410_UBRDIV);
+
+        dbg("s3c24xx_serial_get_options: port=%p\n"
+            "registers: ulcon=%08x, ucon=%08x, ubdriv=%08x\n",
+            port, ulcon, ucon, ubrdiv);
+
+        if ((ucon & 0xf) != 0) {
+                /* consider the serial port configured if the tx/rx mode set */
+
+                switch (ulcon & S3C2410_LCON_CSMASK) {
+                case S3C2410_LCON_CS5:
+                        *bits = 5;
+                        break;
+                case S3C2410_LCON_CS6:
+                        *bits = 6;
+                        break;
+                case S3C2410_LCON_CS7:
+                        *bits = 7;
+                        break;
+                default:
+                case S3C2410_LCON_CS8:
+                        *bits = 8;
+                        break;
+                }
+
+                switch (ulcon & S3C2410_LCON_PMASK) {
+                case S3C2410_LCON_PEVEN:
+                        *parity = 'e';
+                        break;
+
+                case S3C2410_LCON_PODD:
+                        *parity = 'o';
+                        break;
+
+                case S3C2410_LCON_PNONE:
+                default:
+                        *parity = 'n';
+                }
+
+                /* now calculate the baud rate */
+
+                s3c24xx_serial_getsource(port, &clksrc);
+
+                clk = clk_get(port->dev, clksrc.name);
+                if (!IS_ERR(clk) && clk != NULL)
+                        rate = clk_get_rate(clk) / clksrc.divisor;
+                else
+                        rate = 1;
+
+
+                *baud = rate / ( 16 * (ubrdiv + 1));
+                dbg("calculated baud %d\n", *baud);
+        }
+
+}
+
+/* s3c24xx_serial_init_ports
+ *
+ * initialise the serial ports from the machine provided initialisation
+ * data.
+*/
+
+static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
+{
+        struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
+        struct platform_device **platdev_ptr;
+        int i;
+
+        dbg("s3c24xx_serial_init_ports: initialising ports...\n");
+
+        platdev_ptr = s3c24xx_uart_devs;
+
+        for (i = 0; i < NR_PORTS; i++, ptr++, platdev_ptr++) {
+                s3c24xx_serial_init_port(ptr, info, *platdev_ptr);
+        }
+
+        return 0;
+}
+
+static int __init
+s3c24xx_serial_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        dbg("s3c24xx_serial_console_setup: co=%p (%d), %s\n",
+            co, co->index, options);
+
+        /* is this a valid port */
+
+        if (co->index == -1 || co->index >= NR_PORTS)
+                co->index = 0;
+
+        port = &s3c24xx_serial_ports[co->index].port;
+
+        /* is the port configured? */
+
+        if (port->mapbase == 0x0) {
+                co->index = 0;
+                port = &s3c24xx_serial_ports[co->index].port;
+        }
+
+        cons_uart = port;
+
+        dbg("s3c24xx_serial_console_setup: port=%p (%d)\n", port, co->index);
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                s3c24xx_serial_get_options(port, &baud, &parity, &bits);
+
+        dbg("s3c24xx_serial_console_setup: baud %d\n", baud);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+/* s3c24xx_serial_initconsole
+ *
+ * initialise the console from one of the uart drivers
+*/
+
+static struct console s3c24xx_serial_console =
+{
+        .name           = S3C24XX_SERIAL_NAME,
+        .device         = uart_console_device,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .write          = s3c24xx_serial_console_write,
+        .setup          = s3c24xx_serial_console_setup
+};
+
+static int s3c24xx_serial_initconsole(void)
+{
+        struct s3c24xx_uart_info *info;
+        struct platform_device *dev = s3c24xx_uart_devs[0];
+
+        dbg("s3c24xx_serial_initconsole\n");
+
+        /* select driver based on the cpu */
+
+        if (dev == NULL) {
+                printk(KERN_ERR "s3c24xx: no devices for console init\n");
+                return 0;
+        }
+
+        if (strcmp(dev->name, "s3c2400-uart") == 0) {
+                info = s3c2400_uart_inf_at;
+        } else if (strcmp(dev->name, "s3c2410-uart") == 0) {
+                info = s3c2410_uart_inf_at;
+        } else if (strcmp(dev->name, "s3c2440-uart") == 0) {
+                info = s3c2440_uart_inf_at;
+        } else {
+                printk(KERN_ERR "s3c24xx: no driver for %s\n", dev->name);
+                return 0;
+        }
+
+        if (info == NULL) {
+                printk(KERN_ERR "s3c24xx: no driver for console\n");
+                return 0;
+        }
+
+        s3c24xx_serial_console.data = &s3c24xx_uart_drv;
+        s3c24xx_serial_init_ports(info);
+
+        register_console(&s3c24xx_serial_console);
+        return 0;
+}
+
+console_initcall(s3c24xx_serial_initconsole);
+
+#endif /* CONFIG_SERIAL_S3C2410_CONSOLE */
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_DESCRIPTION("Samsung S3C2410/S3C2440 Serial port driver");
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
new file mode 100644
index 000000000000..85f0af452f95
--- /dev/null
+++ b/drivers/serial/sa1100.c
@@ -0,0 +1,952 @@
+/*
+ *  linux/drivers/char/sa1100.c
+ *
+ *  Driver for SA11x0 serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $
+ *
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/hardware.h>
+#include <asm/mach/serial_sa1100.h>
+
+/* We've been assigned a range on the "Low-density serial ports" major */
+#define SERIAL_SA1100_MAJOR     204
+#define MINOR_START             5
+
+#define NR_PORTS                3
+
+#define SA1100_ISR_PASS_LIMIT   256
+
+/*
+ * Convert from ignore_status_mask or read_status_mask to UTSR[01]
+ */
+#define SM_TO_UTSR0(x)  ((x) & 0xff)
+#define SM_TO_UTSR1(x)  ((x) >> 8)
+#define UTSR0_TO_SM(x)  ((x))
+#define UTSR1_TO_SM(x)  ((x) << 8)
+
+#define UART_GET_UTCR0(sport)   __raw_readl((sport)->port.membase + UTCR0)
+#define UART_GET_UTCR1(sport)   __raw_readl((sport)->port.membase + UTCR1)
+#define UART_GET_UTCR2(sport)   __raw_readl((sport)->port.membase + UTCR2)
+#define UART_GET_UTCR3(sport)   __raw_readl((sport)->port.membase + UTCR3)
+#define UART_GET_UTSR0(sport)   __raw_readl((sport)->port.membase + UTSR0)
+#define UART_GET_UTSR1(sport)   __raw_readl((sport)->port.membase + UTSR1)
+#define UART_GET_CHAR(sport)    __raw_readl((sport)->port.membase + UTDR)
+
+#define UART_PUT_UTCR0(sport,v) __raw_writel((v),(sport)->port.membase + UTCR0)
+#define UART_PUT_UTCR1(sport,v) __raw_writel((v),(sport)->port.membase + UTCR1)
+#define UART_PUT_UTCR2(sport,v) __raw_writel((v),(sport)->port.membase + UTCR2)
+#define UART_PUT_UTCR3(sport,v) __raw_writel((v),(sport)->port.membase + UTCR3)
+#define UART_PUT_UTSR0(sport,v) __raw_writel((v),(sport)->port.membase + UTSR0)
+#define UART_PUT_UTSR1(sport,v) __raw_writel((v),(sport)->port.membase + UTSR1)
+#define UART_PUT_CHAR(sport,v)  __raw_writel((v),(sport)->port.membase + UTDR)
+
+/*
+ * This is the size of our serial port register set.
+ */
+#define UART_PORT_SIZE  0x24
+
+/*
+ * This determines how often we check the modem status signals
+ * for any change.  They generally aren't connected to an IRQ
+ * so we have to poll them.  We also check immediately before
+ * filling the TX fifo incase CTS has been dropped.
+ */
+#define MCTRL_TIMEOUT   (250*HZ/1000)
+
+struct sa1100_port {
+        struct uart_port        port;
+        struct timer_list       timer;
+        unsigned int            old_status;
+};
+
+/*
+ * Handle any change of modem status signal since we were last called.
+ */
+static void sa1100_mctrl_check(struct sa1100_port *sport)
+{
+        unsigned int status, changed;
+
+        status = sport->port.ops->get_mctrl(&sport->port);
+        changed = status ^ sport->old_status;
+
+        if (changed == 0)
+                return;
+
+        sport->old_status = status;
+
+        if (changed & TIOCM_RI)
+                sport->port.icount.rng++;
+        if (changed & TIOCM_DSR)
+                sport->port.icount.dsr++;
+        if (changed & TIOCM_CAR)
+                uart_handle_dcd_change(&sport->port, status & TIOCM_CAR);
+        if (changed & TIOCM_CTS)
+                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
+
+        wake_up_interruptible(&sport->port.info->delta_msr_wait);
+}
+
+/*
+ * This is our per-port timeout handler, for checking the
+ * modem status signals.
+ */
+static void sa1100_timeout(unsigned long data)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)data;
+        unsigned long flags;
+
+        if (sport->port.info) {
+                spin_lock_irqsave(&sport->port.lock, flags);
+                sa1100_mctrl_check(sport);
+                spin_unlock_irqrestore(&sport->port.lock, flags);
+
+                mod_timer(&sport->timer, jiffies + MCTRL_TIMEOUT);
+        }
+}
+
+/*
+ * interrupts disabled on entry
+ */
+static void sa1100_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        u32 utcr3;
+
+        utcr3 = UART_GET_UTCR3(sport);
+        UART_PUT_UTCR3(sport, utcr3 & ~UTCR3_TIE);
+        sport->port.read_status_mask &= ~UTSR0_TO_SM(UTSR0_TFS);
+}
+
+/*
+ * interrupts may not be disabled on entry
+ */
+static void sa1100_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        unsigned long flags;
+        u32 utcr3;
+
+        spin_lock_irqsave(&sport->port.lock, flags);
+        utcr3 = UART_GET_UTCR3(sport);
+        sport->port.read_status_mask |= UTSR0_TO_SM(UTSR0_TFS);
+        UART_PUT_UTCR3(sport, utcr3 | UTCR3_TIE);
+        spin_unlock_irqrestore(&sport->port.lock, flags);
+}
+
+/*
+ * Interrupts enabled
+ */
+static void sa1100_stop_rx(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        u32 utcr3;
+
+        utcr3 = UART_GET_UTCR3(sport);
+        UART_PUT_UTCR3(sport, utcr3 & ~UTCR3_RIE);
+}
+
+/*
+ * Set the modem control timer to fire immediately.
+ */
+static void sa1100_enable_ms(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        mod_timer(&sport->timer, jiffies);
+}
+
+static void
+sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
+{
+        struct tty_struct *tty = sport->port.info->tty;
+        unsigned int status, ch, flg, ignored = 0;
+
+        status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
+                 UTSR0_TO_SM(UART_GET_UTSR0(sport));
+        while (status & UTSR1_TO_SM(UTSR1_RNE)) {
+                ch = UART_GET_CHAR(sport);
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        goto ignore_char;
+                sport->port.icount.rx++;
+
+                flg = TTY_NORMAL;
+
+                /*
+                 * note that the error handling code is
+                 * out of the main execution path
+                 */
+                if (status & UTSR1_TO_SM(UTSR1_PRE | UTSR1_FRE | UTSR1_ROR))
+                        goto handle_error;
+
+                if (uart_handle_sysrq_char(&sport->port, ch, regs))
+                        goto ignore_char;
+
+        error_return:
+                tty_insert_flip_char(tty, ch, flg);
+        ignore_char:
+                status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
+                         UTSR0_TO_SM(UART_GET_UTSR0(sport));
+        }
+ out:
+        tty_flip_buffer_push(tty);
+        return;
+
+ handle_error:
+        if (status & UTSR1_TO_SM(UTSR1_PRE))
+                sport->port.icount.parity++;
+        else if (status & UTSR1_TO_SM(UTSR1_FRE))
+                sport->port.icount.frame++;
+        if (status & UTSR1_TO_SM(UTSR1_ROR))
+                sport->port.icount.overrun++;
+
+        if (status & sport->port.ignore_status_mask) {
+                if (++ignored > 100)
+                        goto out;
+                goto ignore_char;
+        }
+
+        status &= sport->port.read_status_mask;
+
+        if (status & UTSR1_TO_SM(UTSR1_PRE))
+                flg = TTY_PARITY;
+        else if (status & UTSR1_TO_SM(UTSR1_FRE))
+                flg = TTY_FRAME;
+
+        if (status & UTSR1_TO_SM(UTSR1_ROR)) {
+                /*
+                 * overrun does *not* affect the character
+                 * we read from the FIFO
+                 */
+                tty_insert_flip_char(tty, ch, flg);
+                ch = 0;
+                flg = TTY_OVERRUN;
+        }
+#ifdef SUPPORT_SYSRQ
+        sport->port.sysrq = 0;
+#endif
+        goto error_return;
+}
+
+static void sa1100_tx_chars(struct sa1100_port *sport)
+{
+        struct circ_buf *xmit = &sport->port.info->xmit;
+
+        if (sport->port.x_char) {
+                UART_PUT_CHAR(sport, sport->port.x_char);
+                sport->port.icount.tx++;
+                sport->port.x_char = 0;
+                return;
+        }
+
+        /*
+         * Check the modem control lines before
+         * transmitting anything.
+         */
+        sa1100_mctrl_check(sport);
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) {
+                sa1100_stop_tx(&sport->port, 0);
+                return;
+        }
+
+        /*
+         * Tried using FIFO (not checking TNF) for fifo fill:
+         * still had the '4 bytes repeated' problem.
+         */
+        while (UART_GET_UTSR1(sport) & UTSR1_TNF) {
+                UART_PUT_CHAR(sport, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                sport->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        }
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&sport->port);
+
+        if (uart_circ_empty(xmit))
+                sa1100_stop_tx(&sport->port, 0);
+}
+
+static irqreturn_t sa1100_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct sa1100_port *sport = dev_id;
+        unsigned int status, pass_counter = 0;
+
+        spin_lock(&sport->port.lock);
+        status = UART_GET_UTSR0(sport);
+        status &= SM_TO_UTSR0(sport->port.read_status_mask) | ~UTSR0_TFS;
+        do {
+                if (status & (UTSR0_RFS | UTSR0_RID)) {
+                        /* Clear the receiver idle bit, if set */
+                        if (status & UTSR0_RID)
+                                UART_PUT_UTSR0(sport, UTSR0_RID);
+                        sa1100_rx_chars(sport, regs);
+                }
+
+                /* Clear the relevant break bits */
+                if (status & (UTSR0_RBB | UTSR0_REB))
+                        UART_PUT_UTSR0(sport, status & (UTSR0_RBB | UTSR0_REB));
+
+                if (status & UTSR0_RBB)
+                        sport->port.icount.brk++;
+
+                if (status & UTSR0_REB)
+                        uart_handle_break(&sport->port);
+
+                if (status & UTSR0_TFS)
+                        sa1100_tx_chars(sport);
+                if (pass_counter++ > SA1100_ISR_PASS_LIMIT)
+                        break;
+                status = UART_GET_UTSR0(sport);
+                status &= SM_TO_UTSR0(sport->port.read_status_mask) |
+                          ~UTSR0_TFS;
+        } while (status & (UTSR0_TFS | UTSR0_RFS | UTSR0_RID));
+        spin_unlock(&sport->port.lock);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * Return TIOCSER_TEMT when transmitter is not busy.
+ */
+static unsigned int sa1100_tx_empty(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        return UART_GET_UTSR1(sport) & UTSR1_TBY ? 0 : TIOCSER_TEMT;
+}
+
+static unsigned int sa1100_get_mctrl(struct uart_port *port)
+{
+        return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+}
+
+static void sa1100_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+/*
+ * Interrupts always disabled.
+ */
+static void sa1100_break_ctl(struct uart_port *port, int break_state)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        unsigned long flags;
+        unsigned int utcr3;
+
+        spin_lock_irqsave(&sport->port.lock, flags);
+        utcr3 = UART_GET_UTCR3(sport);
+        if (break_state == -1)
+                utcr3 |= UTCR3_BRK;
+        else
+                utcr3 &= ~UTCR3_BRK;
+        UART_PUT_UTCR3(sport, utcr3);
+        spin_unlock_irqrestore(&sport->port.lock, flags);
+}
+
+static int sa1100_startup(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        int retval;
+
+        /*
+         * Allocate the IRQ
+         */
+        retval = request_irq(sport->port.irq, sa1100_int, 0,
+                             "sa11x0-uart", sport);
+        if (retval)
+                return retval;
+
+        /*
+         * Finally, clear and enable interrupts
+         */
+        UART_PUT_UTSR0(sport, -1);
+        UART_PUT_UTCR3(sport, UTCR3_RXE | UTCR3_TXE | UTCR3_RIE);
+
+        /*
+         * Enable modem status interrupts
+         */
+        spin_lock_irq(&sport->port.lock);
+        sa1100_enable_ms(&sport->port);
+        spin_unlock_irq(&sport->port.lock);
+
+        return 0;
+}
+
+static void sa1100_shutdown(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        /*
+         * Stop our timer.
+         */
+        del_timer_sync(&sport->timer);
+
+        /*
+         * Free the interrupt
+         */
+        free_irq(sport->port.irq, sport);
+
+        /*
+         * Disable all interrupts, port and break condition.
+         */
+        UART_PUT_UTCR3(sport, 0);
+}
+
+static void
+sa1100_set_termios(struct uart_port *port, struct termios *termios,
+                   struct termios *old)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        unsigned long flags;
+        unsigned int utcr0, old_utcr3, baud, quot;
+        unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;
+
+        /*
+         * We only support CS7 and CS8.
+         */
+        while ((termios->c_cflag & CSIZE) != CS7 &&
+               (termios->c_cflag & CSIZE) != CS8) {
+                termios->c_cflag &= ~CSIZE;
+                termios->c_cflag |= old_csize;
+                old_csize = CS8;
+        }
+
+        if ((termios->c_cflag & CSIZE) == CS8)
+                utcr0 = UTCR0_DSS;
+        else
+                utcr0 = 0;
+
+        if (termios->c_cflag & CSTOPB)
+                utcr0 |= UTCR0_SBS;
+        if (termios->c_cflag & PARENB) {
+                utcr0 |= UTCR0_PE;
+                if (!(termios->c_cflag & PARODD))
+                        utcr0 |= UTCR0_OES;
+        }
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = uart_get_divisor(port, baud);
+
+        spin_lock_irqsave(&sport->port.lock, flags);
+
+        sport->port.read_status_mask &= UTSR0_TO_SM(UTSR0_TFS);
+        sport->port.read_status_mask |= UTSR1_TO_SM(UTSR1_ROR);
+        if (termios->c_iflag & INPCK)
+                sport->port.read_status_mask |=
+                                UTSR1_TO_SM(UTSR1_FRE | UTSR1_PRE);
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                sport->port.read_status_mask |=
+                                UTSR0_TO_SM(UTSR0_RBB | UTSR0_REB);
+
+        /*
+         * Characters to ignore
+         */
+        sport->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                sport->port.ignore_status_mask |=
+                                UTSR1_TO_SM(UTSR1_FRE | UTSR1_PRE);
+        if (termios->c_iflag & IGNBRK) {
+                sport->port.ignore_status_mask |=
+                                UTSR0_TO_SM(UTSR0_RBB | UTSR0_REB);
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        sport->port.ignore_status_mask |=
+                                UTSR1_TO_SM(UTSR1_ROR);
+        }
+
+        del_timer_sync(&sport->timer);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        /*
+         * disable interrupts and drain transmitter
+         */
+        old_utcr3 = UART_GET_UTCR3(sport);
+        UART_PUT_UTCR3(sport, old_utcr3 & ~(UTCR3_RIE | UTCR3_TIE));
+
+        while (UART_GET_UTSR1(sport) & UTSR1_TBY)
+                barrier();
+
+        /* then, disable everything */
+        UART_PUT_UTCR3(sport, 0);
+
+        /* set the parity, stop bits and data size */
+        UART_PUT_UTCR0(sport, utcr0);
+
+        /* set the baud rate */
+        quot -= 1;
+        UART_PUT_UTCR1(sport, ((quot & 0xf00) >> 8));
+        UART_PUT_UTCR2(sport, (quot & 0xff));
+
+        UART_PUT_UTSR0(sport, -1);
+
+        UART_PUT_UTCR3(sport, old_utcr3);
+
+        if (UART_ENABLE_MS(&sport->port, termios->c_cflag))
+                sa1100_enable_ms(&sport->port);
+
+        spin_unlock_irqrestore(&sport->port.lock, flags);
+}
+
+static const char *sa1100_type(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        return sport->port.type == PORT_SA1100 ? "SA1100" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'.
+ */
+static void sa1100_release_port(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        release_mem_region(sport->port.mapbase, UART_PORT_SIZE);
+}
+
+/*
+ * Request the memory region(s) being used by 'port'.
+ */
+static int sa1100_request_port(struct uart_port *port)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        return request_mem_region(sport->port.mapbase, UART_PORT_SIZE,
+                        "sa11x0-uart") != NULL ? 0 : -EBUSY;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void sa1100_config_port(struct uart_port *port, int flags)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        if (flags & UART_CONFIG_TYPE &&
+            sa1100_request_port(&sport->port) == 0)
+                sport->port.type = PORT_SA1100;
+}
+
+/*
+ * Verify the new serial_struct (for TIOCSSERIAL).
+ * The only change we allow are to the flags and type, and
+ * even then only between PORT_SA1100 and PORT_UNKNOWN
+ */
+static int
+sa1100_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+        int ret = 0;
+
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_SA1100)
+                ret = -EINVAL;
+        if (sport->port.irq != ser->irq)
+                ret = -EINVAL;
+        if (ser->io_type != SERIAL_IO_MEM)
+                ret = -EINVAL;
+        if (sport->port.uartclk / 16 != ser->baud_base)
+                ret = -EINVAL;
+        if ((void *)sport->port.mapbase != ser->iomem_base)
+                ret = -EINVAL;
+        if (sport->port.iobase != ser->port)
+                ret = -EINVAL;
+        if (ser->hub6 != 0)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops sa1100_pops = {
+        .tx_empty       = sa1100_tx_empty,
+        .set_mctrl      = sa1100_set_mctrl,
+        .get_mctrl      = sa1100_get_mctrl,
+        .stop_tx        = sa1100_stop_tx,
+        .start_tx       = sa1100_start_tx,
+        .stop_rx        = sa1100_stop_rx,
+        .enable_ms      = sa1100_enable_ms,
+        .break_ctl      = sa1100_break_ctl,
+        .startup        = sa1100_startup,
+        .shutdown       = sa1100_shutdown,
+        .set_termios    = sa1100_set_termios,
+        .type           = sa1100_type,
+        .release_port   = sa1100_release_port,
+        .request_port   = sa1100_request_port,
+        .config_port    = sa1100_config_port,
+        .verify_port    = sa1100_verify_port,
+};
+
+static struct sa1100_port sa1100_ports[NR_PORTS];
+
+/*
+ * Setup the SA1100 serial ports.  Note that we don't include the IrDA
+ * port here since we have our own SIR/FIR driver (see drivers/net/irda)
+ *
+ * Note also that we support "console=ttySAx" where "x" is either 0 or 1.
+ * Which serial port this ends up being depends on the machine you're
+ * running this kernel on.  I'm not convinced that this is a good idea,
+ * but that's the way it traditionally works.
+ *
+ * Note that NanoEngine UART3 becomes UART2, and UART2 is no longer
+ * used here.
+ */
+static void __init sa1100_init_ports(void)
+{
+        static int first = 1;
+        int i;
+
+        if (!first)
+                return;
+        first = 0;
+
+        for (i = 0; i < NR_PORTS; i++) {
+                sa1100_ports[i].port.uartclk   = 3686400;
+                sa1100_ports[i].port.ops       = &sa1100_pops;
+                sa1100_ports[i].port.fifosize  = 8;
+                sa1100_ports[i].port.line      = i;
+                sa1100_ports[i].port.iotype    = SERIAL_IO_MEM;
+                init_timer(&sa1100_ports[i].timer);
+                sa1100_ports[i].timer.function = sa1100_timeout;
+                sa1100_ports[i].timer.data     = (unsigned long)&sa1100_ports[i];
+        }
+
+        /*
+         * make transmit lines outputs, so that when the port
+         * is closed, the output is in the MARK state.
+         */
+        PPDR |= PPC_TXD1 | PPC_TXD3;
+        PPSR |= PPC_TXD1 | PPC_TXD3;
+}
+
+void __init sa1100_register_uart_fns(struct sa1100_port_fns *fns)
+{
+        if (fns->get_mctrl)
+                sa1100_pops.get_mctrl = fns->get_mctrl;
+        if (fns->set_mctrl)
+                sa1100_pops.set_mctrl = fns->set_mctrl;
+
+        sa1100_pops.pm       = fns->pm;
+        sa1100_pops.set_wake = fns->set_wake;
+}
+
+void __init sa1100_register_uart(int idx, int port)
+{
+        if (idx >= NR_PORTS) {
+                printk(KERN_ERR "%s: bad index number %d\n", __FUNCTION__, idx);
+                return;
+        }
+
+        switch (port) {
+        case 1:
+                sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0;
+                sa1100_ports[idx].port.mapbase = _Ser1UTCR0;
+                sa1100_ports[idx].port.irq     = IRQ_Ser1UART;
+                sa1100_ports[idx].port.flags   = ASYNC_BOOT_AUTOCONF;
+                break;
+
+        case 2:
+                sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0;
+                sa1100_ports[idx].port.mapbase = _Ser2UTCR0;
+                sa1100_ports[idx].port.irq     = IRQ_Ser2ICP;
+                sa1100_ports[idx].port.flags   = ASYNC_BOOT_AUTOCONF;
+                break;
+
+        case 3:
+                sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0;
+                sa1100_ports[idx].port.mapbase = _Ser3UTCR0;
+                sa1100_ports[idx].port.irq     = IRQ_Ser3UART;
+                sa1100_ports[idx].port.flags   = ASYNC_BOOT_AUTOCONF;
+                break;
+
+        default:
+                printk(KERN_ERR "%s: bad port number %d\n", __FUNCTION__, port);
+        }
+}
+
+
+#ifdef CONFIG_SERIAL_SA1100_CONSOLE
+
+/*
+ * Interrupts are disabled on entering
+ */
+static void
+sa1100_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct sa1100_port *sport = &sa1100_ports[co->index];
+        unsigned int old_utcr3, status, i;
+
+        /*
+         *      First, save UTCR3 and then disable interrupts
+         */
+        old_utcr3 = UART_GET_UTCR3(sport);
+        UART_PUT_UTCR3(sport, (old_utcr3 & ~(UTCR3_RIE | UTCR3_TIE)) |
+                                UTCR3_TXE);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++) {
+                do {
+                        status = UART_GET_UTSR1(sport);
+                } while (!(status & UTSR1_TNF));
+                UART_PUT_CHAR(sport, s[i]);
+                if (s[i] == '\n') {
+                        do {
+                                status = UART_GET_UTSR1(sport);
+                        } while (!(status & UTSR1_TNF));
+                        UART_PUT_CHAR(sport, '\r');
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore UTCR3
+         */
+        do {
+                status = UART_GET_UTSR1(sport);
+        } while (status & UTSR1_TBY);
+        UART_PUT_UTCR3(sport, old_utcr3);
+}
+
+/*
+ * If the port was already initialised (eg, by a boot loader),
+ * try to determine the current setup.
+ */
+static void __init
+sa1100_console_get_options(struct sa1100_port *sport, int *baud,
+                           int *parity, int *bits)
+{
+        unsigned int utcr3;
+
+        utcr3 = UART_GET_UTCR3(sport) & (UTCR3_RXE | UTCR3_TXE);
+        if (utcr3 == (UTCR3_RXE | UTCR3_TXE)) {
+                /* ok, the port was enabled */
+                unsigned int utcr0, quot;
+
+                utcr0 = UART_GET_UTCR0(sport);
+
+                *parity = 'n';
+                if (utcr0 & UTCR0_PE) {
+                        if (utcr0 & UTCR0_OES)
+                                *parity = 'e';
+                        else
+                                *parity = 'o';
+                }
+
+                if (utcr0 & UTCR0_DSS)
+                        *bits = 8;
+                else
+                        *bits = 7;
+
+                quot = UART_GET_UTCR2(sport) | UART_GET_UTCR1(sport) << 8;
+                quot &= 0xfff;
+                *baud = sport->port.uartclk / (16 * (quot + 1));
+        }
+}
+
+static int __init
+sa1100_console_setup(struct console *co, char *options)
+{
+        struct sa1100_port *sport;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index == -1 || co->index >= NR_PORTS)
+                co->index = 0;
+        sport = &sa1100_ports[co->index];
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                sa1100_console_get_options(sport, &baud, &parity, &bits);
+
+        return uart_set_options(&sport->port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver sa1100_reg;
+static struct console sa1100_console = {
+        .name           = "ttySA",
+        .write          = sa1100_console_write,
+        .device         = uart_console_device,
+        .setup          = sa1100_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &sa1100_reg,
+};
+
+static int __init sa1100_rs_console_init(void)
+{
+        sa1100_init_ports();
+        register_console(&sa1100_console);
+        return 0;
+}
+console_initcall(sa1100_rs_console_init);
+
+#define SA1100_CONSOLE  &sa1100_console
+#else
+#define SA1100_CONSOLE  NULL
+#endif
+
+static struct uart_driver sa1100_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "ttySA",
+        .dev_name               = "ttySA",
+        .devfs_name             = "ttySA",
+        .major                  = SERIAL_SA1100_MAJOR,
+        .minor                  = MINOR_START,
+        .nr                     = NR_PORTS,
+        .cons                   = SA1100_CONSOLE,
+};
+
+static int sa1100_serial_suspend(struct device *_dev, u32 state, u32 level)
+{
+        struct sa1100_port *sport = dev_get_drvdata(_dev);
+
+        if (sport && level == SUSPEND_DISABLE)
+                uart_suspend_port(&sa1100_reg, &sport->port);
+
+        return 0;
+}
+
+static int sa1100_serial_resume(struct device *_dev, u32 level)
+{
+        struct sa1100_port *sport = dev_get_drvdata(_dev);
+
+        if (sport && level == RESUME_ENABLE)
+                uart_resume_port(&sa1100_reg, &sport->port);
+
+        return 0;
+}
+
+static int sa1100_serial_probe(struct device *_dev)
+{
+        struct platform_device *dev = to_platform_device(_dev);
+        struct resource *res = dev->resource;
+        int i;
+
+        for (i = 0; i < dev->num_resources; i++, res++)
+                if (res->flags & IORESOURCE_MEM)
+                        break;
+
+        if (i < dev->num_resources) {
+                for (i = 0; i < NR_PORTS; i++) {
+                        if (sa1100_ports[i].port.mapbase != res->start)
+                                continue;
+
+                        sa1100_ports[i].port.dev = _dev;
+                        uart_add_one_port(&sa1100_reg, &sa1100_ports[i].port);
+                        dev_set_drvdata(_dev, &sa1100_ports[i]);
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+static int sa1100_serial_remove(struct device *_dev)
+{
+        struct sa1100_port *sport = dev_get_drvdata(_dev);
+
+        dev_set_drvdata(_dev, NULL);
+
+        if (sport)
+                uart_remove_one_port(&sa1100_reg, &sport->port);
+
+        return 0;
+}
+
+static struct device_driver sa11x0_serial_driver = {
+        .name           = "sa11x0-uart",
+        .bus            = &platform_bus_type,
+        .probe          = sa1100_serial_probe,
+        .remove         = sa1100_serial_remove,
+        .suspend        = sa1100_serial_suspend,
+        .resume         = sa1100_serial_resume,
+};
+
+static int __init sa1100_serial_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.50 $\n");
+
+        sa1100_init_ports();
+
+        ret = uart_register_driver(&sa1100_reg);
+        if (ret == 0) {
+                ret = driver_register(&sa11x0_serial_driver);
+                if (ret)
+                        uart_unregister_driver(&sa1100_reg);
+        }
+        return ret;
+}
+
+static void __exit sa1100_serial_exit(void)
+{
+        driver_unregister(&sa11x0_serial_driver);
+        uart_unregister_driver(&sa1100_reg);
+}
+
+module_init(sa1100_serial_init);
+module_exit(sa1100_serial_exit);
+
+MODULE_AUTHOR("Deep Blue Solutions Ltd");
+MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.50 $");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_SA1100_MAJOR);
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
new file mode 100644
index 000000000000..36b1ae083fb7
--- /dev/null
+++ b/drivers/serial/serial_core.c
@@ -0,0 +1,2395 @@
+/*
+ *  linux/drivers/char/core.c
+ *
+ *  Driver core for serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *
+ *  Copyright 1999 ARM Limited
+ *  Copyright (C) 2000-2001 Deep Blue Solutions Ltd.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/serial_core.h>
+#include <linux/smp_lock.h>
+#include <linux/device.h>
+#include <linux/serial.h> /* for serial_state and serial_icounter_struct */
+#include <linux/delay.h>
+
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+
+#undef  DEBUG
+#ifdef DEBUG
+#define DPRINTK(x...)   printk(x)
+#else
+#define DPRINTK(x...)   do { } while (0)
+#endif
+
+/*
+ * This is used to lock changes in serial line configuration.
+ */
+static DECLARE_MUTEX(port_sem);
+
+#define HIGH_BITS_OFFSET        ((sizeof(long)-sizeof(int))*8)
+
+#define uart_users(state)       ((state)->count + ((state)->info ? (state)->info->blocked_open : 0))
+
+#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#define uart_console(port)      ((port)->cons && (port)->cons->index == (port)->line)
+#else
+#define uart_console(port)      (0)
+#endif
+
+static void uart_change_speed(struct uart_state *state, struct termios *old_termios);
+static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
+static void uart_change_pm(struct uart_state *state, int pm_state);
+
+/*
+ * This routine is used by the interrupt handler to schedule processing in
+ * the software interrupt portion of the driver.
+ */
+void uart_write_wakeup(struct uart_port *port)
+{
+        struct uart_info *info = port->info;
+        tasklet_schedule(&info->tlet);
+}
+
+static void uart_stop(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        port->ops->stop_tx(port, 1);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void __uart_start(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+
+        if (!uart_circ_empty(&state->info->xmit) && state->info->xmit.buf &&
+            !tty->stopped && !tty->hw_stopped)
+                port->ops->start_tx(port, 1);
+}
+
+static void uart_start(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        __uart_start(tty);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void uart_tasklet_action(unsigned long data)
+{
+        struct uart_state *state = (struct uart_state *)data;
+        tty_wakeup(state->info->tty);
+}
+
+static inline void
+uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
+{
+        unsigned long flags;
+        unsigned int old;
+
+        spin_lock_irqsave(&port->lock, flags);
+        old = port->mctrl;
+        port->mctrl = (old & ~clear) | set;
+        if (old != port->mctrl)
+                port->ops->set_mctrl(port, port->mctrl);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+#define uart_set_mctrl(port,set)        uart_update_mctrl(port,set,0)
+#define uart_clear_mctrl(port,clear)    uart_update_mctrl(port,0,clear)
+
+/*
+ * Startup the port.  This will be called once per open.  All calls
+ * will be serialised by the per-port semaphore.
+ */
+static int uart_startup(struct uart_state *state, int init_hw)
+{
+        struct uart_info *info = state->info;
+        struct uart_port *port = state->port;
+        unsigned long page;
+        int retval = 0;
+
+        if (info->flags & UIF_INITIALIZED)
+                return 0;
+
+        /*
+         * Set the TTY IO error marker - we will only clear this
+         * once we have successfully opened the port.  Also set
+         * up the tty->alt_speed kludge
+         */
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        if (port->type == PORT_UNKNOWN)
+                return 0;
+
+        /*
+         * Initialise and allocate the transmit and temporary
+         * buffer.
+         */
+        if (!info->xmit.buf) {
+                page = get_zeroed_page(GFP_KERNEL);
+                if (!page)
+                        return -ENOMEM;
+
+                info->xmit.buf = (unsigned char *) page;
+                uart_circ_clear(&info->xmit);
+        }
+
+        retval = port->ops->startup(port);
+        if (retval == 0) {
+                if (init_hw) {
+                        /*
+                         * Initialise the hardware port settings.
+                         */
+                        uart_change_speed(state, NULL);
+
+                        /*
+                         * Setup the RTS and DTR signals once the
+                         * port is open and ready to respond.
+                         */
+                        if (info->tty->termios->c_cflag & CBAUD)
+                                uart_set_mctrl(port, TIOCM_RTS | TIOCM_DTR);
+                }
+
+                info->flags |= UIF_INITIALIZED;
+
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        }
+
+        if (retval && capable(CAP_SYS_ADMIN))
+                retval = 0;
+
+        return retval;
+}
+
+/*
+ * This routine will shutdown a serial port; interrupts are disabled, and
+ * DTR is dropped if the hangup on close termio flag is on.  Calls to
+ * uart_shutdown are serialised by the per-port semaphore.
+ */
+static void uart_shutdown(struct uart_state *state)
+{
+        struct uart_info *info = state->info;
+        struct uart_port *port = state->port;
+
+        if (!(info->flags & UIF_INITIALIZED))
+                return;
+
+        /*
+         * Turn off DTR and RTS early.
+         */
+        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+                uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+
+        /*
+         * clear delta_msr_wait queue to avoid mem leaks: we may free
+         * the irq here so the queue might never be woken up.  Note
+         * that we won't end up waiting on delta_msr_wait again since
+         * any outstanding file descriptors should be pointing at
+         * hung_up_tty_fops now.
+         */
+        wake_up_interruptible(&info->delta_msr_wait);
+
+        /*
+         * Free the IRQ and disable the port.
+         */
+        port->ops->shutdown(port);
+
+        /*
+         * Ensure that the IRQ handler isn't running on another CPU.
+         */
+        synchronize_irq(port->irq);
+
+        /*
+         * Free the transmit buffer page.
+         */
+        if (info->xmit.buf) {
+                free_page((unsigned long)info->xmit.buf);
+                info->xmit.buf = NULL;
+        }
+
+        /*
+         * kill off our tasklet
+         */
+        tasklet_kill(&info->tlet);
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
+
+        info->flags &= ~UIF_INITIALIZED;
+}
+
+/**
+ *      uart_update_timeout - update per-port FIFO timeout.
+ *      @port:  uart_port structure describing the port
+ *      @cflag: termios cflag value
+ *      @baud:  speed of the port
+ *
+ *      Set the port FIFO timeout value.  The @cflag value should
+ *      reflect the actual hardware settings.
+ */
+void
+uart_update_timeout(struct uart_port *port, unsigned int cflag,
+                    unsigned int baud)
+{
+        unsigned int bits;
+
+        /* byte size and parity */
+        switch (cflag & CSIZE) {
+        case CS5:
+                bits = 7;
+                break;
+        case CS6:
+                bits = 8;
+                break;
+        case CS7:
+                bits = 9;
+                break;
+        default:
+                bits = 10;
+                break; // CS8
+        }
+
+        if (cflag & CSTOPB)
+                bits++;
+        if (cflag & PARENB)
+                bits++;
+
+        /*
+         * The total number of bits to be transmitted in the fifo.
+         */
+        bits = bits * port->fifosize;
+
+        /*
+         * Figure the timeout to send the above number of bits.
+         * Add .02 seconds of slop
+         */
+        port->timeout = (HZ * bits) / baud + HZ/50;
+}
+
+EXPORT_SYMBOL(uart_update_timeout);
+
+/**
+ *      uart_get_baud_rate - return baud rate for a particular port
+ *      @port: uart_port structure describing the port in question.
+ *      @termios: desired termios settings.
+ *      @old: old termios (or NULL)
+ *      @min: minimum acceptable baud rate
+ *      @max: maximum acceptable baud rate
+ *
+ *      Decode the termios structure into a numeric baud rate,
+ *      taking account of the magic 38400 baud rate (with spd_*
+ *      flags), and mapping the %B0 rate to 9600 baud.
+ *
+ *      If the new baud rate is invalid, try the old termios setting.
+ *      If it's still invalid, we try 9600 baud.
+ *
+ *      Update the @termios structure to reflect the baud rate
+ *      we're actually going to be using.
+ */
+unsigned int
+uart_get_baud_rate(struct uart_port *port, struct termios *termios,
+                   struct termios *old, unsigned int min, unsigned int max)
+{
+        unsigned int try, baud, altbaud = 38400;
+        unsigned int flags = port->flags & UPF_SPD_MASK;
+
+        if (flags == UPF_SPD_HI)
+                altbaud = 57600;
+        if (flags == UPF_SPD_VHI)
+                altbaud = 115200;
+        if (flags == UPF_SPD_SHI)
+                altbaud = 230400;
+        if (flags == UPF_SPD_WARP)
+                altbaud = 460800;
+
+        for (try = 0; try < 2; try++) {
+                baud = tty_termios_baud_rate(termios);
+
+                /*
+                 * The spd_hi, spd_vhi, spd_shi, spd_warp kludge...
+                 * Die! Die! Die!
+                 */
+                if (baud == 38400)
+                        baud = altbaud;
+
+                /*
+                 * Special case: B0 rate.
+                 */
+                if (baud == 0)
+                        baud = 9600;
+
+                if (baud >= min && baud <= max)
+                        return baud;
+
+                /*
+                 * Oops, the quotient was zero.  Try again with
+                 * the old baud rate if possible.
+                 */
+                termios->c_cflag &= ~CBAUD;
+                if (old) {
+                        termios->c_cflag |= old->c_cflag & CBAUD;
+                        old = NULL;
+                        continue;
+                }
+
+                /*
+                 * As a last resort, if the quotient is zero,
+                 * default to 9600 bps
+                 */
+                termios->c_cflag |= B9600;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL(uart_get_baud_rate);
+
+/**
+ *      uart_get_divisor - return uart clock divisor
+ *      @port: uart_port structure describing the port.
+ *      @baud: desired baud rate
+ *
+ *      Calculate the uart clock divisor for the port.
+ */
+unsigned int
+uart_get_divisor(struct uart_port *port, unsigned int baud)
+{
+        unsigned int quot;
+
+        /*
+         * Old custom speed handling.
+         */
+        if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
+                quot = port->custom_divisor;
+        else
+                quot = (port->uartclk + (8 * baud)) / (16 * baud);
+
+        return quot;
+}
+
+EXPORT_SYMBOL(uart_get_divisor);
+
+static void
+uart_change_speed(struct uart_state *state, struct termios *old_termios)
+{
+        struct tty_struct *tty = state->info->tty;
+        struct uart_port *port = state->port;
+        struct termios *termios;
+
+        /*
+         * If we have no tty, termios, or the port does not exist,
+         * then we can't set the parameters for this port.
+         */
+        if (!tty || !tty->termios || port->type == PORT_UNKNOWN)
+                return;
+
+        termios = tty->termios;
+
+        /*
+         * Set flags based on termios cflag
+         */
+        if (termios->c_cflag & CRTSCTS)
+                state->info->flags |= UIF_CTS_FLOW;
+        else
+                state->info->flags &= ~UIF_CTS_FLOW;
+
+        if (termios->c_cflag & CLOCAL)
+                state->info->flags &= ~UIF_CHECK_CD;
+        else
+                state->info->flags |= UIF_CHECK_CD;
+
+        port->ops->set_termios(port, termios, old_termios);
+}
+
+static inline void
+__uart_put_char(struct uart_port *port, struct circ_buf *circ, unsigned char c)
+{
+        unsigned long flags;
+
+        if (!circ->buf)
+                return;
+
+        spin_lock_irqsave(&port->lock, flags);
+        if (uart_circ_chars_free(circ) != 0) {
+                circ->buf[circ->head] = c;
+                circ->head = (circ->head + 1) & (UART_XMIT_SIZE - 1);
+        }
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void uart_put_char(struct tty_struct *tty, unsigned char ch)
+{
+        struct uart_state *state = tty->driver_data;
+
+        __uart_put_char(state->port, &state->info->xmit, ch);
+}
+
+static void uart_flush_chars(struct tty_struct *tty)
+{
+        uart_start(tty);
+}
+
+static int
+uart_write(struct tty_struct *tty, const unsigned char * buf, int count)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        struct circ_buf *circ = &state->info->xmit;
+        unsigned long flags;
+        int c, ret = 0;
+
+        if (!circ->buf)
+                return 0;
+
+        spin_lock_irqsave(&port->lock, flags);
+        while (1) {
+                c = CIRC_SPACE_TO_END(circ->head, circ->tail, UART_XMIT_SIZE);
+                if (count < c)
+                        c = count;
+                if (c <= 0)
+                        break;
+                memcpy(circ->buf + circ->head, buf, c);
+                circ->head = (circ->head + c) & (UART_XMIT_SIZE - 1);
+                buf += c;
+                count -= c;
+                ret += c;
+        }
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        uart_start(tty);
+        return ret;
+}
+
+static int uart_write_room(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+
+        return uart_circ_chars_free(&state->info->xmit);
+}
+
+static int uart_chars_in_buffer(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+
+        return uart_circ_chars_pending(&state->info->xmit);
+}
+
+static void uart_flush_buffer(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        unsigned long flags;
+
+        DPRINTK("uart_flush_buffer(%d) called\n", tty->index);
+
+        spin_lock_irqsave(&port->lock, flags);
+        uart_circ_clear(&state->info->xmit);
+        spin_unlock_irqrestore(&port->lock, flags);
+        tty_wakeup(tty);
+}
+
+/*
+ * This function is used to send a high-priority XON/XOFF character to
+ * the device
+ */
+static void uart_send_xchar(struct tty_struct *tty, char ch)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        unsigned long flags;
+
+        if (port->ops->send_xchar)
+                port->ops->send_xchar(port, ch);
+        else {
+                port->x_char = ch;
+                if (ch) {
+                        spin_lock_irqsave(&port->lock, flags);
+                        port->ops->start_tx(port, 0);
+                        spin_unlock_irqrestore(&port->lock, flags);
+                }
+        }
+}
+
+static void uart_throttle(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+
+        if (I_IXOFF(tty))
+                uart_send_xchar(tty, STOP_CHAR(tty));
+
+        if (tty->termios->c_cflag & CRTSCTS)
+                uart_clear_mctrl(state->port, TIOCM_RTS);
+}
+
+static void uart_unthrottle(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+
+        if (I_IXOFF(tty)) {
+                if (port->x_char)
+                        port->x_char = 0;
+                else
+                        uart_send_xchar(tty, START_CHAR(tty));
+        }
+
+        if (tty->termios->c_cflag & CRTSCTS)
+                uart_set_mctrl(port, TIOCM_RTS);
+}
+
+static int uart_get_info(struct uart_state *state,
+                         struct serial_struct __user *retinfo)
+{
+        struct uart_port *port = state->port;
+        struct serial_struct tmp;
+
+        memset(&tmp, 0, sizeof(tmp));
+        tmp.type            = port->type;
+        tmp.line            = port->line;
+        tmp.port            = port->iobase;
+        if (HIGH_BITS_OFFSET)
+                tmp.port_high = (long) port->iobase >> HIGH_BITS_OFFSET;
+        tmp.irq             = port->irq;
+        tmp.flags           = port->flags;
+        tmp.xmit_fifo_size  = port->fifosize;
+        tmp.baud_base       = port->uartclk / 16;
+        tmp.close_delay     = state->close_delay / 10;
+        tmp.closing_wait    = state->closing_wait == USF_CLOSING_WAIT_NONE ?
+                                ASYNC_CLOSING_WAIT_NONE :
+                                state->closing_wait / 10;
+        tmp.custom_divisor  = port->custom_divisor;
+        tmp.hub6            = port->hub6;
+        tmp.io_type         = port->iotype;
+        tmp.iomem_reg_shift = port->regshift;
+        tmp.iomem_base      = (void *)port->mapbase;
+
+        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
+                return -EFAULT;
+        return 0;
+}
+
+static int uart_set_info(struct uart_state *state,
+                         struct serial_struct __user *newinfo)
+{
+        struct serial_struct new_serial;
+        struct uart_port *port = state->port;
+        unsigned long new_port;
+        unsigned int change_irq, change_port, old_flags, closing_wait;
+        unsigned int old_custom_divisor, close_delay;
+        int retval = 0;
+
+        if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))
+                return -EFAULT;
+
+        new_port = new_serial.port;
+        if (HIGH_BITS_OFFSET)
+                new_port += (unsigned long) new_serial.port_high << HIGH_BITS_OFFSET;
+
+        new_serial.irq = irq_canonicalize(new_serial.irq);
+        close_delay = new_serial.close_delay * 10;
+        closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
+                        USF_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
+
+        /*
+         * This semaphore protects state->count.  It is also
+         * very useful to prevent opens.  Also, take the
+         * port configuration semaphore to make sure that a
+         * module insertion/removal doesn't change anything
+         * under us.
+         */
+        down(&state->sem);
+
+        change_irq  = new_serial.irq != port->irq;
+
+        /*
+         * Since changing the 'type' of the port changes its resource
+         * allocations, we should treat type changes the same as
+         * IO port changes.
+         */
+        change_port = new_port != port->iobase ||
+                      (unsigned long)new_serial.iomem_base != port->mapbase ||
+                      new_serial.hub6 != port->hub6 ||
+                      new_serial.io_type != port->iotype ||
+                      new_serial.iomem_reg_shift != port->regshift ||
+                      new_serial.type != port->type;
+
+        old_flags = port->flags;
+        old_custom_divisor = port->custom_divisor;
+
+        if (!capable(CAP_SYS_ADMIN)) {
+                retval = -EPERM;
+                if (change_irq || change_port ||
+                    (new_serial.baud_base != port->uartclk / 16) ||
+                    (close_delay != state->close_delay) ||
+                    (closing_wait != state->closing_wait) ||
+                    (new_serial.xmit_fifo_size != port->fifosize) ||
+                    (((new_serial.flags ^ old_flags) & ~UPF_USR_MASK) != 0))
+                        goto exit;
+                port->flags = ((port->flags & ~UPF_USR_MASK) |
+                               (new_serial.flags & UPF_USR_MASK));
+                port->custom_divisor = new_serial.custom_divisor;
+                goto check_and_exit;
+        }
+
+        /*
+         * Ask the low level driver to verify the settings.
+         */
+        if (port->ops->verify_port)
+                retval = port->ops->verify_port(port, &new_serial);
+
+        if ((new_serial.irq >= NR_IRQS) || (new_serial.irq < 0) ||
+            (new_serial.baud_base < 9600))
+                retval = -EINVAL;
+
+        if (retval)
+                goto exit;
+
+        if (change_port || change_irq) {
+                retval = -EBUSY;
+
+                /*
+                 * Make sure that we are the sole user of this port.
+                 */
+                if (uart_users(state) > 1)
+                        goto exit;
+
+                /*
+                 * We need to shutdown the serial port at the old
+                 * port/type/irq combination.
+                 */
+                uart_shutdown(state);
+        }
+
+        if (change_port) {
+                unsigned long old_iobase, old_mapbase;
+                unsigned int old_type, old_iotype, old_hub6, old_shift;
+
+                old_iobase = port->iobase;
+                old_mapbase = port->mapbase;
+                old_type = port->type;
+                old_hub6 = port->hub6;
+                old_iotype = port->iotype;
+                old_shift = port->regshift;
+
+                /*
+                 * Free and release old regions
+                 */
+                if (old_type != PORT_UNKNOWN)
+                        port->ops->release_port(port);
+
+                port->iobase = new_port;
+                port->type = new_serial.type;
+                port->hub6 = new_serial.hub6;
+                port->iotype = new_serial.io_type;
+                port->regshift = new_serial.iomem_reg_shift;
+                port->mapbase = (unsigned long)new_serial.iomem_base;
+
+                /*
+                 * Claim and map the new regions
+                 */
+                if (port->type != PORT_UNKNOWN) {
+                        retval = port->ops->request_port(port);
+                } else {
+                        /* Always success - Jean II */
+                        retval = 0;
+                }
+
+                /*
+                 * If we fail to request resources for the
+                 * new port, try to restore the old settings.
+                 */
+                if (retval && old_type != PORT_UNKNOWN) {
+                        port->iobase = old_iobase;
+                        port->type = old_type;
+                        port->hub6 = old_hub6;
+                        port->iotype = old_iotype;
+                        port->regshift = old_shift;
+                        port->mapbase = old_mapbase;
+                        retval = port->ops->request_port(port);
+                        /*
+                         * If we failed to restore the old settings,
+                         * we fail like this.
+                         */
+                        if (retval)
+                                port->type = PORT_UNKNOWN;
+
+                        /*
+                         * We failed anyway.
+                         */
+                        retval = -EBUSY;
+                }
+        }
+
+        port->irq              = new_serial.irq;
+        port->uartclk          = new_serial.baud_base * 16;
+        port->flags            = (port->flags & ~UPF_CHANGE_MASK) |
+                                 (new_serial.flags & UPF_CHANGE_MASK);
+        port->custom_divisor   = new_serial.custom_divisor;
+        state->close_delay     = close_delay;
+        state->closing_wait    = closing_wait;
+        port->fifosize         = new_serial.xmit_fifo_size;
+        if (state->info->tty)
+                state->info->tty->low_latency =
+                        (port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+
+ check_and_exit:
+        retval = 0;
+        if (port->type == PORT_UNKNOWN)
+                goto exit;
+        if (state->info->flags & UIF_INITIALIZED) {
+                if (((old_flags ^ port->flags) & UPF_SPD_MASK) ||
+                    old_custom_divisor != port->custom_divisor) {
+                        /*
+                         * If they're setting up a custom divisor or speed,
+                         * instead of clearing it, then bitch about it. No
+                         * need to rate-limit; it's CAP_SYS_ADMIN only.
+                         */
+                        if (port->flags & UPF_SPD_MASK) {
+                                char buf[64];
+                                printk(KERN_NOTICE
+                                       "%s sets custom speed on %s. This "
+                                       "is deprecated.\n", current->comm,
+                                       tty_name(state->info->tty, buf));
+                        }
+                        uart_change_speed(state, NULL);
+                }
+        } else
+                retval = uart_startup(state, 1);
+ exit:
+        up(&state->sem);
+        return retval;
+}
+
+
+/*
+ * uart_get_lsr_info - get line status register info.
+ * Note: uart_ioctl protects us against hangups.
+ */
+static int uart_get_lsr_info(struct uart_state *state,
+                             unsigned int __user *value)
+{
+        struct uart_port *port = state->port;
+        unsigned int result;
+
+        result = port->ops->tx_empty(port);
+
+        /*
+         * If we're about to load something into the transmit
+         * register, we'll pretend the transmitter isn't empty to
+         * avoid a race condition (depending on when the transmit
+         * interrupt happens).
+         */
+        if (port->x_char ||
+            ((uart_circ_chars_pending(&state->info->xmit) > 0) &&
+             !state->info->tty->stopped && !state->info->tty->hw_stopped))
+                result &= ~TIOCSER_TEMT;
+        
+        return put_user(result, value);
+}
+
+static int uart_tiocmget(struct tty_struct *tty, struct file *file)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        int result = -EIO;
+
+        down(&state->sem);
+        if ((!file || !tty_hung_up_p(file)) &&
+            !(tty->flags & (1 << TTY_IO_ERROR))) {
+                result = port->mctrl;
+                result |= port->ops->get_mctrl(port);
+        }
+        up(&state->sem);
+
+        return result;
+}
+
+static int
+uart_tiocmset(struct tty_struct *tty, struct file *file,
+              unsigned int set, unsigned int clear)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        int ret = -EIO;
+
+        down(&state->sem);
+        if ((!file || !tty_hung_up_p(file)) &&
+            !(tty->flags & (1 << TTY_IO_ERROR))) {
+                uart_update_mctrl(port, set, clear);
+                ret = 0;
+        }
+        up(&state->sem);
+        return ret;
+}
+
+static void uart_break_ctl(struct tty_struct *tty, int break_state)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+
+        BUG_ON(!kernel_locked());
+
+        down(&state->sem);
+
+        if (port->type != PORT_UNKNOWN)
+                port->ops->break_ctl(port, break_state);
+
+        up(&state->sem);
+}
+
+static int uart_do_autoconfig(struct uart_state *state)
+{
+        struct uart_port *port = state->port;
+        int flags, ret;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        /*
+         * Take the per-port semaphore.  This prevents count from
+         * changing, and hence any extra opens of the port while
+         * we're auto-configuring.
+         */
+        if (down_interruptible(&state->sem))
+                return -ERESTARTSYS;
+
+        ret = -EBUSY;
+        if (uart_users(state) == 1) {
+                uart_shutdown(state);
+
+                /*
+                 * If we already have a port type configured,
+                 * we must release its resources.
+                 */
+                if (port->type != PORT_UNKNOWN)
+                        port->ops->release_port(port);
+
+                flags = UART_CONFIG_TYPE;
+                if (port->flags & UPF_AUTO_IRQ)
+                        flags |= UART_CONFIG_IRQ;
+
+                /*
+                 * This will claim the ports resources if
+                 * a port is found.
+                 */
+                port->ops->config_port(port, flags);
+
+                ret = uart_startup(state, 1);
+        }
+        up(&state->sem);
+        return ret;
+}
+
+/*
+ * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
+ * - mask passed in arg for lines of interest
+ *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
+ * Caller should use TIOCGICOUNT to see which one it was
+ */
+static int
+uart_wait_modem_status(struct uart_state *state, unsigned long arg)
+{
+        struct uart_port *port = state->port;
+        DECLARE_WAITQUEUE(wait, current);
+        struct uart_icount cprev, cnow;
+        int ret;
+
+        /*
+         * note the counters on entry
+         */
+        spin_lock_irq(&port->lock);
+        memcpy(&cprev, &port->icount, sizeof(struct uart_icount));
+
+        /*
+         * Force modem status interrupts on
+         */
+        port->ops->enable_ms(port);
+        spin_unlock_irq(&port->lock);
+
+        add_wait_queue(&state->info->delta_msr_wait, &wait);
+        for (;;) {
+                spin_lock_irq(&port->lock);
+                memcpy(&cnow, &port->icount, sizeof(struct uart_icount));
+                spin_unlock_irq(&port->lock);
+
+                set_current_state(TASK_INTERRUPTIBLE);
+
+                if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
+                    ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
+                    ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
+                    ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts))) {
+                        ret = 0;
+                        break;
+                }
+
+                schedule();
+
+                /* see if a signal did it */
+                if (signal_pending(current)) {
+                        ret = -ERESTARTSYS;
+                        break;
+                }
+
+                cprev = cnow;
+        }
+
+        current->state = TASK_RUNNING;
+        remove_wait_queue(&state->info->delta_msr_wait, &wait);
+
+        return ret;
+}
+
+/*
+ * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
+ * Return: write counters to the user passed counter struct
+ * NB: both 1->0 and 0->1 transitions are counted except for
+ *     RI where only 0->1 is counted.
+ */
+static int uart_get_count(struct uart_state *state,
+                          struct serial_icounter_struct __user *icnt)
+{
+        struct serial_icounter_struct icount;
+        struct uart_icount cnow;
+        struct uart_port *port = state->port;
+
+        spin_lock_irq(&port->lock);
+        memcpy(&cnow, &port->icount, sizeof(struct uart_icount));
+        spin_unlock_irq(&port->lock);
+
+        icount.cts         = cnow.cts;
+        icount.dsr         = cnow.dsr;
+        icount.rng         = cnow.rng;
+        icount.dcd         = cnow.dcd;
+        icount.rx          = cnow.rx;
+        icount.tx          = cnow.tx;
+        icount.frame       = cnow.frame;
+        icount.overrun     = cnow.overrun;
+        icount.parity      = cnow.parity;
+        icount.brk         = cnow.brk;
+        icount.buf_overrun = cnow.buf_overrun;
+
+        return copy_to_user(icnt, &icount, sizeof(icount)) ? -EFAULT : 0;
+}
+
+/*
+ * Called via sys_ioctl under the BKL.  We can use spin_lock_irq() here.
+ */
+static int
+uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
+           unsigned long arg)
+{
+        struct uart_state *state = tty->driver_data;
+        void __user *uarg = (void __user *)arg;
+        int ret = -ENOIOCTLCMD;
+
+        BUG_ON(!kernel_locked());
+
+        /*
+         * These ioctls don't rely on the hardware to be present.
+         */
+        switch (cmd) {
+        case TIOCGSERIAL:
+                ret = uart_get_info(state, uarg);
+                break;
+
+        case TIOCSSERIAL:
+                ret = uart_set_info(state, uarg);
+                break;
+
+        case TIOCSERCONFIG:
+                ret = uart_do_autoconfig(state);
+                break;
+
+        case TIOCSERGWILD: /* obsolete */
+        case TIOCSERSWILD: /* obsolete */
+                ret = 0;
+                break;
+        }
+
+        if (ret != -ENOIOCTLCMD)
+                goto out;
+
+        if (tty->flags & (1 << TTY_IO_ERROR)) {
+                ret = -EIO;
+                goto out;
+        }
+
+        /*
+         * The following should only be used when hardware is present.
+         */
+        switch (cmd) {
+        case TIOCMIWAIT:
+                ret = uart_wait_modem_status(state, arg);
+                break;
+
+        case TIOCGICOUNT:
+                ret = uart_get_count(state, uarg);
+                break;
+        }
+
+        if (ret != -ENOIOCTLCMD)
+                goto out;
+
+        down(&state->sem);
+
+        if (tty_hung_up_p(filp)) {
+                ret = -EIO;
+                goto out_up;
+        }
+
+        /*
+         * All these rely on hardware being present and need to be
+         * protected against the tty being hung up.
+         */
+        switch (cmd) {
+        case TIOCSERGETLSR: /* Get line status register */
+                ret = uart_get_lsr_info(state, uarg);
+                break;
+
+        default: {
+                struct uart_port *port = state->port;
+                if (port->ops->ioctl)
+                        ret = port->ops->ioctl(port, cmd, arg);
+                break;
+        }
+        }
+ out_up:
+        up(&state->sem);
+ out:
+        return ret;
+}
+
+static void uart_set_termios(struct tty_struct *tty, struct termios *old_termios)
+{
+        struct uart_state *state = tty->driver_data;
+        unsigned long flags;
+        unsigned int cflag = tty->termios->c_cflag;
+
+        BUG_ON(!kernel_locked());
+
+        /*
+         * These are the bits that are used to setup various
+         * flags in the low level driver.
+         */
+#define RELEVANT_IFLAG(iflag)   ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
+
+        if ((cflag ^ old_termios->c_cflag) == 0 &&
+            RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0)
+                return;
+
+        uart_change_speed(state, old_termios);
+
+        /* Handle transition to B0 status */
+        if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD))
+                uart_clear_mctrl(state->port, TIOCM_RTS | TIOCM_DTR);
+
+        /* Handle transition away from B0 status */
+        if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
+                unsigned int mask = TIOCM_DTR;
+                if (!(cflag & CRTSCTS) ||
+                    !test_bit(TTY_THROTTLED, &tty->flags))
+                        mask |= TIOCM_RTS;
+                uart_set_mctrl(state->port, mask);
+        }
+
+        /* Handle turning off CRTSCTS */
+        if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
+                spin_lock_irqsave(&state->port->lock, flags);
+                tty->hw_stopped = 0;
+                __uart_start(tty);
+                spin_unlock_irqrestore(&state->port->lock, flags);
+        }
+
+#if 0
+        /*
+         * No need to wake up processes in open wait, since they
+         * sample the CLOCAL flag once, and don't recheck it.
+         * XXX  It's not clear whether the current behavior is correct
+         * or not.  Hence, this may change.....
+         */
+        if (!(old_termios->c_cflag & CLOCAL) &&
+            (tty->termios->c_cflag & CLOCAL))
+                wake_up_interruptible(&state->info->open_wait);
+#endif
+}
+
+/*
+ * In 2.4.5, calls to this will be serialized via the BKL in
+ *  linux/drivers/char/tty_io.c:tty_release()
+ *  linux/drivers/char/tty_io.c:do_tty_handup()
+ */
+static void uart_close(struct tty_struct *tty, struct file *filp)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port;
+        
+        BUG_ON(!kernel_locked());
+
+        if (!state || !state->port)
+                return;
+
+        port = state->port;
+
+        DPRINTK("uart_close(%d) called\n", port->line);
+
+        down(&state->sem);
+
+        if (tty_hung_up_p(filp))
+                goto done;
+
+        if ((tty->count == 1) && (state->count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  state->count should always
+                 * be one in these conditions.  If it's greater than
+                 * one, we've got real problems, since it means the
+                 * serial port won't be shutdown.
+                 */
+                printk(KERN_ERR "uart_close: bad serial port count; tty->count is 1, "
+                       "state->count is %d\n", state->count);
+                state->count = 1;
+        }
+        if (--state->count < 0) {
+                printk(KERN_ERR "uart_close: bad serial port count for %s: %d\n",
+                       tty->name, state->count);
+                state->count = 0;
+        }
+        if (state->count)
+                goto done;
+
+        /*
+         * Now we wait for the transmit buffer to clear; and we notify
+         * the line discipline to only process XON/XOFF characters by
+         * setting tty->closing.
+         */
+        tty->closing = 1;
+
+        if (state->closing_wait != USF_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, msecs_to_jiffies(state->closing_wait));
+
+        /*
+         * At this point, we stop accepting input.  To do this, we
+         * disable the receive line status interrupts.
+         */
+        if (state->info->flags & UIF_INITIALIZED) {
+                unsigned long flags;
+                spin_lock_irqsave(&port->lock, flags);
+                port->ops->stop_rx(port);
+                spin_unlock_irqrestore(&port->lock, flags);
+                /*
+                 * Before we drop DTR, make sure the UART transmitter
+                 * has completely drained; this is especially
+                 * important if there is a transmit FIFO!
+                 */
+                uart_wait_until_sent(tty, port->timeout);
+        }
+
+        uart_shutdown(state);
+        uart_flush_buffer(tty);
+
+        tty_ldisc_flush(tty);   
+        
+        tty->closing = 0;
+        state->info->tty = NULL;
+
+        if (state->info->blocked_open) {
+                if (state->close_delay)
+                        msleep_interruptible(state->close_delay);
+        } else if (!uart_console(port)) {
+                uart_change_pm(state, 3);
+        }
+
+        /*
+         * Wake up anyone trying to open this port.
+         */
+        state->info->flags &= ~UIF_NORMAL_ACTIVE;
+        wake_up_interruptible(&state->info->open_wait);
+
+ done:
+        up(&state->sem);
+}
+
+static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+        unsigned long char_time, expire;
+
+        BUG_ON(!kernel_locked());
+
+        if (port->type == PORT_UNKNOWN || port->fifosize == 0)
+                return;
+
+        /*
+         * Set the check interval to be 1/5 of the estimated time to
+         * send a single character, and make it at least 1.  The check
+         * interval should also be less than the timeout.
+         *
+         * Note: we have to use pretty tight timings here to satisfy
+         * the NIST-PCTS.
+         */
+        char_time = (port->timeout - HZ/50) / port->fifosize;
+        char_time = char_time / 5;
+        if (char_time == 0)
+                char_time = 1;
+        if (timeout && timeout < char_time)
+                char_time = timeout;
+
+        /*
+         * If the transmitter hasn't cleared in twice the approximate
+         * amount of time to send the entire FIFO, it probably won't
+         * ever clear.  This assumes the UART isn't doing flow
+         * control, which is currently the case.  Hence, if it ever
+         * takes longer than port->timeout, this is probably due to a
+         * UART bug of some kind.  So, we clamp the timeout parameter at
+         * 2*port->timeout.
+         */
+        if (timeout == 0 || timeout > 2 * port->timeout)
+                timeout = 2 * port->timeout;
+
+        expire = jiffies + timeout;
+
+        DPRINTK("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n",
+                port->line, jiffies, expire);
+
+        /*
+         * Check whether the transmitter is empty every 'char_time'.
+         * 'timeout' / 'expire' give us the maximum amount of time
+         * we wait.
+         */
+        while (!port->ops->tx_empty(port)) {
+                msleep_interruptible(jiffies_to_msecs(char_time));
+                if (signal_pending(current))
+                        break;
+                if (time_after(jiffies, expire))
+                        break;
+        }
+        set_current_state(TASK_RUNNING); /* might not be needed */
+}
+
+/*
+ * This is called with the BKL held in
+ *  linux/drivers/char/tty_io.c:do_tty_hangup()
+ * We're called from the eventd thread, so we can sleep for
+ * a _short_ time only.
+ */
+static void uart_hangup(struct tty_struct *tty)
+{
+        struct uart_state *state = tty->driver_data;
+
+        BUG_ON(!kernel_locked());
+        DPRINTK("uart_hangup(%d)\n", state->port->line);
+
+        down(&state->sem);
+        if (state->info && state->info->flags & UIF_NORMAL_ACTIVE) {
+                uart_flush_buffer(tty);
+                uart_shutdown(state);
+                state->count = 0;
+                state->info->flags &= ~UIF_NORMAL_ACTIVE;
+                state->info->tty = NULL;
+                wake_up_interruptible(&state->info->open_wait);
+                wake_up_interruptible(&state->info->delta_msr_wait);
+        }
+        up(&state->sem);
+}
+
+/*
+ * Copy across the serial console cflag setting into the termios settings
+ * for the initial open of the port.  This allows continuity between the
+ * kernel settings, and the settings init adopts when it opens the port
+ * for the first time.
+ */
+static void uart_update_termios(struct uart_state *state)
+{
+        struct tty_struct *tty = state->info->tty;
+        struct uart_port *port = state->port;
+
+        if (uart_console(port) && port->cons->cflag) {
+                tty->termios->c_cflag = port->cons->cflag;
+                port->cons->cflag = 0;
+        }
+
+        /*
+         * If the device failed to grab its irq resources,
+         * or some other error occurred, don't try to talk
+         * to the port hardware.
+         */
+        if (!(tty->flags & (1 << TTY_IO_ERROR))) {
+                /*
+                 * Make termios settings take effect.
+                 */
+                uart_change_speed(state, NULL);
+
+                /*
+                 * And finally enable the RTS and DTR signals.
+                 */
+                if (tty->termios->c_cflag & CBAUD)
+                        uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+        }
+}
+
+/*
+ * Block the open until the port is ready.  We must be called with
+ * the per-port semaphore held.
+ */
+static int
+uart_block_til_ready(struct file *filp, struct uart_state *state)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        struct uart_info *info = state->info;
+        struct uart_port *port = state->port;
+
+        info->blocked_open++;
+        state->count--;
+
+        add_wait_queue(&info->open_wait, &wait);
+        while (1) {
+                set_current_state(TASK_INTERRUPTIBLE);
+
+                /*
+                 * If we have been hung up, tell userspace/restart open.
+                 */
+                if (tty_hung_up_p(filp) || info->tty == NULL)
+                        break;
+
+                /*
+                 * If the port has been closed, tell userspace/restart open.
+                 */
+                if (!(info->flags & UIF_INITIALIZED))
+                        break;
+
+                /*
+                 * If non-blocking mode is set, or CLOCAL mode is set,
+                 * we don't want to wait for the modem status lines to
+                 * indicate that the port is ready.
+                 *
+                 * Also, if the port is not enabled/configured, we want
+                 * to allow the open to succeed here.  Note that we will
+                 * have set TTY_IO_ERROR for a non-existant port.
+                 */
+                if ((filp->f_flags & O_NONBLOCK) ||
+                    (info->tty->termios->c_cflag & CLOCAL) ||
+                    (info->tty->flags & (1 << TTY_IO_ERROR))) {
+                        break;
+                }
+
+                /*
+                 * Set DTR to allow modem to know we're waiting.  Do
+                 * not set RTS here - we want to make sure we catch
+                 * the data from the modem.
+                 */
+                if (info->tty->termios->c_cflag & CBAUD)
+                        uart_set_mctrl(port, TIOCM_DTR);
+
+                /*
+                 * and wait for the carrier to indicate that the
+                 * modem is ready for us.
+                 */
+                if (port->ops->get_mctrl(port) & TIOCM_CAR)
+                        break;
+
+                up(&state->sem);
+                schedule();
+                down(&state->sem);
+
+                if (signal_pending(current))
+                        break;
+        }
+        set_current_state(TASK_RUNNING);
+        remove_wait_queue(&info->open_wait, &wait);
+
+        state->count++;
+        info->blocked_open--;
+
+        if (signal_pending(current))
+                return -ERESTARTSYS;
+
+        if (!info->tty || tty_hung_up_p(filp))
+                return -EAGAIN;
+
+        return 0;
+}
+
+static struct uart_state *uart_get(struct uart_driver *drv, int line)
+{
+        struct uart_state *state;
+
+        down(&port_sem);
+        state = drv->state + line;
+        if (down_interruptible(&state->sem)) {
+                state = ERR_PTR(-ERESTARTSYS);
+                goto out;
+        }
+
+        state->count++;
+        if (!state->port) {
+                state->count--;
+                up(&state->sem);
+                state = ERR_PTR(-ENXIO);
+                goto out;
+        }
+
+        if (!state->info) {
+                state->info = kmalloc(sizeof(struct uart_info), GFP_KERNEL);
+                if (state->info) {
+                        memset(state->info, 0, sizeof(struct uart_info));
+                        init_waitqueue_head(&state->info->open_wait);
+                        init_waitqueue_head(&state->info->delta_msr_wait);
+
+                        /*
+                         * Link the info into the other structures.
+                         */
+                        state->port->info = state->info;
+
+                        tasklet_init(&state->info->tlet, uart_tasklet_action,
+                                     (unsigned long)state);
+                } else {
+                        state->count--;
+                        up(&state->sem);
+                        state = ERR_PTR(-ENOMEM);
+                }
+        }
+
+ out:
+        up(&port_sem);
+        return state;
+}
+
+/*
+ * In 2.4.5, calls to uart_open are serialised by the BKL in
+ *   linux/fs/devices.c:chrdev_open()
+ * Note that if this fails, then uart_close() _will_ be called.
+ *
+ * In time, we want to scrap the "opening nonpresent ports"
+ * behaviour and implement an alternative way for setserial
+ * to set base addresses/ports/types.  This will allow us to
+ * get rid of a certain amount of extra tests.
+ */
+static int uart_open(struct tty_struct *tty, struct file *filp)
+{
+        struct uart_driver *drv = (struct uart_driver *)tty->driver->driver_state;
+        struct uart_state *state;
+        int retval, line = tty->index;
+
+        BUG_ON(!kernel_locked());
+        DPRINTK("uart_open(%d) called\n", line);
+
+        /*
+         * tty->driver->num won't change, so we won't fail here with
+         * tty->driver_data set to something non-NULL (and therefore
+         * we won't get caught by uart_close()).
+         */
+        retval = -ENODEV;
+        if (line >= tty->driver->num)
+                goto fail;
+
+        /*
+         * We take the semaphore inside uart_get to guarantee that we won't
+         * be re-entered while allocating the info structure, or while we
+         * request any IRQs that the driver may need.  This also has the nice
+         * side-effect that it delays the action of uart_hangup, so we can
+         * guarantee that info->tty will always contain something reasonable.
+         */
+        state = uart_get(drv, line);
+        if (IS_ERR(state)) {
+                retval = PTR_ERR(state);
+                goto fail;
+        }
+
+        /*
+         * Once we set tty->driver_data here, we are guaranteed that
+         * uart_close() will decrement the driver module use count.
+         * Any failures from here onwards should not touch the count.
+         */
+        tty->driver_data = state;
+        tty->low_latency = (state->port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+        tty->alt_speed = 0;
+        state->info->tty = tty;
+
+        /*
+         * If the port is in the middle of closing, bail out now.
+         */
+        if (tty_hung_up_p(filp)) {
+                retval = -EAGAIN;
+                state->count--;
+                up(&state->sem);
+                goto fail;
+        }
+
+        /*
+         * Make sure the device is in D0 state.
+         */
+        if (state->count == 1)
+                uart_change_pm(state, 0);
+
+        /*
+         * Start up the serial port.
+         */
+        retval = uart_startup(state, 0);
+
+        /*
+         * If we succeeded, wait until the port is ready.
+         */
+        if (retval == 0)
+                retval = uart_block_til_ready(filp, state);
+        up(&state->sem);
+
+        /*
+         * If this is the first open to succeed, adjust things to suit.
+         */
+        if (retval == 0 && !(state->info->flags & UIF_NORMAL_ACTIVE)) {
+                state->info->flags |= UIF_NORMAL_ACTIVE;
+
+                uart_update_termios(state);
+        }
+
+ fail:
+        return retval;
+}
+
+static const char *uart_type(struct uart_port *port)
+{
+        const char *str = NULL;
+
+        if (port->ops->type)
+                str = port->ops->type(port);
+
+        if (!str)
+                str = "unknown";
+
+        return str;
+}
+
+#ifdef CONFIG_PROC_FS
+
+static int uart_line_info(char *buf, struct uart_driver *drv, int i)
+{
+        struct uart_state *state = drv->state + i;
+        struct uart_port *port = state->port;
+        char stat_buf[32];
+        unsigned int status;
+        int ret;
+
+        if (!port)
+                return 0;
+
+        ret = sprintf(buf, "%d: uart:%s %s%08lX irq:%d",
+                        port->line, uart_type(port),
+                        port->iotype == UPIO_MEM ? "mmio:0x" : "port:",
+                        port->iotype == UPIO_MEM ? port->mapbase :
+                                                (unsigned long) port->iobase,
+                        port->irq);
+
+        if (port->type == PORT_UNKNOWN) {
+                strcat(buf, "\n");
+                return ret + 1;
+        }
+
+        if(capable(CAP_SYS_ADMIN))
+        {
+                status = port->ops->get_mctrl(port);
+
+                ret += sprintf(buf + ret, " tx:%d rx:%d",
+                                port->icount.tx, port->icount.rx);
+                if (port->icount.frame)
+                        ret += sprintf(buf + ret, " fe:%d",
+                                port->icount.frame);
+                if (port->icount.parity)
+                        ret += sprintf(buf + ret, " pe:%d",
+                                port->icount.parity);
+                if (port->icount.brk)
+                        ret += sprintf(buf + ret, " brk:%d",
+                                port->icount.brk);
+                if (port->icount.overrun)
+                        ret += sprintf(buf + ret, " oe:%d",
+                                port->icount.overrun);
+        
+#define INFOBIT(bit,str) \
+        if (port->mctrl & (bit)) \
+                strncat(stat_buf, (str), sizeof(stat_buf) - \
+                        strlen(stat_buf) - 2)
+#define STATBIT(bit,str) \
+        if (status & (bit)) \
+                strncat(stat_buf, (str), sizeof(stat_buf) - \
+                       strlen(stat_buf) - 2)
+
+                stat_buf[0] = '\0';
+                stat_buf[1] = '\0';
+                INFOBIT(TIOCM_RTS, "|RTS");
+                STATBIT(TIOCM_CTS, "|CTS");
+                INFOBIT(TIOCM_DTR, "|DTR");
+                STATBIT(TIOCM_DSR, "|DSR");
+                STATBIT(TIOCM_CAR, "|CD");
+                STATBIT(TIOCM_RNG, "|RI");
+                if (stat_buf[0])
+                        stat_buf[0] = ' ';
+                strcat(stat_buf, "\n");
+        
+                ret += sprintf(buf + ret, stat_buf);
+        } else {
+                strcat(buf, "\n");
+                ret++;
+        }
+#undef STATBIT
+#undef INFOBIT
+        return ret;
+}
+
+static int uart_read_proc(char *page, char **start, off_t off,
+                          int count, int *eof, void *data)
+{
+        struct tty_driver *ttydrv = data;
+        struct uart_driver *drv = ttydrv->driver_state;
+        int i, len = 0, l;
+        off_t begin = 0;
+
+        len += sprintf(page, "serinfo:1.0 driver%s%s revision:%s\n",
+                        "", "", "");
+        for (i = 0; i < drv->nr && len < PAGE_SIZE - 96; i++) {
+                l = uart_line_info(page + len, drv, i);
+                len += l;
+                if (len + begin > off + count)
+                        goto done;
+                if (len + begin < off) {
+                        begin += len;
+                        len = 0;
+                }
+        }
+        *eof = 1;
+ done:
+        if (off >= len + begin)
+                return 0;
+        *start = page + (off - begin);
+        return (count < begin + len - off) ? count : (begin + len - off);
+}
+#endif
+
+#ifdef CONFIG_SERIAL_CORE_CONSOLE
+/*
+ *      Check whether an invalid uart number has been specified, and
+ *      if so, search for the first available port that does have
+ *      console support.
+ */
+struct uart_port * __init
+uart_get_console(struct uart_port *ports, int nr, struct console *co)
+{
+        int idx = co->index;
+
+        if (idx < 0 || idx >= nr || (ports[idx].iobase == 0 &&
+                                     ports[idx].membase == NULL))
+                for (idx = 0; idx < nr; idx++)
+                        if (ports[idx].iobase != 0 ||
+                            ports[idx].membase != NULL)
+                                break;
+
+        co->index = idx;
+
+        return ports + idx;
+}
+
+/**
+ *      uart_parse_options - Parse serial port baud/parity/bits/flow contro.
+ *      @options: pointer to option string
+ *      @baud: pointer to an 'int' variable for the baud rate.
+ *      @parity: pointer to an 'int' variable for the parity.
+ *      @bits: pointer to an 'int' variable for the number of data bits.
+ *      @flow: pointer to an 'int' variable for the flow control character.
+ *
+ *      uart_parse_options decodes a string containing the serial console
+ *      options.  The format of the string is <baud><parity><bits><flow>,
+ *      eg: 115200n8r
+ */
+void __init
+uart_parse_options(char *options, int *baud, int *parity, int *bits, int *flow)
+{
+        char *s = options;
+
+        *baud = simple_strtoul(s, NULL, 10);
+        while (*s >= '0' && *s <= '9')
+                s++;
+        if (*s)
+                *parity = *s++;
+        if (*s)
+                *bits = *s++ - '0';
+        if (*s)
+                *flow = *s;
+}
+
+struct baud_rates {
+        unsigned int rate;
+        unsigned int cflag;
+};
+
+static struct baud_rates baud_rates[] = {
+        { 921600, B921600 },
+        { 460800, B460800 },
+        { 230400, B230400 },
+        { 115200, B115200 },
+        {  57600, B57600  },
+        {  38400, B38400  },
+        {  19200, B19200  },
+        {   9600, B9600   },
+        {   4800, B4800   },
+        {   2400, B2400   },
+        {   1200, B1200   },
+        {      0, B38400  }
+};
+
+/**
+ *      uart_set_options - setup the serial console parameters
+ *      @port: pointer to the serial ports uart_port structure
+ *      @co: console pointer
+ *      @baud: baud rate
+ *      @parity: parity character - 'n' (none), 'o' (odd), 'e' (even)
+ *      @bits: number of data bits
+ *      @flow: flow control character - 'r' (rts)
+ */
+int __init
+uart_set_options(struct uart_port *port, struct console *co,
+                 int baud, int parity, int bits, int flow)
+{
+        struct termios termios;
+        int i;
+
+        memset(&termios, 0, sizeof(struct termios));
+
+        termios.c_cflag = CREAD | HUPCL | CLOCAL;
+
+        /*
+         * Construct a cflag setting.
+         */
+        for (i = 0; baud_rates[i].rate; i++)
+                if (baud_rates[i].rate <= baud)
+                        break;
+
+        termios.c_cflag |= baud_rates[i].cflag;
+
+        if (bits == 7)
+                termios.c_cflag |= CS7;
+        else
+                termios.c_cflag |= CS8;
+
+        switch (parity) {
+        case 'o': case 'O':
+                termios.c_cflag |= PARODD;
+                /*fall through*/
+        case 'e': case 'E':
+                termios.c_cflag |= PARENB;
+                break;
+        }
+
+        if (flow == 'r')
+                termios.c_cflag |= CRTSCTS;
+
+        port->ops->set_termios(port, &termios, NULL);
+        co->cflag = termios.c_cflag;
+
+        return 0;
+}
+#endif /* CONFIG_SERIAL_CORE_CONSOLE */
+
+static void uart_change_pm(struct uart_state *state, int pm_state)
+{
+        struct uart_port *port = state->port;
+        if (port->ops->pm)
+                port->ops->pm(port, pm_state, state->pm_state);
+        state->pm_state = pm_state;
+}
+
+int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
+{
+        struct uart_state *state = drv->state + port->line;
+
+        down(&state->sem);
+
+        if (state->info && state->info->flags & UIF_INITIALIZED) {
+                struct uart_ops *ops = port->ops;
+
+                spin_lock_irq(&port->lock);
+                ops->stop_tx(port, 0);
+                ops->set_mctrl(port, 0);
+                ops->stop_rx(port);
+                spin_unlock_irq(&port->lock);
+
+                /*
+                 * Wait for the transmitter to empty.
+                 */
+                while (!ops->tx_empty(port)) {
+                        msleep(10);
+                }
+
+                ops->shutdown(port);
+        }
+
+        /*
+         * Disable the console device before suspending.
+         */
+        if (uart_console(port))
+                console_stop(port->cons);
+
+        uart_change_pm(state, 3);
+
+        up(&state->sem);
+
+        return 0;
+}
+
+int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
+{
+        struct uart_state *state = drv->state + port->line;
+
+        down(&state->sem);
+
+        uart_change_pm(state, 0);
+
+        /*
+         * Re-enable the console device after suspending.
+         */
+        if (uart_console(port)) {
+                struct termios termios;
+
+                /*
+                 * First try to use the console cflag setting.
+                 */
+                memset(&termios, 0, sizeof(struct termios));
+                termios.c_cflag = port->cons->cflag;
+
+                /*
+                 * If that's unset, use the tty termios setting.
+                 */
+                if (state->info && state->info->tty && termios.c_cflag == 0)
+                        termios = *state->info->tty->termios;
+
+                port->ops->set_termios(port, &termios, NULL);
+                console_start(port->cons);
+        }
+
+        if (state->info && state->info->flags & UIF_INITIALIZED) {
+                struct uart_ops *ops = port->ops;
+
+                ops->set_mctrl(port, 0);
+                ops->startup(port);
+                uart_change_speed(state, NULL);
+                spin_lock_irq(&port->lock);
+                ops->set_mctrl(port, port->mctrl);
+                ops->start_tx(port, 0);
+                spin_unlock_irq(&port->lock);
+        }
+
+        up(&state->sem);
+
+        return 0;
+}
+
+static inline void
+uart_report_port(struct uart_driver *drv, struct uart_port *port)
+{
+        printk("%s%d", drv->dev_name, port->line);
+        printk(" at ");
+        switch (port->iotype) {
+        case UPIO_PORT:
+                printk("I/O 0x%x", port->iobase);
+                break;
+        case UPIO_HUB6:
+                printk("I/O 0x%x offset 0x%x", port->iobase, port->hub6);
+                break;
+        case UPIO_MEM:
+        case UPIO_MEM32:
+                printk("MMIO 0x%lx", port->mapbase);
+                break;
+        }
+        printk(" (irq = %d) is a %s\n", port->irq, uart_type(port));
+}
+
+static void
+uart_configure_port(struct uart_driver *drv, struct uart_state *state,
+                    struct uart_port *port)
+{
+        unsigned int flags;
+
+        /*
+         * If there isn't a port here, don't do anything further.
+         */
+        if (!port->iobase && !port->mapbase && !port->membase)
+                return;
+
+        /*
+         * Now do the auto configuration stuff.  Note that config_port
+         * is expected to claim the resources and map the port for us.
+         */
+        flags = UART_CONFIG_TYPE;
+        if (port->flags & UPF_AUTO_IRQ)
+                flags |= UART_CONFIG_IRQ;
+        if (port->flags & UPF_BOOT_AUTOCONF) {
+                port->type = PORT_UNKNOWN;
+                port->ops->config_port(port, flags);
+        }
+
+        if (port->type != PORT_UNKNOWN) {
+                unsigned long flags;
+
+                uart_report_port(drv, port);
+
+                /*
+                 * Ensure that the modem control lines are de-activated.
+                 * We probably don't need a spinlock around this, but
+                 */
+                spin_lock_irqsave(&port->lock, flags);
+                port->ops->set_mctrl(port, 0);
+                spin_unlock_irqrestore(&port->lock, flags);
+
+                /*
+                 * Power down all ports by default, except the
+                 * console if we have one.
+                 */
+                if (!uart_console(port))
+                        uart_change_pm(state, 3);
+        }
+}
+
+/*
+ * This reverses the effects of uart_configure_port, hanging up the
+ * port before removal.
+ */
+static void
+uart_unconfigure_port(struct uart_driver *drv, struct uart_state *state)
+{
+        struct uart_port *port = state->port;
+        struct uart_info *info = state->info;
+
+        if (info && info->tty)
+                tty_vhangup(info->tty);
+
+        down(&state->sem);
+
+        state->info = NULL;
+
+        /*
+         * Free the port IO and memory resources, if any.
+         */
+        if (port->type != PORT_UNKNOWN)
+                port->ops->release_port(port);
+
+        /*
+         * Indicate that there isn't a port here anymore.
+         */
+        port->type = PORT_UNKNOWN;
+
+        /*
+         * Kill the tasklet, and free resources.
+         */
+        if (info) {
+                tasklet_kill(&info->tlet);
+                kfree(info);
+        }
+
+        up(&state->sem);
+}
+
+static struct tty_operations uart_ops = {
+        .open           = uart_open,
+        .close          = uart_close,
+        .write          = uart_write,
+        .put_char       = uart_put_char,
+        .flush_chars    = uart_flush_chars,
+        .write_room     = uart_write_room,
+        .chars_in_buffer= uart_chars_in_buffer,
+        .flush_buffer   = uart_flush_buffer,
+        .ioctl          = uart_ioctl,
+        .throttle       = uart_throttle,
+        .unthrottle     = uart_unthrottle,
+        .send_xchar     = uart_send_xchar,
+        .set_termios    = uart_set_termios,
+        .stop           = uart_stop,
+        .start          = uart_start,
+        .hangup         = uart_hangup,
+        .break_ctl      = uart_break_ctl,
+        .wait_until_sent= uart_wait_until_sent,
+#ifdef CONFIG_PROC_FS
+        .read_proc      = uart_read_proc,
+#endif
+        .tiocmget       = uart_tiocmget,
+        .tiocmset       = uart_tiocmset,
+};
+
+/**
+ *      uart_register_driver - register a driver with the uart core layer
+ *      @drv: low level driver structure
+ *
+ *      Register a uart driver with the core driver.  We in turn register
+ *      with the tty layer, and initialise the core driver per-port state.
+ *
+ *      We have a proc file in /proc/tty/driver which is named after the
+ *      normal driver.
+ *
+ *      drv->port should be NULL, and the per-port structures should be
+ *      registered using uart_add_one_port after this call has succeeded.
+ */
+int uart_register_driver(struct uart_driver *drv)
+{
+        struct tty_driver *normal = NULL;
+        int i, retval;
+
+        BUG_ON(drv->state);
+
+        /*
+         * Maybe we should be using a slab cache for this, especially if
+         * we have a large number of ports to handle.
+         */
+        drv->state = kmalloc(sizeof(struct uart_state) * drv->nr, GFP_KERNEL);
+        retval = -ENOMEM;
+        if (!drv->state)
+                goto out;
+
+        memset(drv->state, 0, sizeof(struct uart_state) * drv->nr);
+
+        normal  = alloc_tty_driver(drv->nr);
+        if (!normal)
+                goto out;
+
+        drv->tty_driver = normal;
+
+        normal->owner           = drv->owner;
+        normal->driver_name     = drv->driver_name;
+        normal->devfs_name      = drv->devfs_name;
+        normal->name            = drv->dev_name;
+        normal->major           = drv->major;
+        normal->minor_start     = drv->minor;
+        normal->type            = TTY_DRIVER_TYPE_SERIAL;
+        normal->subtype         = SERIAL_TYPE_NORMAL;
+        normal->init_termios    = tty_std_termios;
+        normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
+        normal->flags           = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        normal->driver_state    = drv;
+        tty_set_operations(normal, &uart_ops);
+
+        /*
+         * Initialise the UART state(s).
+         */
+        for (i = 0; i < drv->nr; i++) {
+                struct uart_state *state = drv->state + i;
+
+                state->close_delay     = 500;   /* .5 seconds */
+                state->closing_wait    = 30000; /* 30 seconds */
+
+                init_MUTEX(&state->sem);
+        }
+
+        retval = tty_register_driver(normal);
+ out:
+        if (retval < 0) {
+                put_tty_driver(normal);
+                kfree(drv->state);
+        }
+        return retval;
+}
+
+/**
+ *      uart_unregister_driver - remove a driver from the uart core layer
+ *      @drv: low level driver structure
+ *
+ *      Remove all references to a driver from the core driver.  The low
+ *      level driver must have removed all its ports via the
+ *      uart_remove_one_port() if it registered them with uart_add_one_port().
+ *      (ie, drv->port == NULL)
+ */
+void uart_unregister_driver(struct uart_driver *drv)
+{
+        struct tty_driver *p = drv->tty_driver;
+        tty_unregister_driver(p);
+        put_tty_driver(p);
+        kfree(drv->state);
+        drv->tty_driver = NULL;
+}
+
+struct tty_driver *uart_console_device(struct console *co, int *index)
+{
+        struct uart_driver *p = co->data;
+        *index = co->index;
+        return p->tty_driver;
+}
+
+/**
+ *      uart_add_one_port - attach a driver-defined port structure
+ *      @drv: pointer to the uart low level driver structure for this port
+ *      @port: uart port structure to use for this port.
+ *
+ *      This allows the driver to register its own uart_port structure
+ *      with the core driver.  The main purpose is to allow the low
+ *      level uart drivers to expand uart_port, rather than having yet
+ *      more levels of structures.
+ */
+int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
+{
+        struct uart_state *state;
+        int ret = 0;
+
+        BUG_ON(in_interrupt());
+
+        if (port->line >= drv->nr)
+                return -EINVAL;
+
+        state = drv->state + port->line;
+
+        down(&port_sem);
+        if (state->port) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        state->port = port;
+
+        spin_lock_init(&port->lock);
+        port->cons = drv->cons;
+        port->info = state->info;
+
+        uart_configure_port(drv, state, port);
+
+        /*
+         * Register the port whether it's detected or not.  This allows
+         * setserial to be used to alter this ports parameters.
+         */
+        tty_register_device(drv->tty_driver, port->line, port->dev);
+
+        /*
+         * If this driver supports console, and it hasn't been
+         * successfully registered yet, try to re-register it.
+         * It may be that the port was not available.
+         */
+        if (port->type != PORT_UNKNOWN &&
+            port->cons && !(port->cons->flags & CON_ENABLED))
+                register_console(port->cons);
+
+ out:
+        up(&port_sem);
+
+        return ret;
+}
+
+/**
+ *      uart_remove_one_port - detach a driver defined port structure
+ *      @drv: pointer to the uart low level driver structure for this port
+ *      @port: uart port structure for this port
+ *
+ *      This unhooks (and hangs up) the specified port structure from the
+ *      core driver.  No further calls will be made to the low-level code
+ *      for this port.
+ */
+int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
+{
+        struct uart_state *state = drv->state + port->line;
+
+        BUG_ON(in_interrupt());
+
+        if (state->port != port)
+                printk(KERN_ALERT "Removing wrong port: %p != %p\n",
+                        state->port, port);
+
+        down(&port_sem);
+
+        /*
+         * Remove the devices from devfs
+         */
+        tty_unregister_device(drv->tty_driver, port->line);
+
+        uart_unconfigure_port(drv, state);
+        state->port = NULL;
+        up(&port_sem);
+
+        return 0;
+}
+
+/*
+ *      Are the two ports equivalent?
+ */
+int uart_match_port(struct uart_port *port1, struct uart_port *port2)
+{
+        if (port1->iotype != port2->iotype)
+                return 0;
+
+        switch (port1->iotype) {
+        case UPIO_PORT:
+                return (port1->iobase == port2->iobase);
+        case UPIO_HUB6:
+                return (port1->iobase == port2->iobase) &&
+                       (port1->hub6   == port2->hub6);
+        case UPIO_MEM:
+                return (port1->membase == port2->membase);
+        }
+        return 0;
+}
+EXPORT_SYMBOL(uart_match_port);
+
+/*
+ *      Try to find an unused uart_state slot for a port.
+ */
+static struct uart_state *
+uart_find_match_or_unused(struct uart_driver *drv, struct uart_port *port)
+{
+        int i;
+
+        /*
+         * First, find a port entry which matches.  Note: if we do
+         * find a matching entry, and it has a non-zero use count,
+         * then we can't register the port.
+         */
+        for (i = 0; i < drv->nr; i++)
+                if (uart_match_port(drv->state[i].port, port))
+                        return &drv->state[i];
+
+        /*
+         * We didn't find a matching entry, so look for the first
+         * free entry.  We look for one which hasn't been previously
+         * used (indicated by zero iobase).
+         */
+        for (i = 0; i < drv->nr; i++)
+                if (drv->state[i].port->type == PORT_UNKNOWN &&
+                    drv->state[i].port->iobase == 0 &&
+                    drv->state[i].count == 0)
+                        return &drv->state[i];
+
+        /*
+         * That also failed.  Last resort is to find any currently
+         * entry which doesn't have a real port associated with it.
+         */
+        for (i = 0; i < drv->nr; i++)
+                if (drv->state[i].port->type == PORT_UNKNOWN &&
+                    drv->state[i].count == 0)
+                        return &drv->state[i];
+
+        return NULL;
+}
+
+/**
+ *      uart_register_port: register uart settings with a port
+ *      @drv: pointer to the uart low level driver structure for this port
+ *      @port: uart port structure describing the port
+ *
+ *      Register UART settings with the specified low level driver.  Detect
+ *      the type of the port if UPF_BOOT_AUTOCONF is set, and detect the
+ *      IRQ if UPF_AUTO_IRQ is set.
+ *
+ *      We try to pick the same port for the same IO base address, so that
+ *      when a modem is plugged in, unplugged and plugged back in, it gets
+ *      allocated the same port.
+ *
+ *      Returns negative error, or positive line number.
+ */
+int uart_register_port(struct uart_driver *drv, struct uart_port *port)
+{
+        struct uart_state *state;
+        int ret;
+
+        down(&port_sem);
+
+        state = uart_find_match_or_unused(drv, port);
+
+        if (state) {
+                /*
+                 * Ok, we've found a line that we can use.
+                 *
+                 * If we find a port that matches this one, and it appears
+                 * to be in-use (even if it doesn't have a type) we shouldn't
+                 * alter it underneath itself - the port may be open and
+                 * trying to do useful work.
+                 */
+                if (uart_users(state) != 0) {
+                        ret = -EBUSY;
+                        goto out;
+                }
+
+                /*
+                 * If the port is already initialised, don't touch it.
+                 */
+                if (state->port->type == PORT_UNKNOWN) {
+                        state->port->iobase   = port->iobase;
+                        state->port->membase  = port->membase;
+                        state->port->irq      = port->irq;
+                        state->port->uartclk  = port->uartclk;
+                        state->port->fifosize = port->fifosize;
+                        state->port->regshift = port->regshift;
+                        state->port->iotype   = port->iotype;
+                        state->port->flags    = port->flags;
+                        state->port->line     = state - drv->state;
+                        state->port->mapbase  = port->mapbase;
+
+                        uart_configure_port(drv, state, state->port);
+                }
+
+                ret = state->port->line;
+        } else
+                ret = -ENOSPC;
+ out:
+        up(&port_sem);
+        return ret;
+}
+
+/**
+ *      uart_unregister_port - de-allocate a port
+ *      @drv: pointer to the uart low level driver structure for this port
+ *      @line: line index previously returned from uart_register_port()
+ *
+ *      Hang up the specified line associated with the low level driver,
+ *      and mark the port as unused.
+ */
+void uart_unregister_port(struct uart_driver *drv, int line)
+{
+        struct uart_state *state;
+
+        if (line < 0 || line >= drv->nr) {
+                printk(KERN_ERR "Attempt to unregister ");
+                printk("%s%d", drv->dev_name, line);
+                printk("\n");
+                return;
+        }
+
+        state = drv->state + line;
+
+        down(&port_sem);
+        uart_unconfigure_port(drv, state);
+        up(&port_sem);
+}
+
+EXPORT_SYMBOL(uart_write_wakeup);
+EXPORT_SYMBOL(uart_register_driver);
+EXPORT_SYMBOL(uart_unregister_driver);
+EXPORT_SYMBOL(uart_suspend_port);
+EXPORT_SYMBOL(uart_resume_port);
+EXPORT_SYMBOL(uart_register_port);
+EXPORT_SYMBOL(uart_unregister_port);
+EXPORT_SYMBOL(uart_add_one_port);
+EXPORT_SYMBOL(uart_remove_one_port);
+
+MODULE_DESCRIPTION("Serial driver core");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
new file mode 100644
index 000000000000..9034f9ad37c7
--- /dev/null
+++ b/drivers/serial/serial_cs.c
@@ -0,0 +1,747 @@
+/*======================================================================
+
+    A driver for PCMCIA serial devices
+
+    serial_cs.c 1.134 2002/05/04 05:48:53
+
+    The contents of this file are subject to the Mozilla Public
+    License Version 1.1 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+
+    Software distributed under the License is distributed on an "AS
+    IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+    implied. See the License for the specific language governing
+    rights and limitations under the License.
+
+    The initial developer of the original code is David A. Hinds
+    <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+    are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+
+    Alternatively, the contents of this file may be used under the
+    terms of the GNU General Public License version 2 (the "GPL"), in which
+    case the provisions of the GPL are applicable instead of the
+    above.  If you wish to allow the use of your version of this file
+    only under the terms of the GPL and not to allow others to use
+    your version of this file under the MPL, indicate your decision
+    by deleting the provisions above and replace them with the notice
+    and other provisions required by the GPL.  If you do not delete
+    the provisions above, a recipient may use your version of this
+    file under either the MPL or the GPL.
+    
+======================================================================*/
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/serial_core.h>
+#include <linux/major.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
+#include <pcmcia/version.h>
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ciscode.h>
+#include <pcmcia/ds.h>
+#include <pcmcia/cisreg.h>
+
+#include "8250.h"
+
+#ifdef PCMCIA_DEBUG
+static int pc_debug = PCMCIA_DEBUG;
+module_param(pc_debug, int, 0644);
+#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
+static char *version = "serial_cs.c 1.134 2002/05/04 05:48:53 (David Hinds)";
+#else
+#define DEBUG(n, args...)
+#endif
+
+/*====================================================================*/
+
+/* Parameters that can be set with 'insmod' */
+
+/* Enable the speaker? */
+static int do_sound = 1;
+/* Skip strict UART tests? */
+static int buggy_uart;
+
+module_param(do_sound, int, 0444);
+module_param(buggy_uart, int, 0444);
+
+/*====================================================================*/
+
+/* Table of multi-port card ID's */
+
+struct multi_id {
+        u_short manfid;
+        u_short prodid;
+        int multi;              /* 1 = multifunction, > 1 = # ports */
+};
+
+static struct multi_id multi_id[] = {
+        { MANFID_OMEGA,   PRODID_OMEGA_QSP_100,         4 },
+        { MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232,    2 },
+        { MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232_D1, 2 },
+        { MANFID_QUATECH, PRODID_QUATECH_QUAD_RS232,    4 },
+        { MANFID_SOCKET,  PRODID_SOCKET_DUAL_RS232,     2 },
+        { MANFID_INTEL,   PRODID_INTEL_DUAL_RS232,      2 },
+        { MANFID_NATINST, PRODID_NATINST_QUAD_RS232,    4 }
+};
+#define MULTI_COUNT (sizeof(multi_id)/sizeof(struct multi_id))
+
+struct serial_info {
+        dev_link_t              link;
+        int                     ndev;
+        int                     multi;
+        int                     slave;
+        int                     manfid;
+        dev_node_t              node[4];
+        int                     line[4];
+};
+
+static void serial_config(dev_link_t * link);
+static int serial_event(event_t event, int priority,
+                        event_callback_args_t * args);
+
+static dev_info_t dev_info = "serial_cs";
+
+static dev_link_t *serial_attach(void);
+static void serial_detach(dev_link_t *);
+
+static dev_link_t *dev_list = NULL;
+
+/*======================================================================
+
+    After a card is removed, serial_remove() will unregister
+    the serial device(s), and release the PCMCIA configuration.
+    
+======================================================================*/
+
+static void serial_remove(dev_link_t *link)
+{
+        struct serial_info *info = link->priv;
+        int i;
+
+        link->state &= ~DEV_PRESENT;
+
+        DEBUG(0, "serial_release(0x%p)\n", link);
+
+        /*
+         * Recheck to see if the device is still configured.
+         */
+        if (info->link.state & DEV_CONFIG) {
+                for (i = 0; i < info->ndev; i++)
+                        serial8250_unregister_port(info->line[i]);
+
+                info->link.dev = NULL;
+
+                if (!info->slave) {
+                        pcmcia_release_configuration(info->link.handle);
+                        pcmcia_release_io(info->link.handle, &info->link.io);
+                        pcmcia_release_irq(info->link.handle, &info->link.irq);
+                }
+
+                info->link.state &= ~DEV_CONFIG;
+        }
+}
+
+static void serial_suspend(dev_link_t *link)
+{
+        link->state |= DEV_SUSPEND;
+
+        if (link->state & DEV_CONFIG) {
+                struct serial_info *info = link->priv;
+                int i;
+
+                for (i = 0; i < info->ndev; i++)
+                        serial8250_suspend_port(info->line[i]);
+
+                if (!info->slave)
+                        pcmcia_release_configuration(link->handle);
+        }
+}
+
+static void serial_resume(dev_link_t *link)
+{
+        link->state &= ~DEV_SUSPEND;
+
+        if (DEV_OK(link)) {
+                struct serial_info *info = link->priv;
+                int i;
+
+                if (!info->slave)
+                        pcmcia_request_configuration(link->handle, &link->conf);
+
+                for (i = 0; i < info->ndev; i++)
+                        serial8250_resume_port(info->line[i]);
+        }
+}
+
+/*======================================================================
+
+    serial_attach() creates an "instance" of the driver, allocating
+    local data structures for one device.  The device is registered
+    with Card Services.
+
+======================================================================*/
+
+static dev_link_t *serial_attach(void)
+{
+        struct serial_info *info;
+        client_reg_t client_reg;
+        dev_link_t *link;
+        int ret;
+
+        DEBUG(0, "serial_attach()\n");
+
+        /* Create new serial device */
+        info = kmalloc(sizeof (*info), GFP_KERNEL);
+        if (!info)
+                return NULL;
+        memset(info, 0, sizeof (*info));
+        link = &info->link;
+        link->priv = info;
+
+        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+        link->io.NumPorts1 = 8;
+        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        link->conf.Attributes = CONF_ENABLE_IRQ;
+        if (do_sound) {
+                link->conf.Attributes |= CONF_ENABLE_SPKR;
+                link->conf.Status = CCSR_AUDIO_ENA;
+        }
+        link->conf.IntType = INT_MEMORY_AND_IO;
+
+        /* Register with Card Services */
+        link->next = dev_list;
+        dev_list = link;
+        client_reg.dev_info = &dev_info;
+        client_reg.EventMask =
+            CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
+            CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
+            CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+        client_reg.event_handler = &serial_event;
+        client_reg.Version = 0x0210;
+        client_reg.event_callback_args.client_data = link;
+        ret = pcmcia_register_client(&link->handle, &client_reg);
+        if (ret != CS_SUCCESS) {
+                cs_error(link->handle, RegisterClient, ret);
+                serial_detach(link);
+                return NULL;
+        }
+
+        return link;
+}
+
+/*======================================================================
+
+    This deletes a driver "instance".  The device is de-registered
+    with Card Services.  If it has been released, all local data
+    structures are freed.  Otherwise, the structures will be freed
+    when the device is released.
+
+======================================================================*/
+
+static void serial_detach(dev_link_t * link)
+{
+        struct serial_info *info = link->priv;
+        dev_link_t **linkp;
+        int ret;
+
+        DEBUG(0, "serial_detach(0x%p)\n", link);
+
+        /* Locate device structure */
+        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
+                if (*linkp == link)
+                        break;
+        if (*linkp == NULL)
+                return;
+
+        /*
+         * Ensure any outstanding scheduled tasks are completed.
+         */
+        flush_scheduled_work();
+
+        /*
+         * Ensure that the ports have been released.
+         */
+        serial_remove(link);
+
+        if (link->handle) {
+                ret = pcmcia_deregister_client(link->handle);
+                if (ret != CS_SUCCESS)
+                        cs_error(link->handle, DeregisterClient, ret);
+        }
+
+        /* Unlink device structure, free bits */
+        *linkp = link->next;
+        kfree(info);
+}
+
+/*====================================================================*/
+
+static int setup_serial(client_handle_t handle, struct serial_info * info,
+                        kio_addr_t iobase, int irq)
+{
+        struct uart_port port;
+        int line;
+
+        memset(&port, 0, sizeof (struct uart_port));
+        port.iobase = iobase;
+        port.irq = irq;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
+        port.uartclk = 1843200;
+        port.dev = &handle_to_dev(handle);
+        if (buggy_uart)
+                port.flags |= UPF_BUGGY_UART;
+        line = serial8250_register_port(&port);
+        if (line < 0) {
+                printk(KERN_NOTICE "serial_cs: serial8250_register_port() at "
+                       "0x%04lx, irq %d failed\n", (u_long)iobase, irq);
+                return -EINVAL;
+        }
+
+        info->line[info->ndev] = line;
+        sprintf(info->node[info->ndev].dev_name, "ttyS%d", line);
+        info->node[info->ndev].major = TTY_MAJOR;
+        info->node[info->ndev].minor = 0x40 + line;
+        if (info->ndev > 0)
+                info->node[info->ndev - 1].next = &info->node[info->ndev];
+        info->ndev++;
+
+        return 0;
+}
+
+/*====================================================================*/
+
+static int
+first_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse)
+{
+        int i;
+        i = pcmcia_get_first_tuple(handle, tuple);
+        if (i != CS_SUCCESS)
+                return CS_NO_MORE_ITEMS;
+        i = pcmcia_get_tuple_data(handle, tuple);
+        if (i != CS_SUCCESS)
+                return i;
+        return pcmcia_parse_tuple(handle, tuple, parse);
+}
+
+static int
+next_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse)
+{
+        int i;
+        i = pcmcia_get_next_tuple(handle, tuple);
+        if (i != CS_SUCCESS)
+                return CS_NO_MORE_ITEMS;
+        i = pcmcia_get_tuple_data(handle, tuple);
+        if (i != CS_SUCCESS)
+                return i;
+        return pcmcia_parse_tuple(handle, tuple, parse);
+}
+
+/*====================================================================*/
+
+static int simple_config(dev_link_t *link)
+{
+        static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+        static int size_table[2] = { 8, 16 };
+        client_handle_t handle = link->handle;
+        struct serial_info *info = link->priv;
+        tuple_t tuple;
+        u_char buf[256];
+        cisparse_t parse;
+        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+        config_info_t config;
+        int i, j, try;
+        int s;
+
+        /* If the card is already configured, look up the port and irq */
+        i = pcmcia_get_configuration_info(handle, &config);
+        if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
+                kio_addr_t port = 0;
+                if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
+                        port = config.BasePort2;
+                        info->slave = 1;
+                } else if ((info->manfid == MANFID_OSITECH) &&
+                           (config.NumPorts1 == 0x40)) {
+                        port = config.BasePort1 + 0x28;
+                        info->slave = 1;
+                }
+                if (info->slave)
+                        return setup_serial(handle, info, port, config.AssignedIRQ);
+        }
+        link->conf.Vcc = config.Vcc;
+
+        /* First pass: look for a config entry that looks normal. */
+        tuple.TupleData = (cisdata_t *) buf;
+        tuple.TupleOffset = 0;
+        tuple.TupleDataMax = 255;
+        tuple.Attributes = 0;
+        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        /* Two tries: without IO aliases, then with aliases */
+        for (s = 0; s < 2; s++) {
+                for (try = 0; try < 2; try++) {
+                        i = first_tuple(handle, &tuple, &parse);
+                        while (i != CS_NO_MORE_ITEMS) {
+                                if (i != CS_SUCCESS)
+                                        goto next_entry;
+                                if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                                        link->conf.Vpp1 = link->conf.Vpp2 =
+                                            cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                                if ((cf->io.nwin > 0) && (cf->io.win[0].len == size_table[s]) &&
+                                            (cf->io.win[0].base != 0)) {
+                                        link->conf.ConfigIndex = cf->index;
+                                        link->io.BasePort1 = cf->io.win[0].base;
+                                        link->io.IOAddrLines = (try == 0) ?
+                                            16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+                                        i = pcmcia_request_io(link->handle, &link->io);
+                                        if (i == CS_SUCCESS)
+                                                goto found_port;
+                                }
+next_entry:
+                                i = next_tuple(handle, &tuple, &parse);
+                        }
+                }
+        }
+        /* Second pass: try to find an entry that isn't picky about
+           its base address, then try to grab any standard serial port
+           address, and finally try to get any free port. */
+        i = first_tuple(handle, &tuple, &parse);
+        while (i != CS_NO_MORE_ITEMS) {
+                if ((i == CS_SUCCESS) && (cf->io.nwin > 0) &&
+                    ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
+                        link->conf.ConfigIndex = cf->index;
+                        for (j = 0; j < 5; j++) {
+                                link->io.BasePort1 = base[j];
+                                link->io.IOAddrLines = base[j] ? 16 : 3;
+                                i = pcmcia_request_io(link->handle, &link->io);
+                                if (i == CS_SUCCESS)
+                                        goto found_port;
+                        }
+                }
+                i = next_tuple(handle, &tuple, &parse);
+        }
+
+      found_port:
+        if (i != CS_SUCCESS) {
+                printk(KERN_NOTICE
+                       "serial_cs: no usable port range found, giving up\n");
+                cs_error(link->handle, RequestIO, i);
+                return -1;
+        }
+
+        i = pcmcia_request_irq(link->handle, &link->irq);
+        if (i != CS_SUCCESS) {
+                cs_error(link->handle, RequestIRQ, i);
+                link->irq.AssignedIRQ = 0;
+        }
+        if (info->multi && (info->manfid == MANFID_3COM))
+                link->conf.ConfigIndex &= ~(0x08);
+        i = pcmcia_request_configuration(link->handle, &link->conf);
+        if (i != CS_SUCCESS) {
+                cs_error(link->handle, RequestConfiguration, i);
+                return -1;
+        }
+
+        return setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
+}
+
+static int multi_config(dev_link_t * link)
+{
+        client_handle_t handle = link->handle;
+        struct serial_info *info = link->priv;
+        tuple_t tuple;
+        u_char buf[256];
+        cisparse_t parse;
+        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+        config_info_t config;
+        int i, base2 = 0;
+
+        i = pcmcia_get_configuration_info(handle, &config);
+        if (i != CS_SUCCESS) {
+                cs_error(handle, GetConfigurationInfo, i);
+                return -1;
+        }
+        link->conf.Vcc = config.Vcc;
+
+        tuple.TupleData = (cisdata_t *) buf;
+        tuple.TupleOffset = 0;
+        tuple.TupleDataMax = 255;
+        tuple.Attributes = 0;
+        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+
+        /* First, look for a generic full-sized window */
+        link->io.NumPorts1 = info->multi * 8;
+        i = first_tuple(handle, &tuple, &parse);
+        while (i != CS_NO_MORE_ITEMS) {
+                /* The quad port cards have bad CIS's, so just look for a
+                   window larger than 8 ports and assume it will be right */
+                if ((i == CS_SUCCESS) && (cf->io.nwin == 1) &&
+                    (cf->io.win[0].len > 8)) {
+                        link->conf.ConfigIndex = cf->index;
+                        link->io.BasePort1 = cf->io.win[0].base;
+                        link->io.IOAddrLines =
+                            cf->io.flags & CISTPL_IO_LINES_MASK;
+                        i = pcmcia_request_io(link->handle, &link->io);
+                        base2 = link->io.BasePort1 + 8;
+                        if (i == CS_SUCCESS)
+                                break;
+                }
+                i = next_tuple(handle, &tuple, &parse);
+        }
+
+        /* If that didn't work, look for two windows */
+        if (i != CS_SUCCESS) {
+                link->io.NumPorts1 = link->io.NumPorts2 = 8;
+                info->multi = 2;
+                i = first_tuple(handle, &tuple, &parse);
+                while (i != CS_NO_MORE_ITEMS) {
+                        if ((i == CS_SUCCESS) && (cf->io.nwin == 2)) {
+                                link->conf.ConfigIndex = cf->index;
+                                link->io.BasePort1 = cf->io.win[0].base;
+                                link->io.BasePort2 = cf->io.win[1].base;
+                                link->io.IOAddrLines =
+                                    cf->io.flags & CISTPL_IO_LINES_MASK;
+                                i = pcmcia_request_io(link->handle, &link->io);
+                                base2 = link->io.BasePort2;
+                                if (i == CS_SUCCESS)
+                                        break;
+                        }
+                        i = next_tuple(handle, &tuple, &parse);
+                }
+        }
+
+        if (i != CS_SUCCESS) {
+                cs_error(link->handle, RequestIO, i);
+                return -1;
+        }
+
+        i = pcmcia_request_irq(link->handle, &link->irq);
+        if (i != CS_SUCCESS) {
+                printk(KERN_NOTICE
+                       "serial_cs: no usable port range found, giving up\n");
+                cs_error(link->handle, RequestIRQ, i);
+                link->irq.AssignedIRQ = 0;
+        }
+        /* Socket Dual IO: this enables irq's for second port */
+        if (info->multi && (info->manfid == MANFID_SOCKET)) {
+                link->conf.Present |= PRESENT_EXT_STATUS;
+                link->conf.ExtStatus = ESR_REQ_ATTN_ENA;
+        }
+        i = pcmcia_request_configuration(link->handle, &link->conf);
+        if (i != CS_SUCCESS) {
+                cs_error(link->handle, RequestConfiguration, i);
+                return -1;
+        }
+
+        /* The Oxford Semiconductor OXCF950 cards are in fact single-port:
+           8 registers are for the UART, the others are extra registers */
+        if (info->manfid == MANFID_OXSEMI) {
+                if (cf->index == 1 || cf->index == 3) {
+                        setup_serial(handle, info, base2, link->irq.AssignedIRQ);
+                        outb(12, link->io.BasePort1 + 1);
+                } else {
+                        setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
+                        outb(12, base2 + 1);
+                }
+                return 0;
+        }
+
+        setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
+        /* The Nokia cards are not really multiport cards */
+        if (info->manfid == MANFID_NOKIA)
+                return 0;
+        for (i = 0; i < info->multi - 1; i++)
+                setup_serial(handle, info, base2 + (8 * i), link->irq.AssignedIRQ);
+
+        return 0;
+}
+
+/*======================================================================
+
+    serial_config() is scheduled to run after a CARD_INSERTION event
+    is received, to configure the PCMCIA socket, and to make the
+    serial device available to the system.
+
+======================================================================*/
+
+void serial_config(dev_link_t * link)
+{
+        client_handle_t handle = link->handle;
+        struct serial_info *info = link->priv;
+        tuple_t tuple;
+        u_short buf[128];
+        cisparse_t parse;
+        cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+        int i, last_ret, last_fn;
+
+        DEBUG(0, "serial_config(0x%p)\n", link);
+
+        tuple.TupleData = (cisdata_t *) buf;
+        tuple.TupleOffset = 0;
+        tuple.TupleDataMax = 255;
+        tuple.Attributes = 0;
+        /* Get configuration register information */
+        tuple.DesiredTuple = CISTPL_CONFIG;
+        last_ret = first_tuple(handle, &tuple, &parse);
+        if (last_ret != CS_SUCCESS) {
+                last_fn = ParseTuple;
+                goto cs_failed;
+        }
+        link->conf.ConfigBase = parse.config.base;
+        link->conf.Present = parse.config.rmask[0];
+
+        /* Configure card */
+        link->state |= DEV_CONFIG;
+
+        /* Is this a compliant multifunction card? */
+        tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
+        tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
+        info->multi = (first_tuple(handle, &tuple, &parse) == CS_SUCCESS);
+
+        /* Is this a multiport card? */
+        tuple.DesiredTuple = CISTPL_MANFID;
+        if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+                info->manfid = le16_to_cpu(buf[0]);
+                for (i = 0; i < MULTI_COUNT; i++)
+                        if ((info->manfid == multi_id[i].manfid) &&
+                            (le16_to_cpu(buf[1]) == multi_id[i].prodid))
+                                break;
+                if (i < MULTI_COUNT)
+                        info->multi = multi_id[i].multi;
+        }
+
+        /* Another check for dual-serial cards: look for either serial or
+           multifunction cards that ask for appropriate IO port ranges */
+        tuple.DesiredTuple = CISTPL_FUNCID;
+        if ((info->multi == 0) &&
+            ((first_tuple(handle, &tuple, &parse) != CS_SUCCESS) ||
+             (parse.funcid.func == CISTPL_FUNCID_MULTI) ||
+             (parse.funcid.func == CISTPL_FUNCID_SERIAL))) {
+                tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+                if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+                        if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0))
+                                info->multi = cf->io.win[0].len >> 3;
+                        if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) &&
+                            (cf->io.win[1].len == 8))
+                                info->multi = 2;
+                }
+        }
+
+        if (info->multi > 1)
+                multi_config(link);
+        else
+                simple_config(link);
+
+        if (info->ndev == 0)
+                goto failed;
+
+        if (info->manfid == MANFID_IBM) {
+                conf_reg_t reg = { 0, CS_READ, 0x800, 0 };
+                last_ret = pcmcia_access_configuration_register(link->handle, &reg);
+                if (last_ret) {
+                        last_fn = AccessConfigurationRegister;
+                        goto cs_failed;
+                }
+                reg.Action = CS_WRITE;
+                reg.Value = reg.Value | 1;
+                last_ret = pcmcia_access_configuration_register(link->handle, &reg);
+                if (last_ret) {
+                        last_fn = AccessConfigurationRegister;
+                        goto cs_failed;
+                }
+        }
+
+        link->dev = &info->node[0];
+        link->state &= ~DEV_CONFIG_PENDING;
+        return;
+
+ cs_failed:
+        cs_error(link->handle, last_fn, last_ret);
+ failed:
+        serial_remove(link);
+        link->state &= ~DEV_CONFIG_PENDING;
+}
+
+/*======================================================================
+
+    The card status event handler.  Mostly, this schedules other
+    stuff to run after an event is received.  A CARD_REMOVAL event
+    also sets some flags to discourage the serial drivers from
+    talking to the ports.
+    
+======================================================================*/
+
+static int
+serial_event(event_t event, int priority, event_callback_args_t * args)
+{
+        dev_link_t *link = args->client_data;
+        struct serial_info *info = link->priv;
+
+        DEBUG(1, "serial_event(0x%06x)\n", event);
+
+        switch (event) {
+        case CS_EVENT_CARD_REMOVAL:
+                serial_remove(link);
+                break;
+
+        case CS_EVENT_CARD_INSERTION:
+                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+                serial_config(link);
+                break;
+
+        case CS_EVENT_PM_SUSPEND:
+                serial_suspend(link);
+                break;
+
+        case CS_EVENT_RESET_PHYSICAL:
+                if ((link->state & DEV_CONFIG) && !info->slave)
+                        pcmcia_release_configuration(link->handle);
+                break;
+
+        case CS_EVENT_PM_RESUME:
+                serial_resume(link);
+                break;
+
+        case CS_EVENT_CARD_RESET:
+                if (DEV_OK(link) && !info->slave)
+                        pcmcia_request_configuration(link->handle, &link->conf);
+                break;
+        }
+        return 0;
+}
+
+static struct pcmcia_driver serial_cs_driver = {
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = "serial_cs",
+        },
+        .attach         = serial_attach,
+        .detach         = serial_detach,
+};
+
+static int __init init_serial_cs(void)
+{
+        return pcmcia_register_driver(&serial_cs_driver);
+}
+
+static void __exit exit_serial_cs(void)
+{
+        pcmcia_unregister_driver(&serial_cs_driver);
+        BUG_ON(dev_list != NULL);
+}
+
+module_init(init_serial_cs);
+module_exit(exit_serial_cs);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
new file mode 100644
index 000000000000..4ce3a41f1611
--- /dev/null
+++ b/drivers/serial/serial_lh7a40x.c
@@ -0,0 +1,711 @@
+/* drivers/serial/serial_lh7a40x.c
+ *
+ *  Copyright (C) 2004 Coastal Environmental Systems
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  version 2 as published by the Free Software Foundation.
+ *
+ */
+
+/* Driver for Sharp LH7A40X embedded serial ports
+ *
+ *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
+ *  Based on drivers/serial/amba.c, by Deep Blue Solutions Ltd.
+ *
+ *  ---
+ *
+ * This driver supports the embedded UARTs of the Sharp LH7A40X series
+ * CPUs.  While similar to the 16550 and other UART chips, there is
+ * nothing close to register compatibility.  Moreover, some of the
+ * modem control lines are not available, either in the chip or they
+ * are lacking in the board-level implementation.
+ *
+ * - Use of SIRDIS
+ *   For simplicity, we disable the IR functions of any UART whenever
+ *   we enable it.
+ *
+ */
+
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#define DEV_MAJOR       204
+#define DEV_MINOR       16
+#define DEV_NR          3
+
+#define ISR_LOOP_LIMIT  256
+
+#define UR(p,o) _UR ((p)->membase, o)
+#define _UR(b,o) (*((volatile unsigned int*)(((unsigned char*) b) + (o))))
+#define BIT_CLR(p,o,m)  UR(p,o) = UR(p,o) & (~(unsigned int)m)
+#define BIT_SET(p,o,m)  UR(p,o) = UR(p,o) | ( (unsigned int)m)
+
+#define UART_REG_SIZE   32
+
+#define UART_R_DATA     (0x00)
+#define UART_R_FCON     (0x04)
+#define UART_R_BRCON    (0x08)
+#define UART_R_CON      (0x0c)
+#define UART_R_STATUS   (0x10)
+#define UART_R_RAWISR   (0x14)
+#define UART_R_INTEN    (0x18)
+#define UART_R_ISR      (0x1c)
+
+#define UARTEN          (0x01)          /* UART enable */
+#define SIRDIS          (0x02)          /* Serial IR disable (UART1 only) */
+
+#define RxEmpty         (0x10)
+#define TxEmpty         (0x80)
+#define TxFull          (0x20)
+#define nRxRdy          RxEmpty
+#define nTxRdy          TxFull
+#define TxBusy          (0x08)
+
+#define RxBreak         (0x0800)
+#define RxOverrunError  (0x0400)
+#define RxParityError   (0x0200)
+#define RxFramingError  (0x0100)
+#define RxError     (RxBreak | RxOverrunError | RxParityError | RxFramingError)
+
+#define DCD             (0x04)
+#define DSR             (0x02)
+#define CTS             (0x01)
+
+#define RxInt           (0x01)
+#define TxInt           (0x02)
+#define ModemInt        (0x04)
+#define RxTimeoutInt    (0x08)
+
+#define MSEOI           (0x10)
+
+#define WLEN_8          (0x60)
+#define WLEN_7          (0x40)
+#define WLEN_6          (0x20)
+#define WLEN_5          (0x00)
+#define WLEN            (0x60)  /* Mask for all word-length bits */
+#define STP2            (0x08)
+#define PEN             (0x02)  /* Parity Enable */
+#define EPS             (0x04)  /* Even Parity Set */
+#define FEN             (0x10)  /* FIFO Enable */
+#define BRK             (0x01)  /* Send Break */
+
+
+struct uart_port_lh7a40x {
+        struct uart_port port;
+        unsigned int statusPrev; /* Most recently read modem status */
+};
+
+static void lh7a40xuart_stop_tx (struct uart_port* port, unsigned int tty_stop)
+{
+        BIT_CLR (port, UART_R_INTEN, TxInt);
+}
+
+static void lh7a40xuart_start_tx (struct uart_port* port,
+                                  unsigned int tty_start)
+{
+        BIT_SET (port, UART_R_INTEN, TxInt);
+
+        /* *** FIXME: do I need to check for startup of the
+                      transmitter?  The old driver did, but AMBA
+                      doesn't . */
+}
+
+static void lh7a40xuart_stop_rx (struct uart_port* port)
+{
+        BIT_SET (port, UART_R_INTEN, RxTimeoutInt | RxInt);
+}
+
+static void lh7a40xuart_enable_ms (struct uart_port* port)
+{
+        BIT_SET (port, UART_R_INTEN, ModemInt);
+}
+
+static void
+#ifdef SUPPORT_SYSRQ
+lh7a40xuart_rx_chars (struct uart_port* port, struct pt_regs* regs)
+#else
+lh7a40xuart_rx_chars (struct uart_port* port)
+#endif
+{
+        struct tty_struct* tty = port->info->tty;
+        int cbRxMax = 256;      /* (Gross) limit on receive */
+        unsigned int data, flag;/* Received data and status */
+
+        while (!(UR (port, UART_R_STATUS) & nRxRdy) && --cbRxMax) {
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /*
+                         * If this failed then we will throw away the
+                         * bytes but must do so to clear interrupts
+                         */
+                }
+
+                data = UR (port, UART_R_DATA);
+                flag = TTY_NORMAL;
+                ++port->icount.rx;
+
+                if (data & RxError) {   /* Quick check, short-circuit */
+                        if (data & RxBreak) {
+                                data &= ~(RxFramingError | RxParityError);
+                                ++port->icount.brk;
+                                if (uart_handle_break (port))
+                                        continue;
+                        }
+                        else if (data & RxParityError)
+                                ++port->icount.parity;
+                        else if (data & RxFramingError)
+                                ++port->icount.frame;
+                        if (data & RxOverrunError)
+                                ++port->icount.overrun;
+
+                                /* Mask by termios, leave Rx'd byte */
+                        data &= port->read_status_mask | 0xff;
+
+                        if (data & RxBreak)
+                                flag = TTY_BREAK;
+                        else if (data & RxParityError)
+                                flag = TTY_PARITY;
+                        else if (data & RxFramingError)
+                                flag = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char (port, (unsigned char) data, regs))
+                        continue;
+
+                if ((data & port->ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, data, flag);
+                }
+                if ((data & RxOverrunError)
+                    && tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+        }
+        tty_flip_buffer_push (tty);
+        return;
+}
+
+static void lh7a40xuart_tx_chars (struct uart_port* port)
+{
+        struct circ_buf* xmit = &port->info->xmit;
+        int cbTxMax = port->fifosize;
+
+        if (port->x_char) {
+                UR (port, UART_R_DATA) = port->x_char;
+                ++port->icount.tx;
+                port->x_char = 0;
+                return;
+        }
+        if (uart_circ_empty (xmit) || uart_tx_stopped (port)) {
+                lh7a40xuart_stop_tx (port, 0);
+                return;
+        }
+
+        /* Unlike the AMBA UART, the lh7a40x UART does not guarantee
+           that at least half of the FIFO is empty.  Instead, we check
+           status for every character.  Using the AMBA method causes
+           the transmitter to drop characters. */
+
+        do {
+                UR (port, UART_R_DATA) = xmit->buf[xmit->tail];
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                ++port->icount.tx;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (!(UR (port, UART_R_STATUS) & nTxRdy)
+                 && cbTxMax--);
+
+        if (uart_circ_chars_pending (xmit) < WAKEUP_CHARS)
+                uart_write_wakeup (port);
+
+        if (uart_circ_empty (xmit))
+                lh7a40xuart_stop_tx (port, 0);
+}
+
+static void lh7a40xuart_modem_status (struct uart_port* port)
+{
+        unsigned int status = UR (port, UART_R_STATUS);
+        unsigned int delta
+                = status ^ ((struct uart_port_lh7a40x*) port)->statusPrev;
+
+        BIT_SET (port, UART_R_RAWISR, MSEOI); /* Clear modem status intr */
+
+        if (!delta)             /* Only happens if we missed 2 transitions */
+                return;
+
+        ((struct uart_port_lh7a40x*) port)->statusPrev = status;
+
+        if (delta & DCD)
+                uart_handle_dcd_change (port, status & DCD);
+
+        if (delta & DSR)
+                ++port->icount.dsr;
+
+        if (delta & CTS)
+                uart_handle_cts_change (port, status & CTS);
+
+        wake_up_interruptible (&port->info->delta_msr_wait);
+}
+
+static irqreturn_t lh7a40xuart_int (int irq, void* dev_id,
+                                    struct pt_regs* regs)
+{
+        struct uart_port* port = dev_id;
+        unsigned int cLoopLimit = ISR_LOOP_LIMIT;
+        unsigned int isr = UR (port, UART_R_ISR);
+
+
+        do {
+                if (isr & (RxInt | RxTimeoutInt))
+#ifdef SUPPORT_SYSRQ
+                        lh7a40xuart_rx_chars(port, regs);
+#else
+                        lh7a40xuart_rx_chars(port);
+#endif
+                if (isr & ModemInt)
+                        lh7a40xuart_modem_status (port);
+                if (isr & TxInt)
+                        lh7a40xuart_tx_chars (port);
+
+                if (--cLoopLimit == 0)
+                        break;
+
+                isr = UR (port, UART_R_ISR);
+        } while (isr & (RxInt | TxInt | RxTimeoutInt));
+
+        return IRQ_HANDLED;
+}
+
+static unsigned int lh7a40xuart_tx_empty (struct uart_port* port)
+{
+        return (UR (port, UART_R_STATUS) & TxEmpty) ? TIOCSER_TEMT : 0;
+}
+
+static unsigned int lh7a40xuart_get_mctrl (struct uart_port* port)
+{
+        unsigned int result = 0;
+        unsigned int status = UR (port, UART_R_STATUS);
+
+        if (status & DCD)
+                result |= TIOCM_CAR;
+        if (status & DSR)
+                result |= TIOCM_DSR;
+        if (status & CTS)
+                result |= TIOCM_CTS;
+
+        return result;
+}
+
+static void lh7a40xuart_set_mctrl (struct uart_port* port, unsigned int mctrl)
+{
+        /* None of the ports supports DTR. UART1 supports RTS through GPIO. */
+        /* Note, kernel appears to be setting DTR and RTS on console. */
+
+        /* *** FIXME: this deserves more work.  There's some work in
+               tracing all of the IO pins. */
+#if 0
+        if( port->mapbase == UART1_PHYS) {
+                gpioRegs_t *gpio = (gpioRegs_t *)IO_ADDRESS(GPIO_PHYS);
+
+                if (mctrl & TIOCM_RTS)
+                        gpio->pbdr &= ~GPIOB_UART1_RTS;
+                else
+                        gpio->pbdr |= GPIOB_UART1_RTS;
+        }
+#endif
+}
+
+static void lh7a40xuart_break_ctl (struct uart_port* port, int break_state)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->lock, flags);
+        if (break_state == -1)
+                BIT_SET (port, UART_R_FCON, BRK); /* Assert break */
+        else
+                BIT_CLR (port, UART_R_FCON, BRK); /* Deassert break */
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int lh7a40xuart_startup (struct uart_port* port)
+{
+        int retval;
+
+        retval = request_irq (port->irq, lh7a40xuart_int, 0,
+                              "serial_lh7a40x", port);
+        if (retval)
+                return retval;
+
+                                /* Initial modem control-line settings */
+        ((struct uart_port_lh7a40x*) port)->statusPrev
+                = UR (port, UART_R_STATUS);
+
+        /* There is presently no configuration option to enable IR.
+           Thus, we always disable it. */
+
+        BIT_SET (port, UART_R_CON, UARTEN | SIRDIS);
+        BIT_SET (port, UART_R_INTEN, RxTimeoutInt | RxInt);
+
+        return 0;
+}
+
+static void lh7a40xuart_shutdown (struct uart_port* port)
+{
+        free_irq (port->irq, port);
+        BIT_CLR (port, UART_R_FCON, BRK | FEN);
+        BIT_CLR (port, UART_R_CON, UARTEN);
+}
+
+static void lh7a40xuart_set_termios (struct uart_port* port,
+                                     struct termios* termios,
+                                     struct termios* old)
+{
+        unsigned int con;
+        unsigned int inten;
+        unsigned int fcon;
+        unsigned long flags;
+        unsigned int baud;
+        unsigned int quot;
+
+        baud = uart_get_baud_rate (port, termios, old, 8, port->uartclk/16);
+        quot = uart_get_divisor (port, baud); /* -1 performed elsewhere */
+
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                fcon = WLEN_5;
+                break;
+        case CS6:
+                fcon = WLEN_6;
+                break;
+        case CS7:
+                fcon = WLEN_7;
+                break;
+        case CS8:
+        default:
+                fcon = WLEN_8;
+                break;
+        }
+        if (termios->c_cflag & CSTOPB)
+                fcon |= STP2;
+        if (termios->c_cflag & PARENB) {
+                fcon |= PEN;
+                if (!(termios->c_cflag & PARODD))
+                        fcon |= EPS;
+        }
+        if (port->fifosize > 1)
+                fcon |= FEN;
+
+        spin_lock_irqsave (&port->lock, flags);
+
+        uart_update_timeout (port, termios->c_cflag, baud);
+
+        port->read_status_mask = RxOverrunError;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= RxFramingError | RxParityError;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= RxBreak;
+
+                /* Figure mask for status we ignore */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= RxFramingError | RxParityError;
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= RxBreak;
+                /* Ignore overrun when ignorning parity */
+                /* *** FIXME: is this in the right place? */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= RxOverrunError;
+        }
+
+                /* Ignore all receive errors when receive disabled */
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= RxError;
+
+        con   = UR (port, UART_R_CON);
+        inten = (UR (port, UART_R_INTEN) & ~ModemInt);
+
+        if (UART_ENABLE_MS (port, termios->c_cflag))
+                inten |= ModemInt;
+
+        BIT_CLR (port, UART_R_CON, UARTEN);     /* Disable UART */
+        UR (port, UART_R_INTEN) = 0;            /* Disable interrupts */
+        UR (port, UART_R_BRCON) = quot - 1;     /* Set baud rate divisor */
+        UR (port, UART_R_FCON)  = fcon;         /* Set FIFO and frame ctrl */
+        UR (port, UART_R_INTEN) = inten;        /* Enable interrupts */
+        UR (port, UART_R_CON)   = con;          /* Restore UART mode */
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char* lh7a40xuart_type (struct uart_port* port)
+{
+        return port->type == PORT_LH7A40X ? "LH7A40X" : NULL;
+}
+
+static void lh7a40xuart_release_port (struct uart_port* port)
+{
+        release_mem_region (port->mapbase, UART_REG_SIZE);
+}
+
+static int lh7a40xuart_request_port (struct uart_port* port)
+{
+        return request_mem_region (port->mapbase, UART_REG_SIZE,
+                                   "serial_lh7a40x") != NULL
+                ? 0 : -EBUSY;
+}
+
+static void lh7a40xuart_config_port (struct uart_port* port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = PORT_LH7A40X;
+                lh7a40xuart_request_port (port);
+        }
+}
+
+static int lh7a40xuart_verify_port (struct uart_port* port,
+                                    struct serial_struct* ser)
+{
+        int ret = 0;
+
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_LH7A40X)
+                ret = -EINVAL;
+        if (ser->irq < 0 || ser->irq >= NR_IRQS)
+                ret = -EINVAL;
+        if (ser->baud_base < 9600) /* *** FIXME: is this true? */
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops lh7a40x_uart_ops = {
+        .tx_empty       = lh7a40xuart_tx_empty,
+        .set_mctrl      = lh7a40xuart_set_mctrl,
+        .get_mctrl      = lh7a40xuart_get_mctrl,
+        .stop_tx        = lh7a40xuart_stop_tx,
+        .start_tx       = lh7a40xuart_start_tx,
+        .stop_rx        = lh7a40xuart_stop_rx,
+        .enable_ms      = lh7a40xuart_enable_ms,
+        .break_ctl      = lh7a40xuart_break_ctl,
+        .startup        = lh7a40xuart_startup,
+        .shutdown       = lh7a40xuart_shutdown,
+        .set_termios    = lh7a40xuart_set_termios,
+        .type           = lh7a40xuart_type,
+        .release_port   = lh7a40xuart_release_port,
+        .request_port   = lh7a40xuart_request_port,
+        .config_port    = lh7a40xuart_config_port,
+        .verify_port    = lh7a40xuart_verify_port,
+};
+
+static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
+        {
+                .port = {
+                        .membase        = (void*) io_p2v (UART1_PHYS),
+                        .mapbase        = UART1_PHYS,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = IRQ_UART1INTR,
+                        .uartclk        = 14745600/2,
+                        .fifosize       = 16,
+                        .ops            = &lh7a40x_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+        },
+        {
+                .port = {
+                        .membase        = (void*) io_p2v (UART2_PHYS),
+                        .mapbase        = UART2_PHYS,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = IRQ_UART2INTR,
+                        .uartclk        = 14745600/2,
+                        .fifosize       = 16,
+                        .ops            = &lh7a40x_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+        },
+        {
+                .port = {
+                        .membase        = (void*) io_p2v (UART3_PHYS),
+                        .mapbase        = UART3_PHYS,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = IRQ_UART3INTR,
+                        .uartclk        = 14745600/2,
+                        .fifosize       = 16,
+                        .ops            = &lh7a40x_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+        },
+};
+
+#ifndef CONFIG_SERIAL_LH7A40X_CONSOLE
+# define LH7A40X_CONSOLE NULL
+#else
+# define LH7A40X_CONSOLE &lh7a40x_console
+
+
+static void lh7a40xuart_console_write (struct console* co,
+                                       const char* s,
+                                       unsigned int count)
+{
+        struct uart_port* port = &lh7a40x_ports[co->index].port;
+        unsigned int con = UR (port, UART_R_CON);
+        unsigned int inten = UR (port, UART_R_INTEN);
+
+
+        UR (port, UART_R_INTEN) = 0;            /* Disable all interrupts */
+        BIT_SET (port, UART_R_CON, UARTEN | SIRDIS); /* Enable UART */
+
+        for (; count-- > 0; ++s) {
+                while (UR (port, UART_R_STATUS) & nTxRdy)
+                        ;
+                UR (port, UART_R_DATA) = *s;
+                if (*s == '\n') {
+                        while ((UR (port, UART_R_STATUS) & TxBusy))
+                                ;
+                        UR (port, UART_R_DATA) = '\r';
+                }
+        }
+
+                                /* Wait until all characters are sent */
+        while (UR (port, UART_R_STATUS) & TxBusy)
+                ;
+
+                                /* Restore control and interrupt mask */
+        UR (port, UART_R_CON) = con;
+        UR (port, UART_R_INTEN) = inten;
+}
+
+static void __init lh7a40xuart_console_get_options (struct uart_port* port,
+                                                    int* baud,
+                                                    int* parity,
+                                                    int* bits)
+{
+        if (UR (port, UART_R_CON) & UARTEN) {
+                unsigned int fcon = UR (port, UART_R_FCON);
+                unsigned int quot = UR (port, UART_R_BRCON) + 1;
+
+                switch (fcon & (PEN | EPS)) {
+                default:        *parity = 'n'; break;
+                case PEN:       *parity = 'o'; break;
+                case PEN | EPS: *parity = 'e'; break;
+                }
+
+                switch (fcon & WLEN) {
+                default:
+                case WLEN_8: *bits = 8; break;
+                case WLEN_7: *bits = 7; break;
+                case WLEN_6: *bits = 6; break;
+                case WLEN_5: *bits = 5; break;
+                }
+
+                *baud = port->uartclk/(16*quot);
+        }
+}
+
+static int __init lh7a40xuart_console_setup (struct console* co, char* options)
+{
+        struct uart_port* port;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        if (co->index >= DEV_NR) /* Bounds check on device number */
+                co->index = 0;
+        port = &lh7a40x_ports[co->index].port;
+
+        if (options)
+                uart_parse_options (options, &baud, &parity, &bits, &flow);
+        else
+                lh7a40xuart_console_get_options (port, &baud, &parity, &bits);
+
+        return uart_set_options (port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver lh7a40x_reg;
+static struct console lh7a40x_console = {
+        .name           = "ttyAM",
+        .write          = lh7a40xuart_console_write,
+        .device         = uart_console_device,
+        .setup          = lh7a40xuart_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &lh7a40x_reg,
+};
+
+static int __init lh7a40xuart_console_init(void)
+{
+        register_console (&lh7a40x_console);
+        return 0;
+}
+
+console_initcall (lh7a40xuart_console_init);
+
+#endif
+
+static struct uart_driver lh7a40x_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "ttyAM",
+        .dev_name               = "ttyAM",
+        .major                  = DEV_MAJOR,
+        .minor                  = DEV_MINOR,
+        .nr                     = DEV_NR,
+        .cons                   = LH7A40X_CONSOLE,
+};
+
+static int __init lh7a40xuart_init(void)
+{
+        int ret;
+
+        printk (KERN_INFO "serial: LH7A40X serial driver\n");
+
+        ret = uart_register_driver (&lh7a40x_reg);
+
+        if (ret == 0) {
+                int i;
+
+                for (i = 0; i < DEV_NR; i++)
+                        uart_add_one_port (&lh7a40x_reg,
+                                           &lh7a40x_ports[i].port);
+        }
+        return ret;
+}
+
+static void __exit lh7a40xuart_exit(void)
+{
+        int i;
+
+        for (i = 0; i < DEV_NR; i++)
+                uart_remove_one_port (&lh7a40x_reg, &lh7a40x_ports[i].port);
+
+        uart_unregister_driver (&lh7a40x_reg);
+}
+
+module_init (lh7a40xuart_init);
+module_exit (lh7a40xuart_exit);
+
+MODULE_AUTHOR ("Marc Singer");
+MODULE_DESCRIPTION ("Sharp LH7A40X serial port driver");
+MODULE_LICENSE ("GPL");
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
new file mode 100644
index 000000000000..dfc987301f17
--- /dev/null
+++ b/drivers/serial/serial_txx9.c
@@ -0,0 +1,1171 @@
+/*
+ *  drivers/serial/serial_txx9.c
+ *
+ * Derived from many drivers using generic_serial interface,
+ * especially serial_tx3912.c by Steven J. Hill and r39xx_serial.c
+ * (was in Linux/VR tree) by Jim Pick.
+ *
+ *  Copyright (C) 1999 Harald Koerfgen
+ *  Copyright (C) 2000 Jim Pick <jim@jimpick.com>
+ *  Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com)
+ *  Copyright (C) 2000-2002 Toshiba Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  Serial driver for TX3927/TX4927/TX4925/TX4938 internal SIO controller
+ *
+ *  Revision History:
+ *      0.30    Initial revision. (Renamed from serial_txx927.c)
+ *      0.31    Use save_flags instead of local_irq_save.
+ *      0.32    Support SCLK.
+ *      0.33    Switch TXX9_TTY_NAME by CONFIG_SERIAL_TXX9_STDSERIAL.
+ *              Support TIOCSERGETLSR.
+ *      0.34    Support slow baudrate.
+ *      0.40    Merge codes from mainstream kernel (2.4.22).
+ *      0.41    Fix console checking in rs_shutdown_port().
+ *              Disable flow-control in serial_console_write().
+ *      0.42    Fix minor compiler warning.
+ *      1.00    Kernel 2.6.  Converted to new serial core (based on 8250.c).
+ *      1.01    Set fifosize to make tx_empry called properly.
+ *              Use standard uart_get_divisor.
+ *      1.02    Cleanup. (import 8250.c changes)
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+static char *serial_version = "1.02";
+static char *serial_name = "TX39/49 Serial driver";
+
+#define PASS_LIMIT      256
+
+#if !defined(CONFIG_SERIAL_TXX9_STDSERIAL)
+/* "ttyS" is used for standard serial driver */
+#define TXX9_TTY_NAME "ttyTX"
+#define TXX9_TTY_DEVFS_NAME "tttx/"
+#define TXX9_TTY_MINOR_START    (64 + 64)       /* ttyTX0(128), ttyTX1(129) */
+#else
+/* acts like standard serial driver */
+#define TXX9_TTY_NAME "ttyS"
+#define TXX9_TTY_DEVFS_NAME "tts/"
+#define TXX9_TTY_MINOR_START    64
+#endif
+#define TXX9_TTY_MAJOR  TTY_MAJOR
+
+/* flag aliases */
+#define UPF_TXX9_HAVE_CTS_LINE  UPF_BUGGY_UART
+#define UPF_TXX9_USE_SCLK       UPF_MAGIC_MULTIPLIER
+
+#ifdef CONFIG_PCI
+/* support for Toshiba TC86C001 SIO */
+#define ENABLE_SERIAL_TXX9_PCI
+#endif
+
+/*
+ * Number of serial ports
+ */
+#ifdef ENABLE_SERIAL_TXX9_PCI
+#define NR_PCI_BOARDS   4
+#define UART_NR  (2 + NR_PCI_BOARDS)
+#else
+#define UART_NR  2
+#endif
+
+struct uart_txx9_port {
+        struct uart_port        port;
+
+        /*
+         * We provide a per-port pm hook.
+         */
+        void                    (*pm)(struct uart_port *port,
+                                      unsigned int state, unsigned int old);
+};
+
+#define TXX9_REGION_SIZE        0x24
+
+/* TXX9 Serial Registers */
+#define TXX9_SILCR      0x00
+#define TXX9_SIDICR     0x04
+#define TXX9_SIDISR     0x08
+#define TXX9_SICISR     0x0c
+#define TXX9_SIFCR      0x10
+#define TXX9_SIFLCR     0x14
+#define TXX9_SIBGR      0x18
+#define TXX9_SITFIFO    0x1c
+#define TXX9_SIRFIFO    0x20
+
+/* SILCR : Line Control */
+#define TXX9_SILCR_SCS_MASK     0x00000060
+#define TXX9_SILCR_SCS_IMCLK    0x00000000
+#define TXX9_SILCR_SCS_IMCLK_BG 0x00000020
+#define TXX9_SILCR_SCS_SCLK     0x00000040
+#define TXX9_SILCR_SCS_SCLK_BG  0x00000060
+#define TXX9_SILCR_UEPS 0x00000010
+#define TXX9_SILCR_UPEN 0x00000008
+#define TXX9_SILCR_USBL_MASK    0x00000004
+#define TXX9_SILCR_USBL_1BIT    0x00000000
+#define TXX9_SILCR_USBL_2BIT    0x00000004
+#define TXX9_SILCR_UMODE_MASK   0x00000003
+#define TXX9_SILCR_UMODE_8BIT   0x00000000
+#define TXX9_SILCR_UMODE_7BIT   0x00000001
+
+/* SIDICR : DMA/Int. Control */
+#define TXX9_SIDICR_TDE 0x00008000
+#define TXX9_SIDICR_RDE 0x00004000
+#define TXX9_SIDICR_TIE 0x00002000
+#define TXX9_SIDICR_RIE 0x00001000
+#define TXX9_SIDICR_SPIE        0x00000800
+#define TXX9_SIDICR_CTSAC       0x00000600
+#define TXX9_SIDICR_STIE_MASK   0x0000003f
+#define TXX9_SIDICR_STIE_OERS           0x00000020
+#define TXX9_SIDICR_STIE_CTSS           0x00000010
+#define TXX9_SIDICR_STIE_RBRKD  0x00000008
+#define TXX9_SIDICR_STIE_TRDY           0x00000004
+#define TXX9_SIDICR_STIE_TXALS  0x00000002
+#define TXX9_SIDICR_STIE_UBRKD  0x00000001
+
+/* SIDISR : DMA/Int. Status */
+#define TXX9_SIDISR_UBRK        0x00008000
+#define TXX9_SIDISR_UVALID      0x00004000
+#define TXX9_SIDISR_UFER        0x00002000
+#define TXX9_SIDISR_UPER        0x00001000
+#define TXX9_SIDISR_UOER        0x00000800
+#define TXX9_SIDISR_ERI 0x00000400
+#define TXX9_SIDISR_TOUT        0x00000200
+#define TXX9_SIDISR_TDIS        0x00000100
+#define TXX9_SIDISR_RDIS        0x00000080
+#define TXX9_SIDISR_STIS        0x00000040
+#define TXX9_SIDISR_RFDN_MASK   0x0000001f
+
+/* SICISR : Change Int. Status */
+#define TXX9_SICISR_OERS        0x00000020
+#define TXX9_SICISR_CTSS        0x00000010
+#define TXX9_SICISR_RBRKD       0x00000008
+#define TXX9_SICISR_TRDY        0x00000004
+#define TXX9_SICISR_TXALS       0x00000002
+#define TXX9_SICISR_UBRKD       0x00000001
+
+/* SIFCR : FIFO Control */
+#define TXX9_SIFCR_SWRST        0x00008000
+#define TXX9_SIFCR_RDIL_MASK    0x00000180
+#define TXX9_SIFCR_RDIL_1       0x00000000
+#define TXX9_SIFCR_RDIL_4       0x00000080
+#define TXX9_SIFCR_RDIL_8       0x00000100
+#define TXX9_SIFCR_RDIL_12      0x00000180
+#define TXX9_SIFCR_RDIL_MAX     0x00000180
+#define TXX9_SIFCR_TDIL_MASK    0x00000018
+#define TXX9_SIFCR_TDIL_MASK    0x00000018
+#define TXX9_SIFCR_TDIL_1       0x00000000
+#define TXX9_SIFCR_TDIL_4       0x00000001
+#define TXX9_SIFCR_TDIL_8       0x00000010
+#define TXX9_SIFCR_TDIL_MAX     0x00000010
+#define TXX9_SIFCR_TFRST        0x00000004
+#define TXX9_SIFCR_RFRST        0x00000002
+#define TXX9_SIFCR_FRSTE        0x00000001
+#define TXX9_SIO_TX_FIFO        8
+#define TXX9_SIO_RX_FIFO        16
+
+/* SIFLCR : Flow Control */
+#define TXX9_SIFLCR_RCS 0x00001000
+#define TXX9_SIFLCR_TES 0x00000800
+#define TXX9_SIFLCR_RTSSC       0x00000200
+#define TXX9_SIFLCR_RSDE        0x00000100
+#define TXX9_SIFLCR_TSDE        0x00000080
+#define TXX9_SIFLCR_RTSTL_MASK  0x0000001e
+#define TXX9_SIFLCR_RTSTL_MAX   0x0000001e
+#define TXX9_SIFLCR_TBRK        0x00000001
+
+/* SIBGR : Baudrate Control */
+#define TXX9_SIBGR_BCLK_MASK    0x00000300
+#define TXX9_SIBGR_BCLK_T0      0x00000000
+#define TXX9_SIBGR_BCLK_T2      0x00000100
+#define TXX9_SIBGR_BCLK_T4      0x00000200
+#define TXX9_SIBGR_BCLK_T6      0x00000300
+#define TXX9_SIBGR_BRD_MASK     0x000000ff
+
+static inline unsigned int sio_in(struct uart_txx9_port *up, int offset)
+{
+        switch (up->port.iotype) {
+        default:
+                return *(volatile u32 *)(up->port.membase + offset);
+        case UPIO_PORT:
+                return inl(up->port.iobase + offset);
+        }
+}
+
+static inline void
+sio_out(struct uart_txx9_port *up, int offset, int value)
+{
+        switch (up->port.iotype) {
+        default:
+                *(volatile u32 *)(up->port.membase + offset) = value;
+                break;
+        case UPIO_PORT:
+                outl(value, up->port.iobase + offset);
+                break;
+        }
+}
+
+static inline void
+sio_mask(struct uart_txx9_port *up, int offset, unsigned int value)
+{
+        sio_out(up, offset, sio_in(up, offset) & ~value);
+}
+static inline void
+sio_set(struct uart_txx9_port *up, int offset, unsigned int value)
+{
+        sio_out(up, offset, sio_in(up, offset) | value);
+}
+
+static inline void
+sio_quot_set(struct uart_txx9_port *up, int quot)
+{
+        quot >>= 1;
+        if (quot < 256)
+                sio_out(up, TXX9_SIBGR, quot | TXX9_SIBGR_BCLK_T0);
+        else if (quot < (256 << 2))
+                sio_out(up, TXX9_SIBGR, (quot >> 2) | TXX9_SIBGR_BCLK_T2);
+        else if (quot < (256 << 4))
+                sio_out(up, TXX9_SIBGR, (quot >> 4) | TXX9_SIBGR_BCLK_T4);
+        else if (quot < (256 << 6))
+                sio_out(up, TXX9_SIBGR, (quot >> 6) | TXX9_SIBGR_BCLK_T6);
+        else
+                sio_out(up, TXX9_SIBGR, 0xff | TXX9_SIBGR_BCLK_T6);
+}
+
+static void serial_txx9_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_TIE);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void serial_txx9_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        sio_set(up, TXX9_SIDICR, TXX9_SIDICR_TIE);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void serial_txx9_stop_rx(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        up->port.read_status_mask &= ~TXX9_SIDISR_RDIS;
+#if 0
+        sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_RIE);
+#endif
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void serial_txx9_enable_ms(struct uart_port *port)
+{
+        /* TXX9-SIO can not control DTR... */
+}
+
+static inline void
+receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;
+        unsigned char ch;
+        unsigned int disr = *status;
+        int max_count = 256;
+        char flag;
+
+        do {
+                /* The following is not allowed by the tty layer and
+                   unsafe. It should be fixed ASAP */
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        if(tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                        /* If this failed then we will throw away the
+                           bytes but must do so to clear interrupts */
+                }
+                ch = sio_in(up, TXX9_SIRFIFO);
+                flag = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(disr & (TXX9_SIDISR_UBRK | TXX9_SIDISR_UPER |
+                                     TXX9_SIDISR_UFER | TXX9_SIDISR_UOER))) {
+                        /*
+                         * For statistics only
+                         */
+                        if (disr & TXX9_SIDISR_UBRK) {
+                                disr &= ~(TXX9_SIDISR_UFER | TXX9_SIDISR_UPER);
+                                up->port.icount.brk++;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        goto ignore_char;
+                        } else if (disr & TXX9_SIDISR_UPER)
+                                up->port.icount.parity++;
+                        else if (disr & TXX9_SIDISR_UFER)
+                                up->port.icount.frame++;
+                        if (disr & TXX9_SIDISR_UOER)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ingored.
+                         */
+                        disr &= up->port.read_status_mask;
+
+                        if (disr & TXX9_SIDISR_UBRK) {
+                                flag = TTY_BREAK;
+                        } else if (disr & TXX9_SIDISR_UPER)
+                                flag = TTY_PARITY;
+                        else if (disr & TXX9_SIDISR_UFER)
+                                flag = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto ignore_char;
+                if ((disr & up->port.ignore_status_mask) == 0) {
+                        tty_insert_flip_char(tty, ch, flag);
+                }
+                if ((disr & TXX9_SIDISR_UOER) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                }
+        ignore_char:
+                disr = sio_in(up, TXX9_SIDISR);
+        } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0));
+        tty_flip_buffer_push(tty);
+        *status = disr;
+}
+
+static inline void transmit_chars(struct uart_txx9_port *up)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int count;
+
+        if (up->port.x_char) {
+                sio_out(up, TXX9_SITFIFO, up->port.x_char);
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                serial_txx9_stop_tx(&up->port, 0);
+                return;
+        }
+
+        count = TXX9_SIO_TX_FIFO;
+        do {
+                sio_out(up, TXX9_SITFIFO, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        if (uart_circ_empty(xmit))
+                serial_txx9_stop_tx(&up->port, 0);
+}
+
+static irqreturn_t serial_txx9_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        int pass_counter = 0;
+        struct uart_txx9_port *up = dev_id;
+        unsigned int status;
+
+        while (1) {
+                spin_lock(&up->port.lock);
+                status = sio_in(up, TXX9_SIDISR);
+                if (!(sio_in(up, TXX9_SIDICR) & TXX9_SIDICR_TIE))
+                        status &= ~TXX9_SIDISR_TDIS;
+                if (!(status & (TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS |
+                                TXX9_SIDISR_TOUT))) {
+                        spin_unlock(&up->port.lock);
+                        break;
+                }
+
+                if (status & TXX9_SIDISR_RDIS)
+                        receive_chars(up, &status, regs);
+                if (status & TXX9_SIDISR_TDIS)
+                        transmit_chars(up);
+                /* Clear TX/RX Int. Status */
+                sio_mask(up, TXX9_SIDISR,
+                         TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS |
+                         TXX9_SIDISR_TOUT);
+                spin_unlock(&up->port.lock);
+
+                if (pass_counter++ > PASS_LIMIT)
+                        break;
+        }
+
+        return pass_counter ? IRQ_HANDLED : IRQ_NONE;
+}
+
+static unsigned int serial_txx9_tx_empty(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret = (sio_in(up, TXX9_SICISR) & TXX9_SICISR_TXALS) ? TIOCSER_TEMT : 0;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static unsigned int serial_txx9_get_mctrl(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret =  ((sio_in(up, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC) ? 0 : TIOCM_RTS)
+                | ((sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS) ? 0 : TIOCM_CTS);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static void serial_txx9_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (mctrl & TIOCM_RTS)
+                sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC);
+        else
+                sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void serial_txx9_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (break_state == -1)
+                sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_TBRK);
+        else
+                sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_TBRK);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int serial_txx9_startup(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+        int retval;
+
+        /*
+         * Clear the FIFO buffers and disable them.
+         * (they will be reeanbled in set_termios())
+         */
+        sio_set(up, TXX9_SIFCR,
+                TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE);
+        /* clear reset */
+        sio_mask(up, TXX9_SIFCR,
+                 TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE);
+        sio_out(up, TXX9_SIDICR, 0);
+
+        /*
+         * Clear the interrupt registers.
+         */
+        sio_out(up, TXX9_SIDISR, 0);
+
+        retval = request_irq(up->port.irq, serial_txx9_interrupt,
+                             SA_SHIRQ, "serial_txx9", up);
+        if (retval)
+                return retval;
+
+        /*
+         * Now, initialize the UART
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+        serial_txx9_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /* Enable RX/TX */
+        sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE);
+
+        /*
+         * Finally, enable interrupts.
+         */
+        sio_set(up, TXX9_SIDICR, TXX9_SIDICR_RIE);
+
+        return 0;
+}
+
+static void serial_txx9_shutdown(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+
+        /*
+         * Disable interrupts from this port
+         */
+        sio_out(up, TXX9_SIDICR, 0);    /* disable all intrs */
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        serial_txx9_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Disable break condition
+         */
+        sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_TBRK);
+
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+        if (up->port.cons && up->port.line == up->port.cons->index) {
+                free_irq(up->port.irq, up);
+                return;
+        }
+#endif
+        /* reset FIFOs */
+        sio_set(up, TXX9_SIFCR,
+                TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE);
+        /* clear reset */
+        sio_mask(up, TXX9_SIFCR,
+                 TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE);
+
+        /* Disable RX/TX */
+        sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE);
+
+        free_irq(up->port.irq, up);
+}
+
+static void
+serial_txx9_set_termios(struct uart_port *port, struct termios *termios,
+                       struct termios *old)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned int cval, fcr = 0;
+        unsigned long flags;
+        unsigned int baud, quot;
+
+        cval = sio_in(up, TXX9_SILCR);
+        /* byte size and parity */
+        cval &= ~TXX9_SILCR_UMODE_MASK;
+        switch (termios->c_cflag & CSIZE) {
+        case CS7:
+                cval |= TXX9_SILCR_UMODE_7BIT;
+                break;
+        default:
+        case CS5:       /* not supported */
+        case CS6:       /* not supported */
+        case CS8:
+                cval |= TXX9_SILCR_UMODE_8BIT;
+                break;
+        }
+
+        cval &= ~TXX9_SILCR_USBL_MASK;
+        if (termios->c_cflag & CSTOPB)
+                cval |= TXX9_SILCR_USBL_2BIT;
+        else
+                cval |= TXX9_SILCR_USBL_1BIT;
+        cval &= ~(TXX9_SILCR_UPEN | TXX9_SILCR_UEPS);
+        if (termios->c_cflag & PARENB)
+                cval |= TXX9_SILCR_UPEN;
+        if (!(termios->c_cflag & PARODD))
+                cval |= TXX9_SILCR_UEPS;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16/2);
+        quot = uart_get_divisor(port, baud);
+
+        /* Set up FIFOs */
+        /* TX Int by FIFO Empty, RX Int by Receiving 1 char. */
+        fcr = TXX9_SIFCR_TDIL_MAX | TXX9_SIFCR_RDIL_1;
+
+        /*
+         * Ok, we're now changing the port state.  Do it with
+         * interrupts disabled.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        up->port.read_status_mask = TXX9_SIDISR_UOER |
+                TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS;
+        if (termios->c_iflag & INPCK)
+                up->port.read_status_mask |= TXX9_SIDISR_UFER | TXX9_SIDISR_UPER;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= TXX9_SIDISR_UBRK;
+
+        /*
+         * Characteres to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                up->port.ignore_status_mask |= TXX9_SIDISR_UPER | TXX9_SIDISR_UFER;
+        if (termios->c_iflag & IGNBRK) {
+                up->port.ignore_status_mask |= TXX9_SIDISR_UBRK;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        up->port.ignore_status_mask |= TXX9_SIDISR_UOER;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((termios->c_cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= TXX9_SIDISR_RDIS;
+
+        /* CTS flow control flag */
+        if ((termios->c_cflag & CRTSCTS) &&
+            (up->port.flags & UPF_TXX9_HAVE_CTS_LINE)) {
+                sio_set(up, TXX9_SIFLCR,
+                        TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES);
+        } else {
+                sio_mask(up, TXX9_SIFLCR,
+                         TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES);
+        }
+
+        sio_out(up, TXX9_SILCR, cval);
+        sio_quot_set(up, quot);
+        sio_out(up, TXX9_SIFCR, fcr);
+
+        serial_txx9_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void
+serial_txx9_pm(struct uart_port *port, unsigned int state,
+              unsigned int oldstate)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        if (state) {
+                /* sleep */
+
+                if (up->pm)
+                        up->pm(port, state, oldstate);
+        } else {
+                /* wake */
+
+                if (up->pm)
+                        up->pm(port, state, oldstate);
+        }
+}
+
+static int serial_txx9_request_resource(struct uart_txx9_port *up)
+{
+        unsigned int size = TXX9_REGION_SIZE;
+        int ret = 0;
+
+        switch (up->port.iotype) {
+        default:
+                if (!up->port.mapbase)
+                        break;
+
+                if (!request_mem_region(up->port.mapbase, size, "serial_txx9")) {
+                        ret = -EBUSY;
+                        break;
+                }
+
+                if (up->port.flags & UPF_IOREMAP) {
+                        up->port.membase = ioremap(up->port.mapbase, size);
+                        if (!up->port.membase) {
+                                release_mem_region(up->port.mapbase, size);
+                                ret = -ENOMEM;
+                        }
+                }
+                break;
+
+        case UPIO_PORT:
+                if (!request_region(up->port.iobase, size, "serial_txx9"))
+                        ret = -EBUSY;
+                break;
+        }
+        return ret;
+}
+
+static void serial_txx9_release_resource(struct uart_txx9_port *up)
+{
+        unsigned int size = TXX9_REGION_SIZE;
+
+        switch (up->port.iotype) {
+        default:
+                if (!up->port.mapbase)
+                        break;
+
+                if (up->port.flags & UPF_IOREMAP) {
+                        iounmap(up->port.membase);
+                        up->port.membase = NULL;
+                }
+
+                release_mem_region(up->port.mapbase, size);
+                break;
+
+        case UPIO_PORT:
+                release_region(up->port.iobase, size);
+                break;
+        }
+}
+
+static void serial_txx9_release_port(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        serial_txx9_release_resource(up);
+}
+
+static int serial_txx9_request_port(struct uart_port *port)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        return serial_txx9_request_resource(up);
+}
+
+static void serial_txx9_config_port(struct uart_port *port, int uflags)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+        unsigned long flags;
+        int ret;
+
+        /*
+         * Find the region that we can probe for.  This in turn
+         * tells us whether we can probe for the type of port.
+         */
+        ret = serial_txx9_request_resource(up);
+        if (ret < 0)
+                return;
+        port->type = PORT_TXX9;
+        up->port.fifosize = TXX9_SIO_TX_FIFO;
+
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+        if (up->port.line == up->port.cons->index)
+                return;
+#endif
+        spin_lock_irqsave(&up->port.lock, flags);
+        /*
+         * Reset the UART.
+         */
+        sio_out(up, TXX9_SIFCR, TXX9_SIFCR_SWRST);
+#ifdef CONFIG_CPU_TX49XX
+        /* TX4925 BUG WORKAROUND.  Accessing SIOC register
+         * immediately after soft reset causes bus error. */
+        iob();
+        udelay(1);
+#endif
+        while (sio_in(up, TXX9_SIFCR) & TXX9_SIFCR_SWRST)
+                ;
+        /* TX Int by FIFO Empty, RX Int by Receiving 1 char. */
+        sio_set(up, TXX9_SIFCR,
+                TXX9_SIFCR_TDIL_MAX | TXX9_SIFCR_RDIL_1);
+        /* initial settings */
+        sio_out(up, TXX9_SILCR,
+                TXX9_SILCR_UMODE_8BIT | TXX9_SILCR_USBL_1BIT |
+                ((up->port.flags & UPF_TXX9_USE_SCLK) ?
+                 TXX9_SILCR_SCS_SCLK_BG : TXX9_SILCR_SCS_IMCLK_BG));
+        sio_quot_set(up, uart_get_divisor(port, 9600));
+        sio_out(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSTL_MAX /* 15 */);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int
+serial_txx9_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        if (ser->irq < 0 ||
+            ser->baud_base < 9600 || ser->type != PORT_TXX9)
+                return -EINVAL;
+        return 0;
+}
+
+static const char *
+serial_txx9_type(struct uart_port *port)
+{
+        return "txx9";
+}
+
+static struct uart_ops serial_txx9_pops = {
+        .tx_empty       = serial_txx9_tx_empty,
+        .set_mctrl      = serial_txx9_set_mctrl,
+        .get_mctrl      = serial_txx9_get_mctrl,
+        .stop_tx        = serial_txx9_stop_tx,
+        .start_tx       = serial_txx9_start_tx,
+        .stop_rx        = serial_txx9_stop_rx,
+        .enable_ms      = serial_txx9_enable_ms,
+        .break_ctl      = serial_txx9_break_ctl,
+        .startup        = serial_txx9_startup,
+        .shutdown       = serial_txx9_shutdown,
+        .set_termios    = serial_txx9_set_termios,
+        .pm             = serial_txx9_pm,
+        .type           = serial_txx9_type,
+        .release_port   = serial_txx9_release_port,
+        .request_port   = serial_txx9_request_port,
+        .config_port    = serial_txx9_config_port,
+        .verify_port    = serial_txx9_verify_port,
+};
+
+static struct uart_txx9_port serial_txx9_ports[UART_NR];
+
+static void __init serial_txx9_register_ports(struct uart_driver *drv)
+{
+        int i;
+
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_txx9_port *up = &serial_txx9_ports[i];
+
+                up->port.line = i;
+                up->port.ops = &serial_txx9_pops;
+                uart_add_one_port(drv, &up->port);
+        }
+}
+
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static inline void wait_for_xmitr(struct uart_txx9_port *up)
+{
+        unsigned int tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        while (--tmout &&
+               !(sio_in(up, TXX9_SICISR) & TXX9_SICISR_TXALS))
+                udelay(1);
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & UPF_CONS_FLOW) {
+                tmout = 1000000;
+                while (--tmout &&
+                       (sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS))
+                        udelay(1);
+        }
+}
+
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ */
+static void
+serial_txx9_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct uart_txx9_port *up = &serial_txx9_ports[co->index];
+        unsigned int ier, flcr;
+        int i;
+
+        /*
+         *      First save the UER then disable the interrupts
+         */
+        ier = sio_in(up, TXX9_SIDICR);
+        sio_out(up, TXX9_SIDICR, 0);
+        /*
+         *      Disable flow-control if enabled (and unnecessary)
+         */
+        flcr = sio_in(up, TXX9_SIFLCR);
+        if (!(up->port.flags & UPF_CONS_FLOW) && (flcr & TXX9_SIFLCR_TES))
+                sio_out(up, TXX9_SIFLCR, flcr & ~TXX9_SIFLCR_TES);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++, s++) {
+                wait_for_xmitr(up);
+
+                /*
+                 *      Send the character out.
+                 *      If a LF, also do CR...
+                 */
+                sio_out(up, TXX9_SITFIFO, *s);
+                if (*s == 10) {
+                        wait_for_xmitr(up);
+                        sio_out(up, TXX9_SITFIFO, 13);
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(up);
+        sio_out(up, TXX9_SIFLCR, flcr);
+        sio_out(up, TXX9_SIDICR, ier);
+}
+
+static int serial_txx9_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        struct uart_txx9_port *up;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        up = &serial_txx9_ports[co->index];
+        port = &up->port;
+        if (!port->ops)
+                return -ENODEV;
+
+        /*
+         * Temporary fix.
+         */
+        spin_lock_init(&port->lock);
+
+        /*
+         *      Disable UART interrupts, set DTR and RTS high
+         *      and set speed.
+         */
+        sio_out(up, TXX9_SIDICR, 0);
+        /* initial settings */
+        sio_out(up, TXX9_SILCR,
+                TXX9_SILCR_UMODE_8BIT | TXX9_SILCR_USBL_1BIT |
+                ((port->flags & UPF_TXX9_USE_SCLK) ?
+                 TXX9_SILCR_SCS_SCLK_BG : TXX9_SILCR_SCS_IMCLK_BG));
+        sio_out(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSTL_MAX /* 15 */);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static struct uart_driver serial_txx9_reg;
+static struct console serial_txx9_console = {
+        .name           = TXX9_TTY_NAME,
+        .write          = serial_txx9_console_write,
+        .device         = uart_console_device,
+        .setup          = serial_txx9_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &serial_txx9_reg,
+};
+
+static int __init serial_txx9_console_init(void)
+{
+        register_console(&serial_txx9_console);
+        return 0;
+}
+console_initcall(serial_txx9_console_init);
+
+static int __init serial_txx9_late_console_init(void)
+{
+        if (!(serial_txx9_console.flags & CON_ENABLED))
+                register_console(&serial_txx9_console);
+        return 0;
+}
+late_initcall(serial_txx9_late_console_init);
+
+#define SERIAL_TXX9_CONSOLE     &serial_txx9_console
+#else
+#define SERIAL_TXX9_CONSOLE     NULL
+#endif
+
+static struct uart_driver serial_txx9_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial_txx9",
+        .devfs_name             = TXX9_TTY_DEVFS_NAME,
+        .dev_name               = TXX9_TTY_NAME,
+        .major                  = TXX9_TTY_MAJOR,
+        .minor                  = TXX9_TTY_MINOR_START,
+        .nr                     = UART_NR,
+        .cons                   = SERIAL_TXX9_CONSOLE,
+};
+
+int __init early_serial_txx9_setup(struct uart_port *port)
+{
+        if (port->line >= ARRAY_SIZE(serial_txx9_ports))
+                return -ENODEV;
+
+        serial_txx9_ports[port->line].port = *port;
+        serial_txx9_ports[port->line].port.ops = &serial_txx9_pops;
+        serial_txx9_ports[port->line].port.flags |= UPF_BOOT_AUTOCONF;
+        return 0;
+}
+
+#ifdef ENABLE_SERIAL_TXX9_PCI
+/**
+ *      serial_txx9_suspend_port - suspend one serial port
+ *      @line:  serial line number
+ *      @level: the level of port suspension, as per uart_suspend_port
+ *
+ *      Suspend one serial port.
+ */
+static void serial_txx9_suspend_port(int line)
+{
+        uart_suspend_port(&serial_txx9_reg, &serial_txx9_ports[line].port);
+}
+
+/**
+ *      serial_txx9_resume_port - resume one serial port
+ *      @line:  serial line number
+ *      @level: the level of port resumption, as per uart_resume_port
+ *
+ *      Resume one serial port.
+ */
+static void serial_txx9_resume_port(int line)
+{
+        uart_resume_port(&serial_txx9_reg, &serial_txx9_ports[line].port);
+}
+
+/*
+ * Probe one serial board.  Unfortunately, there is no rhyme nor reason
+ * to the arrangement of serial ports on a PCI card.
+ */
+static int __devinit
+pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
+{
+        struct uart_port port;
+        int line;
+        int rc;
+
+        rc = pci_enable_device(dev);
+        if (rc)
+                return rc;
+
+        memset(&port, 0, sizeof(port));
+        port.ops = &serial_txx9_pops;
+        port.flags |= UPF_BOOT_AUTOCONF; /* uart_ops.config_port will be called */
+        port.flags |= UPF_TXX9_HAVE_CTS_LINE;
+        port.uartclk = 66670000;
+        port.irq = dev->irq;
+        port.iotype = UPIO_PORT;
+        port.iobase = pci_resource_start(dev, 1);
+        line = uart_register_port(&serial_txx9_reg, &port);
+        if (line < 0) {
+                printk(KERN_WARNING "Couldn't register serial port %s: %d\n", pci_name(dev), line);
+        }
+        pci_set_drvdata(dev, (void *)(long)line);
+
+        return 0;
+}
+
+static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev)
+{
+        int line = (int)(long)pci_get_drvdata(dev);
+
+        pci_set_drvdata(dev, NULL);
+
+        if (line) {
+                uart_unregister_port(&serial_txx9_reg, line);
+                pci_disable_device(dev);
+        }
+}
+
+static int pciserial_txx9_suspend_one(struct pci_dev *dev, u32 state)
+{
+        int line = (int)(long)pci_get_drvdata(dev);
+
+        if (line)
+                serial_txx9_suspend_port(line);
+        return 0;
+}
+
+static int pciserial_txx9_resume_one(struct pci_dev *dev)
+{
+        int line = (int)(long)pci_get_drvdata(dev);
+
+        if (line)
+                serial_txx9_resume_port(line);
+        return 0;
+}
+
+static struct pci_device_id serial_txx9_pci_tbl[] = {
+        {       PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC,
+                PCI_ANY_ID, PCI_ANY_ID,
+                0, 0, 0 },
+        { 0, }
+};
+
+static struct pci_driver serial_txx9_pci_driver = {
+        .name           = "serial_txx9",
+        .probe          = pciserial_txx9_init_one,
+        .remove         = __devexit_p(pciserial_txx9_remove_one),
+        .suspend        = pciserial_txx9_suspend_one,
+        .resume         = pciserial_txx9_resume_one,
+        .id_table       = serial_txx9_pci_tbl,
+};
+
+MODULE_DEVICE_TABLE(pci, serial_txx9_pci_tbl);
+#endif /* ENABLE_SERIAL_TXX9_PCI */
+
+static int __init serial_txx9_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "%s version %s\n", serial_name, serial_version);
+
+        ret = uart_register_driver(&serial_txx9_reg);
+        if (ret >= 0) {
+                serial_txx9_register_ports(&serial_txx9_reg);
+
+#ifdef ENABLE_SERIAL_TXX9_PCI
+                ret = pci_module_init(&serial_txx9_pci_driver);
+#endif
+        }
+        return ret;
+}
+
+static void __exit serial_txx9_exit(void)
+{
+        int i;
+
+#ifdef ENABLE_SERIAL_TXX9_PCI
+        pci_unregister_driver(&serial_txx9_pci_driver);
+#endif
+        for (i = 0; i < UART_NR; i++)
+                uart_remove_one_port(&serial_txx9_reg, &serial_txx9_ports[i].port);
+
+        uart_unregister_driver(&serial_txx9_reg);
+}
+
+module_init(serial_txx9_init);
+module_exit(serial_txx9_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("TX39/49 serial driver");
+
+MODULE_ALIAS_CHARDEV_MAJOR(TXX9_TTY_MAJOR);
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
new file mode 100644
index 000000000000..ad5b776d779b
--- /dev/null
+++ b/drivers/serial/sh-sci.c
@@ -0,0 +1,1692 @@
+/*
+ * drivers/serial/sh-sci.c
+ *
+ * SuperH on-chip serial module support.  (SCI with no FIFO / with FIFO)
+ *
+ *  Copyright (C) 2002, 2003, 2004  Paul Mundt
+ *
+ * based off of the old drivers/char/sh-sci.c by:
+ *
+ *   Copyright (C) 1999, 2000  Niibe Yutaka
+ *   Copyright (C) 2000  Sugioka Toshinobu
+ *   Modified to support multiple serial ports. Stuart Menefy (May 2000).
+ *   Modified to support SecureEdge. David McCullough (2002)
+ *   Modified to support SH7300 SCIF. Takashi Kusuda (Jun 2003).
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#undef DEBUG
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/sysrq.h>
+#include <linux/fcntl.h>
+#include <linux/ptrace.h>
+#include <linux/ioport.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/console.h>
+#include <linux/bitops.h>
+
+#ifdef CONFIG_CPU_FREQ
+#include <linux/notifier.h>
+#include <linux/cpufreq.h>
+#endif
+
+#include <asm/system.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+
+#include <linux/generic_serial.h>
+
+#ifdef CONFIG_SH_STANDARD_BIOS
+#include <asm/sh_bios.h>
+#endif
+
+#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include "sh-sci.h"
+
+#ifdef CONFIG_SH_KGDB
+#include <asm/kgdb.h>
+
+static int kgdb_get_char(struct sci_port *port);
+static void kgdb_put_char(struct sci_port *port, char c);
+static void kgdb_handle_error(struct sci_port *port);
+static struct sci_port *kgdb_sci_port;
+#endif /* CONFIG_SH_KGDB */
+
+#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
+static struct sci_port *serial_console_port = 0;
+#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
+
+/* Function prototypes */
+static void sci_stop_tx(struct uart_port *port, unsigned int tty_stop);
+static void sci_start_tx(struct uart_port *port, unsigned int tty_start);
+static void sci_start_rx(struct uart_port *port, unsigned int tty_start);
+static void sci_stop_rx(struct uart_port *port);
+static int sci_request_irq(struct sci_port *port);
+static void sci_free_irq(struct sci_port *port);
+
+static struct sci_port sci_ports[SCI_NPORTS];
+static struct uart_driver sci_uart_driver;
+
+#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
+
+static void handle_error(struct uart_port *port)
+{                               /* Clear error flags */
+        sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
+}
+
+static int get_char(struct uart_port *port)
+{
+        unsigned long flags;
+        unsigned short status;
+        int c;
+
+        local_irq_save(flags);
+        do {
+                status = sci_in(port, SCxSR);
+                if (status & SCxSR_ERRORS(port)) {
+                        handle_error(port);
+                        continue;
+                }
+        } while (!(status & SCxSR_RDxF(port)));
+        c = sci_in(port, SCxRDR);
+        sci_in(port, SCxSR);            /* Dummy read */
+        sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+        local_irq_restore(flags);
+
+        return c;
+}
+
+/* Taken from sh-stub.c of GDB 4.18 */
+static const char hexchars[] = "0123456789abcdef";
+
+static __inline__ char highhex(int  x)
+{
+        return hexchars[(x >> 4) & 0xf];
+}
+
+static __inline__ char lowhex(int  x)
+{
+        return hexchars[x & 0xf];
+}
+
+#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
+
+/*
+ * Send the packet in buffer.  The host gets one chance to read it.
+ * This routine does not wait for a positive acknowledge.
+ */
+
+#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
+static void put_char(struct uart_port *port, char c)
+{
+        unsigned long flags;
+        unsigned short status;
+
+        local_irq_save(flags);
+
+        do {
+                status = sci_in(port, SCxSR);
+        } while (!(status & SCxSR_TDxE(port)));
+
+        sci_out(port, SCxTDR, c);
+        sci_in(port, SCxSR);            /* Dummy read */
+        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
+
+        local_irq_restore(flags);
+}
+
+static void put_string(struct sci_port *sci_port, const char *buffer, int count)
+{
+        struct uart_port *port = &sci_port->port;
+        const unsigned char *p = buffer;
+        int i;
+
+#if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
+        int checksum;
+        int usegdb=0;
+
+#ifdef CONFIG_SH_STANDARD_BIOS
+        /* This call only does a trap the first time it is
+         * called, and so is safe to do here unconditionally
+         */
+        usegdb |= sh_bios_in_gdb_mode();
+#endif
+#ifdef CONFIG_SH_KGDB
+        usegdb |= (kgdb_in_gdb_mode && (port == kgdb_sci_port));
+#endif
+
+        if (usegdb) {
+            /*  $<packet info>#<checksum>. */
+            do {
+                unsigned char c;
+                put_char(port, '$');
+                put_char(port, 'O'); /* 'O'utput to console */
+                checksum = 'O';
+
+                for (i=0; i<count; i++) { /* Don't use run length encoding */
+                        int h, l;
+
+                        c = *p++;
+                        h = highhex(c);
+                        l = lowhex(c);
+                        put_char(port, h);
+                        put_char(port, l);
+                        checksum += h + l;
+                }
+                put_char(port, '#');
+                put_char(port, highhex(checksum));
+                put_char(port, lowhex(checksum));
+            } while  (get_char(port) != '+');
+        } else
+#endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
+        for (i=0; i<count; i++) {
+                if (*p == 10)
+                        put_char(port, '\r');
+                put_char(port, *p++);
+        }
+}
+#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
+
+
+#ifdef CONFIG_SH_KGDB
+
+/* Is the SCI ready, ie is there a char waiting? */
+static int kgdb_is_char_ready(struct sci_port *port)
+{
+        unsigned short status = sci_in(port, SCxSR);
+
+        if (status & (SCxSR_ERRORS(port) | SCxSR_BRK(port)))
+                kgdb_handle_error(port);
+
+        return (status & SCxSR_RDxF(port));
+}
+
+/* Write a char */
+static void kgdb_put_char(struct sci_port *port, char c)
+{
+        unsigned short status;
+
+        do
+                status = sci_in(port, SCxSR);
+        while (!(status & SCxSR_TDxE(port)));
+
+        sci_out(port, SCxTDR, c);
+        sci_in(port, SCxSR);    /* Dummy read */
+        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
+}
+
+/* Get a char if there is one, else ret -1 */
+static int kgdb_get_char(struct sci_port *port)
+{
+        int c;
+
+        if (kgdb_is_char_ready(port) == 0)
+                c = -1;
+        else {
+                c = sci_in(port, SCxRDR);
+                sci_in(port, SCxSR);    /* Dummy read */
+                sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+        }
+
+        return c;
+}
+
+/* Called from kgdbstub.c to get a character, i.e. is blocking */
+static int kgdb_sci_getchar(void)
+{
+        volatile int c;
+
+        /* Keep trying to read a character, this could be neater */
+        while ((c = kgdb_get_char(kgdb_sci_port)) < 0);
+
+        return c;
+}
+
+/* Called from kgdbstub.c to put a character, just a wrapper */
+static void kgdb_sci_putchar(int c)
+{
+
+        kgdb_put_char(kgdb_sci_port, c);
+}
+
+/* Clear any errors on the SCI */
+static void kgdb_handle_error(struct sci_port *port)
+{
+        sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));  /* Clear error flags */
+}
+
+/* Breakpoint if there's a break sent on the serial port */
+static void kgdb_break_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct sci_port *port = ptr;
+        unsigned short status = sci_in(port, SCxSR);
+
+        if (status & SCxSR_BRK(port)) {
+
+                /* Break into the debugger if a break is detected */
+                BREAKPOINT();
+
+                /* Clear */
+                sci_out(port, SCxSR, SCxSR_BREAK_CLEAR(port));
+        }
+}
+
+#endif /* CONFIG_SH_KGDB */
+
+#if defined(__H8300S__)
+enum { sci_disable, sci_enable };
+
+static void h8300_sci_enable(struct uart_port* port, unsigned int ctrl)
+{
+        volatile unsigned char *mstpcrl=(volatile unsigned char *)MSTPCRL;
+        int ch = (port->mapbase  - SMR0) >> 3;
+        unsigned char mask = 1 << (ch+1);
+
+        if (ctrl == sci_disable) {
+                *mstpcrl |= mask;
+        } else {
+                *mstpcrl &= ~mask;
+        }
+}
+#endif
+
+#if defined(SCI_ONLY) || defined(SCI_AND_SCIF)
+#if defined(__H8300H__) || defined(__H8300S__)
+static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag)
+{
+        int ch = (port->mapbase - SMR0) >> 3;
+
+        /* set DDR regs */
+        H8300_GPIO_DDR(h8300_sci_pins[ch].port,h8300_sci_pins[ch].rx,H8300_GPIO_INPUT);
+        H8300_GPIO_DDR(h8300_sci_pins[ch].port,h8300_sci_pins[ch].tx,H8300_GPIO_OUTPUT);
+        /* tx mark output*/
+        H8300_SCI_DR(ch) |= h8300_sci_pins[ch].tx;
+}
+#else
+static void sci_init_pins_sci(struct uart_port *port, unsigned int cflag)
+{
+}
+#endif
+#endif
+
+#if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
+#if defined(CONFIG_CPU_SH3)
+/* For SH7705, SH7707, SH7709, SH7709A, SH7729, SH7300*/
+static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
+{
+        unsigned int fcr_val = 0;
+#if !defined(CONFIG_CPU_SUBTYPE_SH7300) /* SH7300 doesn't use RTS/CTS */
+        {
+                unsigned short data;
+
+                /* We need to set SCPCR to enable RTS/CTS */
+                data = ctrl_inw(SCPCR);
+                /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/
+                ctrl_outw(data&0x0fcf, SCPCR);
+        }
+        if (cflag & CRTSCTS)
+                fcr_val |= SCFCR_MCE;
+        else {
+                unsigned short data;
+
+                /* We need to set SCPCR to enable RTS/CTS */
+                data = ctrl_inw(SCPCR);
+                /* Clear out SCP7MD1,0, SCP4MD1,0,
+                   Set SCP6MD1,0 = {01} (output)  */
+                ctrl_outw((data&0x0fcf)|0x1000, SCPCR);
+
+                data = ctrl_inb(SCPDR);
+                /* Set /RTS2 (bit6) = 0 */
+                ctrl_outb(data&0xbf, SCPDR);
+        }
+#endif
+        sci_out(port, SCFCR, fcr_val);
+}
+
+static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
+{
+        unsigned int fcr_val = 0;
+
+        if (cflag & CRTSCTS)
+                fcr_val |= SCFCR_MCE;
+
+        sci_out(port, SCFCR, fcr_val);
+}
+
+#else
+
+/* For SH7750 */
+static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
+{
+        unsigned int fcr_val = 0;
+
+        if (cflag & CRTSCTS) {
+                fcr_val |= SCFCR_MCE;
+        } else {
+                ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */
+        }
+        sci_out(port, SCFCR, fcr_val);
+}
+
+#endif
+#endif /* SCIF_ONLY || SCI_AND_SCIF */
+
+/* ********************************************************************** *
+ *                   the interrupt related routines                       *
+ * ********************************************************************** */
+
+static void sci_transmit_chars(struct uart_port *port)
+{
+        struct circ_buf *xmit = &port->info->xmit;
+        unsigned int stopped = uart_tx_stopped(port);
+        unsigned long flags;
+        unsigned short status;
+        unsigned short ctrl;
+        int count, txroom;
+
+        status = sci_in(port, SCxSR);
+        if (!(status & SCxSR_TDxE(port))) {
+                local_irq_save(flags);
+                ctrl = sci_in(port, SCSCR);
+                if (uart_circ_empty(xmit)) {
+                        ctrl &= ~SCI_CTRL_FLAGS_TIE;
+                } else {
+                        ctrl |= SCI_CTRL_FLAGS_TIE;
+                }
+                sci_out(port, SCSCR, ctrl);
+                local_irq_restore(flags);
+                return;
+        }
+
+#if !defined(SCI_ONLY)
+        if (port->type == PORT_SCIF) {
+                txroom = SCIF_TXROOM_MAX - (sci_in(port, SCFDR)>>8);
+        } else {
+                txroom = (sci_in(port, SCxSR) & SCI_TDRE)?1:0;
+        }
+#else
+        txroom = (sci_in(port, SCxSR) & SCI_TDRE)?1:0;
+#endif
+
+        count = txroom;
+
+        do {
+                unsigned char c;
+
+                if (port->x_char) {
+                        c = port->x_char;
+                        port->x_char = 0;
+                } else if (!uart_circ_empty(xmit) && !stopped) {
+                        c = xmit->buf[xmit->tail];
+                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                } else {
+                        break;
+                }
+
+                sci_out(port, SCxTDR, c);
+
+                port->icount.tx++;
+        } while (--count > 0);
+
+        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+        if (uart_circ_empty(xmit)) {
+                sci_stop_tx(port, 0);
+        } else {
+                local_irq_save(flags);
+                ctrl = sci_in(port, SCSCR);
+
+#if !defined(SCI_ONLY)
+                if (port->type == PORT_SCIF) {
+                        sci_in(port, SCxSR); /* Dummy read */
+                        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
+                }
+#endif
+
+                ctrl |= SCI_CTRL_FLAGS_TIE;
+                sci_out(port, SCSCR, ctrl);
+                local_irq_restore(flags);
+        }
+}
+
+/* On SH3, SCIF may read end-of-break as a space->mark char */
+#define STEPFN(c)  ({int __c=(c); (((__c-1)|(__c)) == -1); })
+
+static inline void sci_receive_chars(struct uart_port *port,
+                                     struct pt_regs *regs)
+{
+        struct tty_struct *tty = port->info->tty;
+        int i, count, copied = 0;
+        unsigned short status;
+
+        status = sci_in(port, SCxSR);
+        if (!(status & SCxSR_RDxF(port)))
+                return;
+
+        while (1) {
+#if !defined(SCI_ONLY)
+                if (port->type == PORT_SCIF) {
+                        count = sci_in(port, SCFDR)&SCIF_RFDC_MASK ;
+                } else {
+                        count = (sci_in(port, SCxSR)&SCxSR_RDxF(port))?1:0;
+                }
+#else
+                count = (sci_in(port, SCxSR)&SCxSR_RDxF(port))?1:0;
+#endif
+
+                /* Don't copy more bytes than there is room for in the buffer */
+                if (tty->flip.count + count > TTY_FLIPBUF_SIZE)
+                        count = TTY_FLIPBUF_SIZE - tty->flip.count;
+
+                /* If for any reason we can't copy more data, we're done! */
+                if (count == 0)
+                        break;
+
+                if (port->type == PORT_SCI) {
+                        char c = sci_in(port, SCxRDR);
+                       if(((struct sci_port *)port)->break_flag
+                            || uart_handle_sysrq_char(port, c, regs)) {
+                                count = 0;
+                        } else {
+                            tty->flip.char_buf_ptr[0] = c;
+                            tty->flip.flag_buf_ptr[0] = TTY_NORMAL;
+                        }
+                } else {
+                        for (i=0; i<count; i++) {
+                                char c = sci_in(port, SCxRDR);
+                                status = sci_in(port, SCxSR);
+#if defined(CONFIG_CPU_SH3)
+                                /* Skip "chars" during break */
+                                if (((struct sci_port *)port)->break_flag) {
+                                        if ((c == 0) &&
+                                            (status & SCxSR_FER(port))) {
+                                                count--; i--;
+                                                continue;
+                                        }
+                                        /* Nonzero => end-of-break */
+                                        pr_debug("scif: debounce<%02x>\n", c);
+                                        ((struct sci_port *)port)->break_flag = 0;
+                                        if (STEPFN(c)) {
+                                                count--; i--;
+                                                continue;
+                                        }
+                                }
+#endif /* CONFIG_CPU_SH3 */
+                                if (uart_handle_sysrq_char(port, c, regs)) {
+                                        count--; i--;
+                                        continue;
+                                }
+
+                                /* Store data and status */
+                                tty->flip.char_buf_ptr[i] = c;
+                                if (status&SCxSR_FER(port)) {
+                                        tty->flip.flag_buf_ptr[i] = TTY_FRAME;
+                                        pr_debug("sci: frame error\n");
+                                } else if (status&SCxSR_PER(port)) {
+                                        tty->flip.flag_buf_ptr[i] = TTY_PARITY;
+                                        pr_debug("sci: parity error\n");
+                                } else {
+                                        tty->flip.flag_buf_ptr[i] = TTY_NORMAL;
+                                }
+                        }
+                }
+
+                sci_in(port, SCxSR); /* dummy read */
+                sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+
+                /* Update the kernel buffer end */
+                tty->flip.count += count;
+                tty->flip.char_buf_ptr += count;
+                tty->flip.flag_buf_ptr += count;
+                copied += count;
+                port->icount.rx += count;
+        }
+
+        if (copied) {
+                /* Tell the rest of the system the news. New characters! */
+                tty_flip_buffer_push(tty);
+        } else {
+                sci_in(port, SCxSR); /* dummy read */
+                sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+        }
+}
+
+#define SCI_BREAK_JIFFIES (HZ/20)
+/* The sci generates interrupts during the break,
+ * 1 per millisecond or so during the break period, for 9600 baud.
+ * So dont bother disabling interrupts.
+ * But dont want more than 1 break event.
+ * Use a kernel timer to periodically poll the rx line until
+ * the break is finished.
+ */
+static void sci_schedule_break_timer(struct sci_port *port)
+{
+        port->break_timer.expires = jiffies + SCI_BREAK_JIFFIES;
+        add_timer(&port->break_timer);
+}
+/* Ensure that two consecutive samples find the break over. */
+static void sci_break_timer(unsigned long data)
+{
+    struct sci_port * port = (struct sci_port *)data;
+        if(sci_rxd_in(&port->port) == 0) {
+                port->break_flag = 1;
+            sci_schedule_break_timer(port);
+        } else if(port->break_flag == 1){
+                /* break is over. */
+                port->break_flag = 2;
+            sci_schedule_break_timer(port);
+        } else port->break_flag = 0;
+}
+
+static inline int sci_handle_errors(struct uart_port *port)
+{
+        int copied = 0;
+        unsigned short status = sci_in(port, SCxSR);
+        struct tty_struct *tty = port->info->tty;
+
+        if (status&SCxSR_ORER(port) && tty->flip.count<TTY_FLIPBUF_SIZE) {
+                /* overrun error */
+                copied++;
+                *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                pr_debug("sci: overrun error\n");
+        }
+
+        if (status&SCxSR_FER(port) && tty->flip.count<TTY_FLIPBUF_SIZE) {
+                if (sci_rxd_in(port) == 0) {
+                        /* Notify of BREAK */
+                        struct sci_port * sci_port = (struct sci_port *)port;
+                       if(!sci_port->break_flag) {
+                                sci_port->break_flag = 1;
+                               sci_schedule_break_timer((struct sci_port *)port);
+                                /* Do sysrq handling. */
+                                if(uart_handle_break(port)) {
+                                        return 0;
+                                }
+                                pr_debug("sci: BREAK detected\n");
+                                copied++;
+                                *tty->flip.flag_buf_ptr++ = TTY_BREAK;
+                       }
+                }
+                else {
+                        /* frame error */
+                        copied++;
+                        *tty->flip.flag_buf_ptr++ = TTY_FRAME;
+                        pr_debug("sci: frame error\n");
+                }
+        }
+
+        if (status&SCxSR_PER(port) && tty->flip.count<TTY_FLIPBUF_SIZE) {
+                /* parity error */
+                copied++;
+                *tty->flip.flag_buf_ptr++ = TTY_PARITY;
+                pr_debug("sci: parity error\n");
+        }
+
+        if (copied) {
+                tty->flip.count += copied;
+                tty_flip_buffer_push(tty);
+        }
+
+        return copied;
+}
+
+static inline int sci_handle_breaks(struct uart_port *port)
+{
+        int copied = 0;
+        unsigned short status = sci_in(port, SCxSR);
+        struct tty_struct *tty = port->info->tty;
+        struct sci_port *s = &sci_ports[port->line];
+
+        if (!s->break_flag && status & SCxSR_BRK(port) &&
+            tty->flip.count < TTY_FLIPBUF_SIZE) {
+#if defined(CONFIG_CPU_SH3)
+                /* Debounce break */
+                s->break_flag = 1;
+#endif
+                /* Notify of BREAK */
+                copied++;
+                *tty->flip.flag_buf_ptr++ = TTY_BREAK;
+                pr_debug("sci: BREAK detected\n");
+        }
+
+#if defined(SCIF_ORER)
+        /* XXX: Handle SCIF overrun error */
+        if (port->type == PORT_SCIF && (sci_in(port, SCLSR) & SCIF_ORER) != 0) {
+                sci_out(port, SCLSR, 0);
+                if(tty->flip.count<TTY_FLIPBUF_SIZE) {
+                        copied++;
+                        *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                        pr_debug("sci: overrun error\n");
+                }
+        }
+#endif
+
+        if (copied) {
+                tty->flip.count += copied;
+                tty_flip_buffer_push(tty);
+        }
+
+        return copied;
+}
+
+static irqreturn_t sci_rx_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct uart_port *port = ptr;
+
+        /* I think sci_receive_chars has to be called irrespective
+         * of whether the I_IXOFF is set, otherwise, how is the interrupt
+         * to be disabled?
+         */
+        sci_receive_chars(port, regs);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t sci_tx_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct uart_port *port = ptr;
+
+        sci_transmit_chars(port);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t sci_er_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct uart_port *port = ptr;
+
+        /* Handle errors */
+        if (port->type == PORT_SCI) {
+                if (sci_handle_errors(port)) {
+                        /* discard character in rx buffer */
+                        sci_in(port, SCxSR);
+                        sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+                }
+        } else {
+#if defined(SCIF_ORER)
+                if((sci_in(port, SCLSR) & SCIF_ORER) != 0) {
+                        struct tty_struct *tty = port->info->tty;
+
+                        sci_out(port, SCLSR, 0);
+                        if(tty->flip.count<TTY_FLIPBUF_SIZE) {
+                                *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                                tty->flip.count++;
+                                tty_flip_buffer_push(tty);
+                                pr_debug("scif: overrun error\n");
+                        }
+                }
+#endif
+                sci_rx_interrupt(irq, ptr, regs);
+        }
+
+        sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
+
+        /* Kick the transmission */
+        sci_tx_interrupt(irq, ptr, regs);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t sci_br_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct uart_port *port = ptr;
+
+        /* Handle BREAKs */
+        sci_handle_breaks(port);
+        sci_out(port, SCxSR, SCxSR_BREAK_CLEAR(port));
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        unsigned short ssr_status, scr_status;
+        struct uart_port *port = ptr;
+
+        ssr_status = sci_in(port,SCxSR);
+        scr_status = sci_in(port,SCSCR);
+
+        /* Tx Interrupt */
+        if ((ssr_status&0x0020) && (scr_status&0x0080))
+                sci_tx_interrupt(irq, ptr, regs);
+        /* Rx Interrupt */
+        if ((ssr_status&0x0002) && (scr_status&0x0040))
+                sci_rx_interrupt(irq, ptr, regs);
+        /* Error Interrupt */
+        if ((ssr_status&0x0080) && (scr_status&0x0400))
+                sci_er_interrupt(irq, ptr, regs);
+        /* Break Interrupt */
+        if ((ssr_status&0x0010) && (scr_status&0x0200))
+                sci_br_interrupt(irq, ptr, regs);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_CPU_FREQ
+/*
+ * Here we define a transistion notifier so that we can update all of our
+ * ports' baud rate when the peripheral clock changes.
+ */
+static int sci_notifier(struct notifier_block *self, unsigned long phase, void *p)
+{
+        struct cpufreq_freqs *freqs = p;
+        int i;
+
+        if ((phase == CPUFREQ_POSTCHANGE) ||
+            (phase == CPUFREQ_RESUMECHANGE)){
+                for (i = 0; i < SCI_NPORTS; i++) {
+                        struct uart_port *port = &sci_ports[i].port;
+
+                        /*
+                         * Update the uartclk per-port if frequency has
+                         * changed, since it will no longer necessarily be
+                         * consistent with the old frequency.
+                         *
+                         * Really we want to be able to do something like
+                         * uart_change_speed() or something along those lines
+                         * here to implicitly reset the per-port baud rate..
+                         *
+                         * Clean this up later..
+                         */
+                        port->uartclk = current_cpu_data.module_clock * 16;
+                }
+
+                printk("%s: got a postchange notification for cpu %d (old %d, new %d)\n",
+                                __FUNCTION__, freqs->cpu, freqs->old, freqs->new);
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block sci_nb = { &sci_notifier, NULL, 0 };
+#endif /* CONFIG_CPU_FREQ */
+
+static int sci_request_irq(struct sci_port *port)
+{
+        int i;
+        irqreturn_t (*handlers[4])(int irq, void *ptr, struct pt_regs *regs) = {
+                sci_er_interrupt, sci_rx_interrupt, sci_tx_interrupt,
+                sci_br_interrupt,
+        };
+        const char *desc[] = { "SCI Receive Error", "SCI Receive Data Full",
+                               "SCI Transmit Data Empty", "SCI Break" };
+
+        if (port->irqs[0] == port->irqs[1]) {
+                if (!port->irqs[0]) {
+                        printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n");
+                        return -ENODEV;
+                }
+                if (request_irq(port->irqs[0], sci_mpxed_interrupt, SA_INTERRUPT,
+                                "sci", port)) {
+                        printk(KERN_ERR "sci: Cannot allocate irq.\n");
+                        return -ENODEV;
+                }
+        } else {
+                for (i = 0; i < ARRAY_SIZE(handlers); i++) {
+                        if (!port->irqs[i])
+                                continue;
+                        if (request_irq(port->irqs[i], handlers[i], SA_INTERRUPT,
+                                        desc[i], port)) {
+                                printk(KERN_ERR "sci: Cannot allocate irq.\n");
+                                return -ENODEV;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+static void sci_free_irq(struct sci_port *port)
+{
+        int i;
+
+        if (port->irqs[0] == port->irqs[1]) {
+                if (!port->irqs[0])
+                        printk("sci: sci_free_irq error\n");
+                else
+                        free_irq(port->irqs[0], port);
+        } else {
+                for (i = 0; i < ARRAY_SIZE(port->irqs); i++) {
+                        if (!port->irqs[i])
+                                continue;
+
+                        free_irq(port->irqs[i], port);
+                }
+        }
+}
+
+static unsigned int sci_tx_empty(struct uart_port *port)
+{
+        /* Can't detect */
+        return TIOCSER_TEMT;
+}
+
+static void sci_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        /* This routine is used for seting signals of: DTR, DCD, CTS/RTS */
+        /* We use SCIF's hardware for CTS/RTS, so don't need any for that. */
+        /* If you have signals for DTR and DCD, please implement here. */
+}
+
+static unsigned int sci_get_mctrl(struct uart_port *port)
+{
+        /* This routine is used for geting signals of: DTR, DCD, DSR, RI,
+           and CTS/RTS */
+
+        return TIOCM_DTR | TIOCM_RTS | TIOCM_DSR;
+}
+
+static void sci_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct sci_port *s = &sci_ports[port->line];
+
+        disable_irq(s->irqs[SCIx_TXI_IRQ]);
+        sci_transmit_chars(port);
+        enable_irq(s->irqs[SCIx_TXI_IRQ]);
+}
+
+static void sci_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        unsigned long flags;
+        unsigned short ctrl;
+
+        /* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
+        local_irq_save(flags);
+        ctrl = sci_in(port, SCSCR);
+        ctrl &= ~SCI_CTRL_FLAGS_TIE;
+        sci_out(port, SCSCR, ctrl);
+        local_irq_restore(flags);
+}
+
+static void sci_start_rx(struct uart_port *port, unsigned int tty_start)
+{
+        unsigned long flags;
+        unsigned short ctrl;
+
+        /* Set RIE (Receive Interrupt Enable) bit in SCSCR */
+        local_irq_save(flags);
+        ctrl = sci_in(port, SCSCR);
+        ctrl |= SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE;
+        sci_out(port, SCSCR, ctrl);
+        local_irq_restore(flags);
+}
+
+static void sci_stop_rx(struct uart_port *port)
+{
+        unsigned long flags;
+        unsigned short ctrl;
+
+        /* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
+        local_irq_save(flags);
+        ctrl = sci_in(port, SCSCR);
+        ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE);
+        sci_out(port, SCSCR, ctrl);
+        local_irq_restore(flags);
+}
+
+static void sci_enable_ms(struct uart_port *port)
+{
+        /* Nothing here yet .. */
+}
+
+static void sci_break_ctl(struct uart_port *port, int break_state)
+{
+        /* Nothing here yet .. */
+}
+
+static int sci_startup(struct uart_port *port)
+{
+        struct sci_port *s = &sci_ports[port->line];
+
+#if defined(__H8300S__)
+        h8300_sci_enable(port, sci_enable);
+#endif
+
+        sci_request_irq(s);
+        sci_start_tx(port, 1);
+        sci_start_rx(port, 1);
+
+        return 0;
+}
+
+static void sci_shutdown(struct uart_port *port)
+{
+        struct sci_port *s = &sci_ports[port->line];
+
+        sci_stop_rx(port);
+        sci_stop_tx(port, 1);
+        sci_free_irq(s);
+
+#if defined(__H8300S__)
+        h8300_sci_enable(port, sci_disable);
+#endif
+}
+
+static void sci_set_termios(struct uart_port *port, struct termios *termios,
+                            struct termios *old)
+{
+        struct sci_port *s = &sci_ports[port->line];
+        unsigned int status, baud, smr_val;
+        unsigned long flags;
+        int t;
+
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        do {
+                status = sci_in(port, SCxSR);
+        } while (!(status & SCxSR_TEND(port)));
+
+        sci_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
+
+#if !defined(SCI_ONLY)
+        if (port->type == PORT_SCIF) {
+                sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
+        }
+#endif
+
+        smr_val = sci_in(port, SCSMR) & 3;
+        if ((termios->c_cflag & CSIZE) == CS7)
+                smr_val |= 0x40;
+        if (termios->c_cflag & PARENB)
+                smr_val |= 0x20;
+        if (termios->c_cflag & PARODD)
+                smr_val |= 0x30;
+        if (termios->c_cflag & CSTOPB)
+                smr_val |= 0x08;
+
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        sci_out(port, SCSMR, smr_val);
+
+        switch (baud) {
+                case 0:         t = -1;         break;
+                case 2400:      t = BPS_2400;   break;
+                case 4800:      t = BPS_4800;   break;
+                case 9600:      t = BPS_9600;   break;
+                case 19200:     t = BPS_19200;  break;
+                case 38400:     t = BPS_38400;  break;
+                case 57600:     t = BPS_57600;  break;
+                case 115200:    t = BPS_115200; break;
+                default:        t = SCBRR_VALUE(baud); break;
+        }
+
+        if (t > 0) {
+                if(t >= 256) {
+                        sci_out(port, SCSMR, (sci_in(port, SCSMR) & ~3) | 1);
+                        t >>= 2;
+                } else {
+                        sci_out(port, SCSMR, sci_in(port, SCSMR) & ~3);
+                }
+                sci_out(port, SCBRR, t);
+                udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
+        }
+
+        s->init_pins(port, termios->c_cflag);
+        sci_out(port, SCSCR, SCSCR_INIT(port));
+
+        if ((termios->c_cflag & CREAD) != 0)
+              sci_start_rx(port,0);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static const char *sci_type(struct uart_port *port)
+{
+        switch (port->type) {
+                case PORT_SCI:  return "sci";
+                case PORT_SCIF: return "scif";
+                case PORT_IRDA: return "irda";
+        }
+
+        return 0;
+}
+
+static void sci_release_port(struct uart_port *port)
+{
+        /* Nothing here yet .. */
+}
+
+static int sci_request_port(struct uart_port *port)
+{
+        /* Nothing here yet .. */
+        return 0;
+}
+
+static void sci_config_port(struct uart_port *port, int flags)
+{
+        struct sci_port *s = &sci_ports[port->line];
+
+        port->type = s->type;
+
+#if defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
+        if (port->mapbase == 0)
+                port->mapbase = onchip_remap(SCIF_ADDR_SH5, 1024, "SCIF");
+
+        port->membase = (void *)port->mapbase;
+#endif
+}
+
+static int sci_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        struct sci_port *s = &sci_ports[port->line];
+
+        if (ser->irq != s->irqs[SCIx_TXI_IRQ] || ser->irq > NR_IRQS)
+                return -EINVAL;
+        if (ser->baud_base < 2400)
+                /* No paper tape reader for Mitch.. */
+                return -EINVAL;
+
+        return 0;
+}
+
+static struct uart_ops sci_uart_ops = {
+        .tx_empty       = sci_tx_empty,
+        .set_mctrl      = sci_set_mctrl,
+        .get_mctrl      = sci_get_mctrl,
+        .start_tx       = sci_start_tx,
+        .stop_tx        = sci_stop_tx,
+        .stop_rx        = sci_stop_rx,
+        .enable_ms      = sci_enable_ms,
+        .break_ctl      = sci_break_ctl,
+        .startup        = sci_startup,
+        .shutdown       = sci_shutdown,
+        .set_termios    = sci_set_termios,
+        .type           = sci_type,
+        .release_port   = sci_release_port,
+        .request_port   = sci_request_port,
+        .config_port    = sci_config_port,
+        .verify_port    = sci_verify_port,
+};
+
+static struct sci_port sci_ports[SCI_NPORTS] = {
+#if defined(CONFIG_CPU_SUBTYPE_SH7708)
+        {
+                .port   = {
+                        .membase        = (void *)0xfffffe80,
+                        .mapbase        = 0xfffffe80,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 25,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCI,
+                .irqs           = SCI_IRQS,
+                .init_pins      = sci_init_pins_sci,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
+        {
+                .port   = {
+                        .membase        = (void *)SCIF0,
+                        .mapbase        = SCIF0,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 55,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH3_IRDA_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)SCIF2,
+                        .mapbase        = SCIF2,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 59,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH3_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+        {
+                .port   = {
+                        .membase        = (void *)0xfffffe80,
+                        .mapbase        = 0xfffffe80,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 25,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCI,
+                .irqs           = SCI_IRQS,
+                .init_pins      = sci_init_pins_sci,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xa4000150,
+                        .mapbase        = 0xa4000150,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 59,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH3_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xa4000140,
+                        .mapbase        = 0xa4000140,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 55,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+                .type           = PORT_IRDA,
+                .irqs           = SH3_IRDA_IRQS,
+                .init_pins      = sci_init_pins_irda,
+        }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7300)
+        {
+                .port   = {
+                        .membase        = (void *)0xA4430000,
+                        .mapbase        = 0xA4430000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 25,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7300_SCIF0_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
+        {
+                .port   = {
+                        .membase        = (void *)0xffe00000,
+                        .mapbase        = 0xffe00000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 25,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH73180_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_SH_RTS7751R2D)
+        {
+                .port   = {
+                        .membase        = (void *)0xffe80000,
+                        .mapbase        = 0xffe80000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 43,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH4_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751)
+        {
+                .port   = {
+                        .membase        = (void *)0xffe00000,
+                        .mapbase        = 0xffe00000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 25,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCI,
+                .irqs           = SCI_IRQS,
+                .init_pins      = sci_init_pins_sci,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xffe80000,
+                        .mapbase        = 0xffe80000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 43,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH4_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
+        {
+                .port   = {
+                        .membase        = (void *)0xfe600000,
+                        .mapbase        = 0xfe600000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 55,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7760_SCIF0_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xfe610000,
+                        .mapbase        = 0xfe610000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 75,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7760_SCIF1_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xfe620000,
+                        .mapbase        = 0xfe620000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 79,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7760_SCIF2_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
+        {
+                .port   = {
+                        .membase        = (void *)0xffe80000,
+                        .mapbase        = 0xffe80000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 43,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH4_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
+        {
+                .port   = {
+                        .membase        = (void *)0xffe00000,
+                        .mapbase        = 0xffe00000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 26,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = STB1_SCIF1_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xffe80000,
+                        .mapbase        = 0xffe80000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 43,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH4_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
+        {
+                .port   = {
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 42,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH5_SCIF_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_H83007) || defined(CONFIG_H83068)
+        {
+                .port   = {
+                        .membase        = (void *)0x00ffffb0,
+                        .mapbase        = 0x00ffffb0,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 54,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCI,
+                .irqs           = H8300H_SCI_IRQS0,
+                .init_pins      = sci_init_pins_sci,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0x00ffffb8,
+                        .mapbase        = 0x00ffffb8,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 58,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCI,
+                .irqs           = H8300H_SCI_IRQS1,
+                .init_pins      = sci_init_pins_sci,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0x00ffffc0,
+                        .mapbase        = 0x00ffffc0,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 62,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+                .type           = PORT_SCI,
+                .irqs           = H8300H_SCI_IRQS2,
+                .init_pins      = sci_init_pins_sci,
+        },
+#elif defined(CONFIG_H8S2678)
+        {
+                .port   = {
+                        .membase        = (void *)0x00ffff78,
+                        .mapbase        = 0x00ffff78,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 90,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCI,
+                .irqs           = H8S_SCI_IRQS0,
+                .init_pins      = sci_init_pins_sci,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0x00ffff80,
+                        .mapbase        = 0x00ffff80,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 94,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCI,
+                .irqs           = H8S_SCI_IRQS1,
+                .init_pins      = sci_init_pins_sci,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0x00ffff88,
+                        .mapbase        = 0x00ffff88,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 98,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+                .type           = PORT_SCI,
+                .irqs           = H8S_SCI_IRQS2,
+                .init_pins      = sci_init_pins_sci,
+        },
+#else
+#error "CPU subtype not defined"
+#endif
+};
+
+#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ */
+static void serial_console_write(struct console *co, const char *s,
+                                 unsigned count)
+{
+        put_string(serial_console_port, s, count);
+}
+
+static int __init serial_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 115200;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+        int ret;
+
+        if (co->index >= SCI_NPORTS)
+                co->index = 0;
+
+        serial_console_port = &sci_ports[co->index];
+        port = &serial_console_port->port;
+        port->type = serial_console_port->type;
+
+#ifdef CONFIG_SUPERH64
+        /* This is especially needed on sh64 to remap the SCIF */
+        sci_config_port(port, 0);
+#endif
+
+        /*
+         * We need to set the initial uartclk here, since otherwise it will
+         * only ever be setup at sci_init() time.
+         */
+#if !defined(__H8300H__) && !defined(__H8300S__)
+        port->uartclk = current_cpu_data.module_clock * 16;
+#else
+        port->uartclk = CONFIG_CPU_CLOCK;
+#endif
+#if defined(__H8300S__)
+        h8300_sci_enable(port, sci_enable);
+#endif
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        ret = uart_set_options(port, co, baud, parity, bits, flow);
+#if defined(__H8300H__) || defined(__H8300S__)
+        /* disable rx interrupt */
+        if (ret == 0)
+                sci_stop_rx(port);
+#endif
+        return ret;
+}
+
+static struct console serial_console = {
+        .name           = "ttySC",
+        .device         = uart_console_device,
+        .write          = serial_console_write,
+        .setup          = serial_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .data           = &sci_uart_driver,
+};
+
+static int __init sci_console_init(void)
+{
+        register_console(&serial_console);
+        return 0;
+}
+
+console_initcall(sci_console_init);
+#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
+
+#ifdef CONFIG_SH_KGDB
+/*
+ * FIXME: Most of this can go away.. at the moment, we rely on
+ * arch/sh/kernel/setup.c to do the command line parsing for kgdb, though
+ * most of that can easily be done here instead.
+ *
+ * For the time being, just accept the values that were parsed earlier..
+ */
+static void __init kgdb_console_get_options(struct uart_port *port, int *baud,
+                                            int *parity, int *bits)
+{
+        *baud = kgdb_baud;
+        *parity = tolower(kgdb_parity);
+        *bits = kgdb_bits - '0';
+}
+
+/*
+ * The naming here is somewhat misleading, since kgdb_console_setup() takes
+ * care of the early-on initialization for kgdb, regardless of whether we
+ * actually use kgdb as a console or not.
+ *
+ * On the plus side, this lets us kill off the old kgdb_sci_setup() nonsense.
+ */
+int __init kgdb_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port = &sci_ports[kgdb_portnum].port;
+        int baud = 38400;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        if (co->index >= SCI_NPORTS || co->index != kgdb_portnum)
+                co->index = kgdb_portnum;
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                kgdb_console_get_options(port, &baud, &parity, &bits);
+
+        kgdb_getchar = kgdb_sci_getchar;
+        kgdb_putchar = kgdb_sci_putchar;
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+#endif /* CONFIG_SH_KGDB */
+
+#ifdef CONFIG_SH_KGDB_CONSOLE
+static struct console kgdb_console = {
+        .name           = "ttySC",
+        .write          = kgdb_console_write,
+        .setup          = kgdb_console_setup,
+        .flags          = CON_PRINTBUFFER | CON_ENABLED,
+        .index          = -1,
+        .data           = &sci_uart_driver,
+};
+
+/* Register the KGDB console so we get messages (d'oh!) */
+static int __init kgdb_console_init(void)
+{
+        register_console(&kgdb_console);
+        return 0;
+}
+
+console_initcall(kgdb_console_init);
+#endif /* CONFIG_SH_KGDB_CONSOLE */
+
+#if defined(CONFIG_SH_KGDB_CONSOLE)
+#define SCI_CONSOLE     &kgdb_console
+#elif defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
+#define SCI_CONSOLE     &serial_console
+#else
+#define SCI_CONSOLE     0
+#endif
+
+static char banner[] __initdata =
+        KERN_INFO "SuperH SCI(F) driver initialized\n";
+
+static struct uart_driver sci_uart_driver = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "sci",
+#ifdef CONFIG_DEVFS_FS
+        .devfs_name     = "ttsc/",
+#endif
+        .dev_name       = "ttySC",
+        .major          = SCI_MAJOR,
+        .minor          = SCI_MINOR_START,
+        .nr             = SCI_NPORTS,
+        .cons           = SCI_CONSOLE,
+};
+
+static int __init sci_init(void)
+{
+        int chan, ret;
+
+        printk("%s", banner);
+
+        ret = uart_register_driver(&sci_uart_driver);
+        if (ret == 0) {
+                for (chan = 0; chan < SCI_NPORTS; chan++) {
+                        struct sci_port *sciport = &sci_ports[chan];
+
+#if !defined(__H8300H__) && !defined(__H8300S__)
+                        sciport->port.uartclk = (current_cpu_data.module_clock * 16);
+#else
+                        sciport->port.uartclk = CONFIG_CPU_CLOCK;
+#endif
+                        uart_add_one_port(&sci_uart_driver, &sciport->port);
+                        sciport->break_timer.data = (unsigned long)sciport;
+                        sciport->break_timer.function = sci_break_timer;
+                        init_timer(&sciport->break_timer);
+                }
+        }
+
+#ifdef CONFIG_CPU_FREQ
+        cpufreq_register_notifier(&sci_nb, CPUFREQ_TRANSITION_NOTIFIER);
+        printk("sci: CPU frequency notifier registered\n");
+#endif
+
+#ifdef CONFIG_SH_STANDARD_BIOS
+        sh_bios_gdb_detach();
+#endif
+
+        return ret;
+}
+
+static void __exit sci_exit(void)
+{
+        int chan;
+
+        for (chan = 0; chan < SCI_NPORTS; chan++)
+                uart_remove_one_port(&sci_uart_driver, &sci_ports[chan].port);
+
+        uart_unregister_driver(&sci_uart_driver);
+}
+
+module_init(sci_init);
+module_exit(sci_exit);
+
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
new file mode 100644
index 000000000000..2892169eff05
--- /dev/null
+++ b/drivers/serial/sh-sci.h
@@ -0,0 +1,573 @@
+/* $Id: sh-sci.h,v 1.4 2004/02/19 16:43:56 lethal Exp $
+ *
+ *  linux/drivers/serial/sh-sci.h
+ *
+ *  SuperH on-chip serial module support.  (SCI with no FIFO / with FIFO)
+ *  Copyright (C) 1999, 2000  Niibe Yutaka
+ *  Copyright (C) 2000  Greg Banks
+ *  Copyright (C) 2002, 2003  Paul Mundt
+ *  Modified to support multiple serial ports. Stuart Menefy (May 2000).
+ *  Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003).
+ *  Modified to support H8/300 Series Yoshinori Sato (Feb 2004).
+ */
+#include <linux/config.h>
+#include <linux/serial_core.h>
+
+#if defined(__H8300H__) || defined(__H8300S__)
+#include <asm/gpio.h>
+#if defined(CONFIG_H83007) || defined(CONFIG_H83068)
+#include <asm/regs306x.h>
+#endif
+#if defined(CONFIG_H8S2678)
+#include <asm/regs267x.h>
+#endif
+#endif
+
+/* Offsets into the sci_port->irqs array */
+#define SCIx_ERI_IRQ 0
+#define SCIx_RXI_IRQ 1
+#define SCIx_TXI_IRQ 2
+
+/*                     ERI, RXI, TXI, BRI */
+#define SCI_IRQS      { 23,  24,  25,   0 }
+#define SH3_SCIF_IRQS { 56,  57,  59,  58 }
+#define SH3_IRDA_IRQS { 52,  53,  55,  54 }
+#define SH4_SCIF_IRQS { 40,  41,  43,  42 }
+#define STB1_SCIF1_IRQS {23, 24,  26,  25 }
+#define SH7760_SCIF0_IRQS { 52, 53, 55, 54 }
+#define SH7760_SCIF1_IRQS { 72, 73, 75, 74 }
+#define SH7760_SCIF2_IRQS { 76, 77, 79, 78 }
+#define SH7300_SCIF0_IRQS {80,  80,  80,  80 }
+#define SH73180_SCIF_IRQS {80,  81,  83,  82 }
+#define H8300H_SCI_IRQS0 {52, 53, 54,   0 }
+#define H8300H_SCI_IRQS1 {56, 57, 58,   0 }
+#define H8300H_SCI_IRQS2 {60, 61, 62,   0 }
+#define H8S_SCI_IRQS0 {88, 89, 90,   0 }
+#define H8S_SCI_IRQS1 {92, 93, 94,   0 }
+#define H8S_SCI_IRQS2 {96, 97, 98,   0 }
+#define SH5_SCIF_IRQS {39, 40, 42,   0 }
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7708)
+# define SCI_NPORTS 1
+# define SCSPTR 0xffffff7c /* 8 bit */
+# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCI_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+# define SCI_NPORTS 3
+# define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */
+# define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */
+# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCI_AND_SCIF
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
+# define SCIF0          0xA4400000
+# define SCIF2          0xA4410000
+# define SCSMR_Ir       0xA44A0000
+# define IRDA_SCIF      SCIF0
+# define SCI_NPORTS 2
+# define SCPCR 0xA4000116
+# define SCPDR 0xA4000136
+
+/* Set the clock source,
+ * SCIF2 (0xA4410000) -> External clock, SCK pin used as clock input
+ * SCIF0 (0xA4400000) -> Internal clock, SCK pin as serial clock output
+ */
+# define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0
+# define SCIF_ONLY
+#elif defined(CONFIG_SH_RTS7751R2D)
+# define SCI_NPORTS 1
+# define SCSPTR1 0xffe0001c /* 8  bit SCI */
+# define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001   /* overrun error bit */
+# define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751)
+# define SCI_NPORTS 2
+# define SCSPTR1 0xffe0001c /* 8  bit SCI */
+# define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001   /* overrun error bit */
+# define SCSCR_INIT(port) (((port)->type == PORT_SCI) ? \
+        0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \
+        0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ )
+# define SCI_AND_SCIF
+#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
+# define SCI_NPORTS 3
+# define SCSPTR0 0xfe600000 /* 16 bit SCIF */
+# define SCSPTR1 0xfe610000 /* 16 bit SCIF */
+# define SCSPTR2 0xfe620000 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001  /* overrun error bit */
+# define SCSCR_INIT(port)          0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7300)
+# define SCI_NPORTS 1
+# define SCPCR  0xA4050116        /* 16 bit SCIF */
+# define SCPDR  0xA4050136        /* 16 bit SCIF */
+# define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
+# define SCI_NPORTS 1
+# define SCPDR  0xA4050138        /* 16 bit SCIF */
+# define SCSPTR2 SCPDR
+# define SCIF_ORER 0x0001   /* overrun error bit */
+# define SCSCR_INIT(port)  0x0038 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
+# define SCI_NPORTS 1
+# define SCSPTR2 0xffe80020 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001   /* overrun error bit */
+# define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
+# define SCI_NPORTS 2
+# define SCSPTR1 0xffe00020 /* 16 bit SCIF */
+# define SCSPTR2 0xffe80020 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001   /* overrun error bit */
+# define SCSCR_INIT(port)          0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
+# include <asm/hardware.h>
+# define SCIF_BASE_ADDR    0x01030000
+# define SCIF_ADDR_SH5     PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
+# define SCIF_PTR2_OFFS    0x0000020
+# define SCIF_LSR2_OFFS    0x0000024
+# define SCI_NPORTS 1
+# define SCI_INIT { \
+  { {}, PORT_SCIF, 0, \
+     SH5_SCIF_IRQS, sci_init_pins_scif }  \
+}
+# define SCSPTR2           ((port->mapbase)+SCIF_PTR2_OFFS) /* 16 bit SCIF */
+# define SCLSR2            ((port->mapbase)+SCIF_LSR2_OFFS) /* 16 bit SCIF */
+# define SCSCR_INIT(port)  0x38                           /* TIE=0,RIE=0,
+                                                             TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
+#elif defined(CONFIG_H83007) || defined(CONFIG_H83068)
+# define SCI_NPORTS 3
+# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCI_ONLY
+# define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
+#elif defined(CONFIG_H8S2678)
+# define SCI_NPORTS 3
+# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
+# define SCI_ONLY
+# define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
+#else
+# error CPU subtype not defined
+#endif
+
+/* SCSCR */
+#define SCI_CTRL_FLAGS_TIE  0x80 /* all */
+#define SCI_CTRL_FLAGS_RIE  0x40 /* all */
+#define SCI_CTRL_FLAGS_TE   0x20 /* all */
+#define SCI_CTRL_FLAGS_RE   0x10 /* all */
+#if defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751)
+#define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */
+#else
+#define SCI_CTRL_FLAGS_REIE 0
+#endif
+/*      SCI_CTRL_FLAGS_MPIE 0x08  * 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+/*      SCI_CTRL_FLAGS_TEIE 0x04  * 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+/*      SCI_CTRL_FLAGS_CKE1 0x02  * all */
+/*      SCI_CTRL_FLAGS_CKE0 0x01  * 7707 SCI/SCIF, 7708 SCI, 7709 SCI/SCIF, 7750 SCI */
+
+/* SCxSR SCI */
+#define SCI_TDRE  0x80 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+#define SCI_RDRF  0x40 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+#define SCI_ORER  0x20 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+#define SCI_FER   0x10 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+#define SCI_PER   0x08 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+#define SCI_TEND  0x04 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+/*      SCI_MPB   0x02  * 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+/*      SCI_MPBT  0x01  * 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
+
+#define SCI_ERRORS ( SCI_PER | SCI_FER | SCI_ORER)
+
+/* SCxSR SCIF */
+#define SCIF_ER    0x0080 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_TEND  0x0040 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_TDFE  0x0020 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_BRK   0x0010 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_FER   0x0008 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_PER   0x0004 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_RDF   0x0002 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+#define SCIF_DR    0x0001 /* 7705 SCIF, 7707 SCIF, 7709 SCIF, 7750 SCIF */
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#define SCIF_ORER    0x0200
+#define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK | SCIF_ORER)
+#define SCIF_RFDC_MASK 0x007f
+#define SCIF_TXROOM_MAX 64
+#else
+#define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
+#define SCIF_RFDC_MASK 0x001f
+#define SCIF_TXROOM_MAX 16
+#endif
+
+#if defined(SCI_ONLY)
+# define SCxSR_TEND(port)               SCI_TEND
+# define SCxSR_ERRORS(port)             SCI_ERRORS
+# define SCxSR_RDxF(port)               SCI_RDRF
+# define SCxSR_TDxE(port)               SCI_TDRE
+# define SCxSR_ORER(port)               SCI_ORER
+# define SCxSR_FER(port)                SCI_FER
+# define SCxSR_PER(port)                SCI_PER
+# define SCxSR_BRK(port)                0x00
+# define SCxSR_RDxF_CLEAR(port)         0xbc
+# define SCxSR_ERROR_CLEAR(port)        0xc4
+# define SCxSR_TDxE_CLEAR(port)         0x78
+# define SCxSR_BREAK_CLEAR(port)        0xc4
+#elif defined(SCIF_ONLY)
+# define SCxSR_TEND(port)               SCIF_TEND
+# define SCxSR_ERRORS(port)             SCIF_ERRORS
+# define SCxSR_RDxF(port)               SCIF_RDF
+# define SCxSR_TDxE(port)               SCIF_TDFE
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+# define SCxSR_ORER(port)               SCIF_ORER
+#else
+# define SCxSR_ORER(port)               0x0000
+#endif
+# define SCxSR_FER(port)                SCIF_FER
+# define SCxSR_PER(port)                SCIF_PER
+# define SCxSR_BRK(port)                SCIF_BRK
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+# define SCxSR_RDxF_CLEAR(port)         (sci_in(port,SCxSR)&0xfffc)
+# define SCxSR_ERROR_CLEAR(port)        (sci_in(port,SCxSR)&0xfd73)
+# define SCxSR_TDxE_CLEAR(port)         (sci_in(port,SCxSR)&0xffdf)
+# define SCxSR_BREAK_CLEAR(port)        (sci_in(port,SCxSR)&0xffe3)
+#else
+/* SH7705 can also use this, clearing is same between 7705 and 7709 and 7300 */
+# define SCxSR_RDxF_CLEAR(port)         0x00fc
+# define SCxSR_ERROR_CLEAR(port)        0x0073
+# define SCxSR_TDxE_CLEAR(port)         0x00df
+# define SCxSR_BREAK_CLEAR(port)        0x00e3
+#endif
+#else
+# define SCxSR_TEND(port)        (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
+# define SCxSR_ERRORS(port)      (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
+# define SCxSR_RDxF(port)        (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_RDF)
+# define SCxSR_TDxE(port)        (((port)->type == PORT_SCI) ? SCI_TDRE   : SCIF_TDFE)
+# define SCxSR_ORER(port)        (((port)->type == PORT_SCI) ? SCI_ORER   : 0x0000)
+# define SCxSR_FER(port)         (((port)->type == PORT_SCI) ? SCI_FER    : SCIF_FER)
+# define SCxSR_PER(port)         (((port)->type == PORT_SCI) ? SCI_PER    : SCIF_PER)
+# define SCxSR_BRK(port)         (((port)->type == PORT_SCI) ? 0x00       : SCIF_BRK)
+# define SCxSR_RDxF_CLEAR(port)  (((port)->type == PORT_SCI) ? 0xbc : 0x00fc)
+# define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0073)
+# define SCxSR_TDxE_CLEAR(port)  (((port)->type == PORT_SCI) ? 0x78 : 0x00df)
+# define SCxSR_BREAK_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x00e3)
+#endif
+
+/* SCFCR */
+#define SCFCR_RFRST 0x0002
+#define SCFCR_TFRST 0x0004
+#define SCFCR_TCRST 0x4000
+#define SCFCR_MCE   0x0008
+
+#define SCI_MAJOR               204
+#define SCI_MINOR_START         8
+
+/* Generic serial flags */
+#define SCI_RX_THROTTLE         0x0000001
+
+#define SCI_MAGIC 0xbabeface
+
+/*
+ * Events are used to schedule things to happen at timer-interrupt
+ * time, instead of at rs interrupt time.
+ */
+#define SCI_EVENT_WRITE_WAKEUP  0
+
+struct sci_port {
+        struct uart_port port;
+        int type;
+        unsigned char irqs[4]; /* ERI, RXI, TXI, BRI */
+        void (*init_pins)(struct uart_port *port, unsigned int cflag);
+        int break_flag;
+        struct timer_list break_timer;
+};
+
+#define SCI_IN(size, offset)                                    \
+  unsigned int addr = port->mapbase + (offset);                 \
+  if ((size) == 8) {                                            \
+    return ctrl_inb(addr);                                      \
+  } else {                                                      \
+    return ctrl_inw(addr);                                      \
+  }
+#define SCI_OUT(size, offset, value)                            \
+  unsigned int addr = port->mapbase + (offset);                 \
+  if ((size) == 8) {                                            \
+    ctrl_outb(value, addr);                                     \
+  } else {                                                      \
+    ctrl_outw(value, addr);                                     \
+  }
+
+#define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\
+  static inline unsigned int sci_##name##_in(struct uart_port *port)    \
+  {                                                                     \
+    if (port->type == PORT_SCI) {                                       \
+      SCI_IN(sci_size, sci_offset)                                      \
+    } else {                                                            \
+      SCI_IN(scif_size, scif_offset);                                   \
+    }                                                                   \
+  }                                                                     \
+  static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
+  {                                                                     \
+    if (port->type == PORT_SCI) {                                       \
+      SCI_OUT(sci_size, sci_offset, value)                              \
+    } else {                                                            \
+      SCI_OUT(scif_size, scif_offset, value);                           \
+    }                                                                   \
+  }
+
+#define CPU_SCIF_FNS(name, scif_offset, scif_size)                              \
+  static inline unsigned int sci_##name##_in(struct uart_port *port)    \
+  {                                                                     \
+    SCI_IN(scif_size, scif_offset);                                     \
+  }                                                                     \
+  static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
+  {                                                                     \
+    SCI_OUT(scif_size, scif_offset, value);                             \
+  }
+
+#define CPU_SCI_FNS(name, sci_offset, sci_size)                         \
+  static inline unsigned int sci_##name##_in(struct uart_port* port)    \
+  {                                                                     \
+    SCI_IN(sci_size, sci_offset);                                       \
+  }                                                                     \
+  static inline void sci_##name##_out(struct uart_port* port, unsigned int value) \
+  {                                                                     \
+    SCI_OUT(sci_size, sci_offset, value);                               \
+  }
+
+#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#define SCIF_FNS(name, scif_offset, scif_size) \
+  CPU_SCIF_FNS(name, scif_offset, scif_size)
+#else
+#define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh4_sci_offset, sh4_sci_size, \
+                 sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \
+                 h8_sci_offset, h8_sci_size) \
+  CPU_SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh3_scif_offset, sh3_scif_size)
+#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+  CPU_SCIF_FNS(name, sh3_scif_offset, sh3_scif_size)
+#endif
+#elif defined(__H8300H__) || defined(__H8300S__)
+#define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh4_sci_offset, sh4_sci_size, \
+                 sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \
+                 h8_sci_offset, h8_sci_size) \
+  CPU_SCI_FNS(name, h8_sci_offset, h8_sci_size)
+#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size)
+#else
+#define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh4_sci_offset, sh4_sci_size, \
+                 sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size, \
+                 h8_sci_offset, h8_sci_size) \
+  CPU_SCIx_FNS(name, sh4_sci_offset, sh4_sci_size, sh4_scif_offset, sh4_scif_size)
+#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+  CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
+#endif
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+SCIF_FNS(SCSMR,  0x00, 16)
+SCIF_FNS(SCBRR,  0x04,  8)
+SCIF_FNS(SCSCR,  0x08, 16)
+SCIF_FNS(SCTDSR, 0x0c,  8)
+SCIF_FNS(SCFER,  0x10, 16)
+SCIF_FNS(SCxSR,  0x14, 16)
+SCIF_FNS(SCFCR,  0x18, 16)
+SCIF_FNS(SCFDR,  0x1c, 16)
+SCIF_FNS(SCxTDR, 0x20,  8)
+SCIF_FNS(SCxRDR, 0x24,  8)
+SCIF_FNS(SCLSR,  0x24, 16)
+#else
+/*      reg      SCI/SH3   SCI/SH4  SCIF/SH3   SCIF/SH4  SCI/H8*/
+/*      name     off  sz   off  sz   off  sz   off  sz   off  sz*/
+SCIx_FNS(SCSMR,  0x00,  8, 0x00,  8, 0x00,  8, 0x00, 16, 0x00,  8)
+SCIx_FNS(SCBRR,  0x02,  8, 0x04,  8, 0x02,  8, 0x04,  8, 0x01,  8)
+SCIx_FNS(SCSCR,  0x04,  8, 0x08,  8, 0x04,  8, 0x08, 16, 0x02,  8)
+SCIx_FNS(SCxTDR, 0x06,  8, 0x0c,  8, 0x06,  8, 0x0C,  8, 0x03,  8)
+SCIx_FNS(SCxSR,  0x08,  8, 0x10,  8, 0x08, 16, 0x10, 16, 0x04,  8)
+SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)
+SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)
+SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
+SCIF_FNS(SCSPTR,                        0,  0, 0x20, 16)
+SCIF_FNS(SCLSR,                         0,  0, 0x24, 16)
+#endif
+#define sci_in(port, reg) sci_##reg##_in(port)
+#define sci_out(port, reg, value) sci_##reg##_out(port, value)
+
+/* H8/300 series SCI pins assignment */
+#if defined(__H8300H__) || defined(__H8300S__)
+static const struct __attribute__((packed)) {
+        int port;             /* GPIO port no */
+        unsigned short rx,tx; /* GPIO bit no */
+} h8300_sci_pins[] = {
+#if defined(CONFIG_H83007) || defined(CONFIG_H83068)
+        {    /* SCI0 */
+                .port = H8300_GPIO_P9,
+                .rx   = H8300_GPIO_B2,
+                .tx   = H8300_GPIO_B0,
+        },
+        {    /* SCI1 */
+                .port = H8300_GPIO_P9,
+                .rx   = H8300_GPIO_B3,
+                .tx   = H8300_GPIO_B1,
+        },
+        {    /* SCI2 */
+                .port = H8300_GPIO_PB,
+                .rx   = H8300_GPIO_B7,
+                .tx   = H8300_GPIO_B6,
+        }
+#elif defined(CONFIG_H8S2678)
+        {    /* SCI0 */
+                .port = H8300_GPIO_P3,
+                .rx   = H8300_GPIO_B2,
+                .tx   = H8300_GPIO_B0,
+        },
+        {    /* SCI1 */
+                .port = H8300_GPIO_P3,
+                .rx   = H8300_GPIO_B3,
+                .tx   = H8300_GPIO_B1,
+        },
+        {    /* SCI2 */
+                .port = H8300_GPIO_P5,
+                .rx   = H8300_GPIO_B1,
+                .tx   = H8300_GPIO_B0,
+        }
+#endif
+};
+#endif
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7708)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xfffffe80)
+                return ctrl_inb(SCSPTR)&0x01 ? 1 : 0; /* SCI */
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xfffffe80)
+                return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCI */
+        if (port->mapbase == 0xa4000150)
+                return ctrl_inb(SCPDR)&0x10 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xa4000140)
+                return ctrl_inb(SCPDR)&0x04 ? 1 : 0; /* IRDA */
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == SCIF0)
+                return ctrl_inb(SCPDR)&0x04 ? 1 : 0; /* IRDA */
+        if (port->mapbase == SCIF2)
+                return ctrl_inb(SCPDR)&0x10 ? 1 : 0; /* SCIF */
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7750) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7751) || \
+      defined(CONFIG_CPU_SUBTYPE_SH4_202)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+#ifndef SCIF_ONLY
+        if (port->mapbase == 0xffe00000)
+                return ctrl_inb(SCSPTR1)&0x01 ? 1 : 0; /* SCI */
+#endif
+#ifndef SCI_ONLY
+        if (port->mapbase == 0xffe80000)
+                return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
+#endif
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xfe600000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xfe610000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xfe620000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7300)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xa4430000)
+                return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCIF0 */
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        return ctrl_inb(SCPDR)&0x01 ? 1 : 0; /* SCIF0 */
+}
+#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xffe00000)
+                return ctrl_inw(SCSPTR1)&0x0001 ? 1 : 0; /* SCIF */
+        else
+                return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
+
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+         return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */
+}
+#elif defined(__H8300H__) || defined(__H8300S__)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        int ch = (port->mapbase - SMR0) >> 3;
+        return (H8300_SCI_DR(ch) & h8300_sci_pins[ch].rx) ? 1 : 0;
+}
+#endif
+
+/*
+ * Values for the BitRate Register (SCBRR)
+ *
+ * The values are actually divisors for a frequency which can
+ * be internal to the SH3 (14.7456MHz) or derived from an external
+ * clock source.  This driver assumes the internal clock is used;
+ * to support using an external clock source, config options or
+ * possibly command-line options would need to be added.
+ *
+ * Also, to support speeds below 2400 (why?) the lower 2 bits of
+ * the SCSMR register would also need to be set to non-zero values.
+ *
+ * -- Greg Banks 27Feb2000
+ *
+ * Answer: The SCBRR register is only eight bits, and the value in
+ * it gets larger with lower baud rates. At around 2400 (depending on
+ * the peripherial module clock) you run out of bits. However the
+ * lower two bits of SCSMR allow the module clock to be divided down,
+ * scaling the value which is needed in SCBRR.
+ *
+ * -- Stuart Menefy - 23 May 2000
+ *
+ * I meant, why would anyone bother with bitrates below 2400.
+ *
+ * -- Greg Banks - 7Jul2000
+ *
+ * You "speedist"!  How will I use my 110bps ASR-33 teletype with paper
+ * tape reader as a console!
+ *
+ * -- Mitch Davis - 15 Jul 2000
+ */
+
+#define PCLK           (current_cpu_data.module_clock)
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7300)
+#define SCBRR_VALUE(bps) ((PCLK+16*bps)/(16*bps)-1)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
+#define SCBRR_VALUE(bps) (((PCLK*2)+16*bps)/(32*bps)-1)
+#elif !defined(__H8300H__) && !defined(__H8300S__)
+#define SCBRR_VALUE(bps) ((PCLK+16*bps)/(32*bps)-1)
+#else
+#define SCBRR_VALUE(bps) (((CONFIG_CPU_CLOCK*1000/32)/bps)-1)
+#endif
+#define BPS_2400       SCBRR_VALUE(2400)
+#define BPS_4800       SCBRR_VALUE(4800)
+#define BPS_9600       SCBRR_VALUE(9600)
+#define BPS_19200      SCBRR_VALUE(19200)
+#define BPS_38400      SCBRR_VALUE(38400)
+#define BPS_57600      SCBRR_VALUE(57600)
+#define BPS_115200     SCBRR_VALUE(115200)
+
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
new file mode 100644
index 000000000000..ffaab9b90fd8
--- /dev/null
+++ b/drivers/serial/sn_console.c
@@ -0,0 +1,1124 @@
+/*
+ * C-Brick Serial Port (and console) driver for SGI Altix machines.
+ *
+ * This driver is NOT suitable for talking to the l1-controller for
+ * anything other than 'console activities' --- please use the l1
+ * driver for that.
+ *
+ *
+ * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Further, this software is distributed without any warranty that it is
+ * free of the rightful claim of any third person regarding infringement
+ * or the like.  Any license provided herein, whether implied or
+ * otherwise, applies only to this software file.  Patent licenses, if
+ * any, provided herein do not apply to combinations of this program with
+ * other software, or any other product whatsoever.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ * Contact information:  Silicon Graphics, Inc., 1500 Crittenden Lane,
+ * Mountain View, CA  94043, or:
+ *
+ * http://www.sgi.com
+ *
+ * For further information regarding this notice, see:
+ *
+ * http://oss.sgi.com/projects/GenInfo/NoticeExplan
+ */
+
+#include <linux/config.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/console.h>
+#include <linux/module.h>
+#include <linux/sysrq.h>
+#include <linux/circ_buf.h>
+#include <linux/serial_reg.h>
+#include <linux/delay.h> /* for mdelay */
+#include <linux/miscdevice.h>
+#include <linux/serial_core.h>
+
+#include <asm/io.h>
+#include <asm/sn/simulator.h>
+#include <asm/sn/sn_sal.h>
+
+/* number of characters we can transmit to the SAL console at a time */
+#define SN_SAL_MAX_CHARS 120
+
+/* 64K, when we're asynch, it must be at least printk's LOG_BUF_LEN to
+ * avoid losing chars, (always has to be a power of 2) */
+#define SN_SAL_BUFFER_SIZE (64 * (1 << 10))
+
+#define SN_SAL_UART_FIFO_DEPTH 16
+#define SN_SAL_UART_FIFO_SPEED_CPS 9600/10
+
+/* sn_transmit_chars() calling args */
+#define TRANSMIT_BUFFERED       0
+#define TRANSMIT_RAW            1
+
+/* To use dynamic numbers only and not use the assigned major and minor,
+ * define the following.. */
+                                  /* #define USE_DYNAMIC_MINOR 1 *//* use dynamic minor number */
+#define USE_DYNAMIC_MINOR 0     /* Don't rely on misc_register dynamic minor */
+
+/* Device name we're using */
+#define DEVICE_NAME "ttySG"
+#define DEVICE_NAME_DYNAMIC "ttySG0"    /* need full name for misc_register */
+/* The major/minor we are using, ignored for USE_DYNAMIC_MINOR */
+#define DEVICE_MAJOR 204
+#define DEVICE_MINOR 40
+
+#ifdef CONFIG_MAGIC_SYSRQ
+static char sysrq_serial_str[] = "\eSYS";
+static char *sysrq_serial_ptr = sysrq_serial_str;
+static unsigned long sysrq_requested;
+#endif /* CONFIG_MAGIC_SYSRQ */
+
+/*
+ * Port definition - this kinda drives it all
+ */
+struct sn_cons_port {
+        struct timer_list sc_timer;
+        struct uart_port sc_port;
+        struct sn_sal_ops {
+                int (*sal_puts_raw) (const char *s, int len);
+                int (*sal_puts) (const char *s, int len);
+                int (*sal_getc) (void);
+                int (*sal_input_pending) (void);
+                void (*sal_wakeup_transmit) (struct sn_cons_port *, int);
+        } *sc_ops;
+        unsigned long sc_interrupt_timeout;
+        int sc_is_asynch;
+};
+
+static struct sn_cons_port sal_console_port;
+static int sn_process_input;
+
+/* Only used if USE_DYNAMIC_MINOR is set to 1 */
+static struct miscdevice misc;  /* used with misc_register for dynamic */
+
+extern void early_sn_setup(void);
+
+#undef DEBUG
+#ifdef DEBUG
+static int sn_debug_printf(const char *fmt, ...);
+#define DPRINTF(x...) sn_debug_printf(x)
+#else
+#define DPRINTF(x...) do { } while (0)
+#endif
+
+/* Prototypes */
+static int snt_hw_puts_raw(const char *, int);
+static int snt_hw_puts_buffered(const char *, int);
+static int snt_poll_getc(void);
+static int snt_poll_input_pending(void);
+static int snt_intr_getc(void);
+static int snt_intr_input_pending(void);
+static void sn_transmit_chars(struct sn_cons_port *, int);
+
+/* A table for polling:
+ */
+static struct sn_sal_ops poll_ops = {
+        .sal_puts_raw = snt_hw_puts_raw,
+        .sal_puts = snt_hw_puts_raw,
+        .sal_getc = snt_poll_getc,
+        .sal_input_pending = snt_poll_input_pending
+};
+
+/* A table for interrupts enabled */
+static struct sn_sal_ops intr_ops = {
+        .sal_puts_raw = snt_hw_puts_raw,
+        .sal_puts = snt_hw_puts_buffered,
+        .sal_getc = snt_intr_getc,
+        .sal_input_pending = snt_intr_input_pending,
+        .sal_wakeup_transmit = sn_transmit_chars
+};
+
+/* the console does output in two distinctly different ways:
+ * synchronous (raw) and asynchronous (buffered).  initally, early_printk
+ * does synchronous output.  any data written goes directly to the SAL
+ * to be output (incidentally, it is internally buffered by the SAL)
+ * after interrupts and timers are initialized and available for use,
+ * the console init code switches to asynchronous output.  this is
+ * also the earliest opportunity to begin polling for console input.
+ * after console initialization, console output and tty (serial port)
+ * output is buffered and sent to the SAL asynchronously (either by
+ * timer callback or by UART interrupt) */
+
+/* routines for running the console in polling mode */
+
+/**
+ * snt_poll_getc - Get a character from the console in polling mode
+ *
+ */
+static int snt_poll_getc(void)
+{
+        int ch;
+
+        ia64_sn_console_getc(&ch);
+        return ch;
+}
+
+/**
+ * snt_poll_input_pending - Check if any input is waiting - polling mode.
+ *
+ */
+static int snt_poll_input_pending(void)
+{
+        int status, input;
+
+        status = ia64_sn_console_check(&input);
+        return !status && input;
+}
+
+/* routines for an interrupt driven console (normal) */
+
+/**
+ * snt_intr_getc - Get a character from the console, interrupt mode
+ *
+ */
+static int snt_intr_getc(void)
+{
+        return ia64_sn_console_readc();
+}
+
+/**
+ * snt_intr_input_pending - Check if input is pending, interrupt mode
+ *
+ */
+static int snt_intr_input_pending(void)
+{
+        return ia64_sn_console_intr_status() & SAL_CONSOLE_INTR_RECV;
+}
+
+/* these functions are polled and interrupt */
+
+/**
+ * snt_hw_puts_raw - Send raw string to the console, polled or interrupt mode
+ * @s: String
+ * @len: Length
+ *
+ */
+static int snt_hw_puts_raw(const char *s, int len)
+{
+        /* this will call the PROM and not return until this is done */
+        return ia64_sn_console_putb(s, len);
+}
+
+/**
+ * snt_hw_puts_buffered - Send string to console, polled or interrupt mode
+ * @s: String
+ * @len: Length
+ *
+ */
+static int snt_hw_puts_buffered(const char *s, int len)
+{
+        /* queue data to the PROM */
+        return ia64_sn_console_xmit_chars((char *)s, len);
+}
+
+/* uart interface structs
+ * These functions are associated with the uart_port that the serial core
+ * infrastructure calls.
+ *
+ * Note: Due to how the console works, many routines are no-ops.
+ */
+
+/**
+ * snp_type - What type of console are we?
+ * @port: Port to operate with (we ignore since we only have one port)
+ *
+ */
+static const char *snp_type(struct uart_port *port)
+{
+        return ("SGI SN L1");
+}
+
+/**
+ * snp_tx_empty - Is the transmitter empty?  We pretend we're always empty
+ * @port: Port to operate on (we ignore since we only have one port)
+ *
+ */
+static unsigned int snp_tx_empty(struct uart_port *port)
+{
+        return 1;
+}
+
+/**
+ * snp_stop_tx - stop the transmitter - no-op for us
+ * @port: Port to operat eon - we ignore - no-op function
+ * @tty_stop: Set to 1 if called via uart_stop
+ *
+ */
+static void snp_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+}
+
+/**
+ * snp_release_port - Free i/o and resources for port - no-op for us
+ * @port: Port to operate on - we ignore - no-op function
+ *
+ */
+static void snp_release_port(struct uart_port *port)
+{
+}
+
+/**
+ * snp_enable_ms - Force modem status interrupts on - no-op for us
+ * @port: Port to operate on - we ignore - no-op function
+ *
+ */
+static void snp_enable_ms(struct uart_port *port)
+{
+}
+
+/**
+ * snp_shutdown - shut down the port - free irq and disable - no-op for us
+ * @port: Port to shut down - we ignore
+ *
+ */
+static void snp_shutdown(struct uart_port *port)
+{
+}
+
+/**
+ * snp_set_mctrl - set control lines (dtr, rts, etc) - no-op for our console
+ * @port: Port to operate on - we ignore
+ * @mctrl: Lines to set/unset - we ignore
+ *
+ */
+static void snp_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+/**
+ * snp_get_mctrl - get contorl line info, we just return a static value
+ * @port: port to operate on - we only have one port so we ignore this
+ *
+ */
+static unsigned int snp_get_mctrl(struct uart_port *port)
+{
+        return TIOCM_CAR | TIOCM_RNG | TIOCM_DSR | TIOCM_CTS;
+}
+
+/**
+ * snp_stop_rx - Stop the receiver - we ignor ethis
+ * @port: Port to operate on - we ignore
+ *
+ */
+static void snp_stop_rx(struct uart_port *port)
+{
+}
+
+/**
+ * snp_start_tx - Start transmitter
+ * @port: Port to operate on
+ * @tty_stop: Set to 1 if called via uart_start
+ *
+ */
+static void snp_start_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        if (sal_console_port.sc_ops->sal_wakeup_transmit)
+                sal_console_port.sc_ops->sal_wakeup_transmit(&sal_console_port,
+                                                             TRANSMIT_BUFFERED);
+
+}
+
+/**
+ * snp_break_ctl - handle breaks - ignored by us
+ * @port: Port to operate on
+ * @break_state: Break state
+ *
+ */
+static void snp_break_ctl(struct uart_port *port, int break_state)
+{
+}
+
+/**
+ * snp_startup - Start up the serial port - always return 0 (We're always on)
+ * @port: Port to operate on
+ *
+ */
+static int snp_startup(struct uart_port *port)
+{
+        return 0;
+}
+
+/**
+ * snp_set_termios - set termios stuff - we ignore these
+ * @port: port to operate on
+ * @termios: New settings
+ * @termios: Old
+ *
+ */
+static void
+snp_set_termios(struct uart_port *port, struct termios *termios,
+                struct termios *old)
+{
+}
+
+/**
+ * snp_request_port - allocate resources for port - ignored by us
+ * @port: port to operate on
+ *
+ */
+static int snp_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/**
+ * snp_config_port - allocate resources, set up - we ignore,  we're always on
+ * @port: Port to operate on
+ * @flags: flags used for port setup
+ *
+ */
+static void snp_config_port(struct uart_port *port, int flags)
+{
+}
+
+/* Associate the uart functions above - given to serial core */
+
+static struct uart_ops sn_console_ops = {
+        .tx_empty = snp_tx_empty,
+        .set_mctrl = snp_set_mctrl,
+        .get_mctrl = snp_get_mctrl,
+        .stop_tx = snp_stop_tx,
+        .start_tx = snp_start_tx,
+        .stop_rx = snp_stop_rx,
+        .enable_ms = snp_enable_ms,
+        .break_ctl = snp_break_ctl,
+        .startup = snp_startup,
+        .shutdown = snp_shutdown,
+        .set_termios = snp_set_termios,
+        .pm = NULL,
+        .type = snp_type,
+        .release_port = snp_release_port,
+        .request_port = snp_request_port,
+        .config_port = snp_config_port,
+        .verify_port = NULL,
+};
+
+/* End of uart struct functions and defines */
+
+#ifdef DEBUG
+
+/**
+ * sn_debug_printf - close to hardware debugging printf
+ * @fmt: printf format
+ *
+ * This is as "close to the metal" as we can get, used when the driver
+ * itself may be broken.
+ *
+ */
+static int sn_debug_printf(const char *fmt, ...)
+{
+        static char printk_buf[1024];
+        int printed_len;
+        va_list args;
+
+        va_start(args, fmt);
+        printed_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args);
+
+        if (!sal_console_port.sc_ops) {
+                sal_console_port.sc_ops = &poll_ops;
+                early_sn_setup();
+        }
+        sal_console_port.sc_ops->sal_puts_raw(printk_buf, printed_len);
+
+        va_end(args);
+        return printed_len;
+}
+#endif                          /* DEBUG */
+
+/*
+ * Interrupt handling routines.
+ */
+
+/**
+ * sn_receive_chars - Grab characters, pass them to tty layer
+ * @port: Port to operate on
+ * @regs: Saved registers (needed by uart_handle_sysrq_char)
+ * @flags: irq flags
+ *
+ * Note: If we're not registered with the serial core infrastructure yet,
+ * we don't try to send characters to it...
+ *
+ */
+static void
+sn_receive_chars(struct sn_cons_port *port, struct pt_regs *regs,
+                 unsigned long flags)
+{
+        int ch;
+        struct tty_struct *tty;
+
+        if (!port) {
+                printk(KERN_ERR "sn_receive_chars - port NULL so can't receieve\n");
+                return;
+        }
+
+        if (!port->sc_ops) {
+                printk(KERN_ERR "sn_receive_chars - port->sc_ops  NULL so can't receieve\n");
+                return;
+        }
+
+        if (port->sc_port.info) {
+                /* The serial_core stuffs are initilized, use them */
+                tty = port->sc_port.info->tty;
+        }
+        else {
+                /* Not registered yet - can't pass to tty layer.  */
+                tty = NULL;
+        }
+
+        while (port->sc_ops->sal_input_pending()) {
+                ch = port->sc_ops->sal_getc();
+                if (ch < 0) {
+                        printk(KERN_ERR "sn_console: An error occured while "
+                               "obtaining data from the console (0x%0x)\n", ch);
+                        break;
+                }
+#ifdef CONFIG_MAGIC_SYSRQ
+                if (sysrq_requested) {
+                        unsigned long sysrq_timeout = sysrq_requested + HZ*5;
+
+                        sysrq_requested = 0;
+                        if (ch && time_before(jiffies, sysrq_timeout)) {
+                                spin_unlock_irqrestore(&port->sc_port.lock, flags);
+                                handle_sysrq(ch, regs, NULL);
+                                spin_lock_irqsave(&port->sc_port.lock, flags);
+                                /* ignore actual sysrq command char */
+                                continue;
+                        }
+                }
+                if (ch == *sysrq_serial_ptr) {
+                        if (!(*++sysrq_serial_ptr)) {
+                                sysrq_requested = jiffies;
+                                sysrq_serial_ptr = sysrq_serial_str;
+                        }
+                        /*
+                         * ignore the whole sysrq string except for the
+                         * leading escape
+                         */
+                        if (ch != '\e')
+                                continue;
+                }
+                else
+                        sysrq_serial_ptr = sysrq_serial_str;
+#endif /* CONFIG_MAGIC_SYSRQ */
+
+                /* record the character to pass up to the tty layer */
+                if (tty) {
+                        *tty->flip.char_buf_ptr = ch;
+                        *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                        if (tty->flip.count == TTY_FLIPBUF_SIZE)
+                                break;
+                }
+                port->sc_port.icount.rx++;
+        }
+
+        if (tty)
+                tty_flip_buffer_push(tty);
+}
+
+/**
+ * sn_transmit_chars - grab characters from serial core, send off
+ * @port: Port to operate on
+ * @raw: Transmit raw or buffered
+ *
+ * Note: If we're early, before we're registered with serial core, the
+ * writes are going through sn_sal_console_write because that's how
+ * register_console has been set up.  We currently could have asynch
+ * polls calling this function due to sn_sal_switch_to_asynch but we can
+ * ignore them until we register with the serial core stuffs.
+ *
+ */
+static void sn_transmit_chars(struct sn_cons_port *port, int raw)
+{
+        int xmit_count, tail, head, loops, ii;
+        int result;
+        char *start;
+        struct circ_buf *xmit;
+
+        if (!port)
+                return;
+
+        BUG_ON(!port->sc_is_asynch);
+
+        if (port->sc_port.info) {
+                /* We're initilized, using serial core infrastructure */
+                xmit = &port->sc_port.info->xmit;
+        } else {
+                /* Probably sn_sal_switch_to_asynch has been run but serial core isn't
+                 * initilized yet.  Just return.  Writes are going through
+                 * sn_sal_console_write (due to register_console) at this time.
+                 */
+                return;
+        }
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&port->sc_port)) {
+                /* Nothing to do. */
+                return;
+        }
+
+        head = xmit->head;
+        tail = xmit->tail;
+        start = &xmit->buf[tail];
+
+        /* twice around gets the tail to the end of the buffer and
+         * then to the head, if needed */
+        loops = (head < tail) ? 2 : 1;
+
+        for (ii = 0; ii < loops; ii++) {
+                xmit_count = (head < tail) ?
+                    (UART_XMIT_SIZE - tail) : (head - tail);
+
+                if (xmit_count > 0) {
+                        if (raw == TRANSMIT_RAW)
+                                result =
+                                    port->sc_ops->sal_puts_raw(start,
+                                                               xmit_count);
+                        else
+                                result =
+                                    port->sc_ops->sal_puts(start, xmit_count);
+#ifdef DEBUG
+                        if (!result)
+                                DPRINTF("`");
+#endif
+                        if (result > 0) {
+                                xmit_count -= result;
+                                port->sc_port.icount.tx += result;
+                                tail += result;
+                                tail &= UART_XMIT_SIZE - 1;
+                                xmit->tail = tail;
+                                start = &xmit->buf[tail];
+                        }
+                }
+        }
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&port->sc_port);
+
+        if (uart_circ_empty(xmit))
+                snp_stop_tx(&port->sc_port, 0); /* no-op for us */
+}
+
+/**
+ * sn_sal_interrupt - Handle console interrupts
+ * @irq: irq #, useful for debug statements
+ * @dev_id: our pointer to our port (sn_cons_port which contains the uart port)
+ * @regs: Saved registers, used by sn_receive_chars for uart_handle_sysrq_char
+ *
+ */
+static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct sn_cons_port *port = (struct sn_cons_port *)dev_id;
+        unsigned long flags;
+        int status = ia64_sn_console_intr_status();
+
+        if (!port)
+                return IRQ_NONE;
+
+        spin_lock_irqsave(&port->sc_port.lock, flags);
+        if (status & SAL_CONSOLE_INTR_RECV) {
+                sn_receive_chars(port, regs, flags);
+        }
+        if (status & SAL_CONSOLE_INTR_XMIT) {
+                sn_transmit_chars(port, TRANSMIT_BUFFERED);
+        }
+        spin_unlock_irqrestore(&port->sc_port.lock, flags);
+        return IRQ_HANDLED;
+}
+
+/**
+ * sn_sal_connect_interrupt - Request interrupt, handled by sn_sal_interrupt
+ * @port: Our sn_cons_port (which contains the uart port)
+ *
+ * returns the console irq if interrupt is successfully registered, else 0
+ *
+ */
+static int sn_sal_connect_interrupt(struct sn_cons_port *port)
+{
+        if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
+                        SA_INTERRUPT | SA_SHIRQ,
+                        "SAL console driver", port) >= 0) {
+                return SGI_UART_VECTOR;
+        }
+
+        printk(KERN_INFO "sn_console: console proceeding in polled mode\n");
+        return 0;
+}
+
+/**
+ * sn_sal_timer_poll - this function handles polled console mode
+ * @data: A pointer to our sn_cons_port (which contains the uart port)
+ *
+ * data is the pointer that init_timer will store for us.  This function is
+ * associated with init_timer to see if there is any console traffic.
+ * Obviously not used in interrupt mode
+ *
+ */
+static void sn_sal_timer_poll(unsigned long data)
+{
+        struct sn_cons_port *port = (struct sn_cons_port *)data;
+        unsigned long flags;
+
+        if (!port)
+                return;
+
+        if (!port->sc_port.irq) {
+                spin_lock_irqsave(&port->sc_port.lock, flags);
+                if (sn_process_input)
+                        sn_receive_chars(port, NULL, flags);
+                sn_transmit_chars(port, TRANSMIT_RAW);
+                spin_unlock_irqrestore(&port->sc_port.lock, flags);
+                mod_timer(&port->sc_timer,
+                          jiffies + port->sc_interrupt_timeout);
+        }
+}
+
+/*
+ * Boot-time initialization code
+ */
+
+/**
+ * sn_sal_switch_to_asynch - Switch to async mode (as opposed to synch)
+ * @port: Our sn_cons_port (which contains the uart port)
+ *
+ * So this is used by sn_sal_serial_console_init (early on, before we're
+ * registered with serial core).  It's also used by sn_sal_module_init
+ * right after we've registered with serial core.  The later only happens
+ * if we didn't already come through here via sn_sal_serial_console_init.
+ *
+ */
+static void __init sn_sal_switch_to_asynch(struct sn_cons_port *port)
+{
+        unsigned long flags;
+
+        if (!port)
+                return;
+
+        DPRINTF("sn_console: about to switch to asynchronous console\n");
+
+        /* without early_printk, we may be invoked late enough to race
+         * with other cpus doing console IO at this point, however
+         * console interrupts will never be enabled */
+        spin_lock_irqsave(&port->sc_port.lock, flags);
+
+        /* early_printk invocation may have done this for us */
+        if (!port->sc_ops)
+                port->sc_ops = &poll_ops;
+
+        /* we can't turn on the console interrupt (as request_irq
+         * calls kmalloc, which isn't set up yet), so we rely on a
+         * timer to poll for input and push data from the console
+         * buffer.
+         */
+        init_timer(&port->sc_timer);
+        port->sc_timer.function = sn_sal_timer_poll;
+        port->sc_timer.data = (unsigned long)port;
+
+        if (IS_RUNNING_ON_SIMULATOR())
+                port->sc_interrupt_timeout = 6;
+        else {
+                /* 960cps / 16 char FIFO = 60HZ
+                 * HZ / (SN_SAL_FIFO_SPEED_CPS / SN_SAL_FIFO_DEPTH) */
+                port->sc_interrupt_timeout =
+                    HZ * SN_SAL_UART_FIFO_DEPTH / SN_SAL_UART_FIFO_SPEED_CPS;
+        }
+        mod_timer(&port->sc_timer, jiffies + port->sc_interrupt_timeout);
+
+        port->sc_is_asynch = 1;
+        spin_unlock_irqrestore(&port->sc_port.lock, flags);
+}
+
+/**
+ * sn_sal_switch_to_interrupts - Switch to interrupt driven mode
+ * @port: Our sn_cons_port (which contains the uart port)
+ *
+ * In sn_sal_module_init, after we're registered with serial core and
+ * the port is added, this function is called to switch us to interrupt
+ * mode.  We were previously in asynch/polling mode (using init_timer).
+ *
+ * We attempt to switch to interrupt mode here by calling
+ * sn_sal_connect_interrupt.  If that works out, we enable receive interrupts.
+ */
+static void __init sn_sal_switch_to_interrupts(struct sn_cons_port *port)
+{
+        int irq;
+        unsigned long flags;
+
+        if (!port)
+                return;
+
+        DPRINTF("sn_console: switching to interrupt driven console\n");
+
+        spin_lock_irqsave(&port->sc_port.lock, flags);
+
+        irq = sn_sal_connect_interrupt(port);
+
+        if (irq) {
+                port->sc_port.irq = irq;
+                port->sc_ops = &intr_ops;
+
+                /* turn on receive interrupts */
+                ia64_sn_console_intr_enable(SAL_CONSOLE_INTR_RECV);
+        }
+        spin_unlock_irqrestore(&port->sc_port.lock, flags);
+}
+
+/*
+ * Kernel console definitions
+ */
+
+static void sn_sal_console_write(struct console *, const char *, unsigned);
+static int __init sn_sal_console_setup(struct console *, char *);
+extern struct uart_driver sal_console_uart;
+extern struct tty_driver *uart_console_device(struct console *, int *);
+
+static struct console sal_console = {
+        .name = DEVICE_NAME,
+        .write = sn_sal_console_write,
+        .device = uart_console_device,
+        .setup = sn_sal_console_setup,
+        .index = -1,            /* unspecified */
+        .data = &sal_console_uart,
+};
+
+#define SAL_CONSOLE     &sal_console
+
+struct uart_driver sal_console_uart = {
+        .owner = THIS_MODULE,
+        .driver_name = "sn_console",
+        .dev_name = DEVICE_NAME,
+        .major = 0,             /* major/minor set at registration time per USE_DYNAMIC_MINOR */
+        .minor = 0,
+        .nr = 1,                /* one port */
+        .cons = SAL_CONSOLE,
+};
+
+/**
+ * sn_sal_module_init - When the kernel loads us, get us rolling w/ serial core
+ *
+ * Before this is called, we've been printing kernel messages in a special
+ * early mode not making use of the serial core infrastructure.  When our
+ * driver is loaded for real, we register the driver and port with serial
+ * core and try to enable interrupt driven mode.
+ *
+ */
+static int __init sn_sal_module_init(void)
+{
+        int retval;
+
+        if (!ia64_platform_is("sn2"))
+                return -ENODEV;
+
+        printk(KERN_INFO "sn_console: Console driver init\n");
+
+        if (USE_DYNAMIC_MINOR == 1) {
+                misc.minor = MISC_DYNAMIC_MINOR;
+                misc.name = DEVICE_NAME_DYNAMIC;
+                retval = misc_register(&misc);
+                if (retval != 0) {
+                        printk
+                            ("Failed to register console device using misc_register.\n");
+                        return -ENODEV;
+                }
+                sal_console_uart.major = MISC_MAJOR;
+                sal_console_uart.minor = misc.minor;
+        } else {
+                sal_console_uart.major = DEVICE_MAJOR;
+                sal_console_uart.minor = DEVICE_MINOR;
+        }
+
+        /* We register the driver and the port before switching to interrupts
+         * or async above so the proper uart structures are populated */
+
+        if (uart_register_driver(&sal_console_uart) < 0) {
+                printk
+                    ("ERROR sn_sal_module_init failed uart_register_driver, line %d\n",
+                     __LINE__);
+                return -ENODEV;
+        }
+
+        spin_lock_init(&sal_console_port.sc_port.lock);
+
+        /* Setup the port struct with the minimum needed */
+        sal_console_port.sc_port.membase = (char *)1;   /* just needs to be non-zero */
+        sal_console_port.sc_port.type = PORT_16550A;
+        sal_console_port.sc_port.fifosize = SN_SAL_MAX_CHARS;
+        sal_console_port.sc_port.ops = &sn_console_ops;
+        sal_console_port.sc_port.line = 0;
+
+        if (uart_add_one_port(&sal_console_uart, &sal_console_port.sc_port) < 0) {
+                /* error - not sure what I'd do - so I'll do nothing */
+                printk(KERN_ERR "%s: unable to add port\n", __FUNCTION__);
+        }
+
+        /* when this driver is compiled in, the console initialization
+         * will have already switched us into asynchronous operation
+         * before we get here through the module initcalls */
+        if (!sal_console_port.sc_is_asynch) {
+                sn_sal_switch_to_asynch(&sal_console_port);
+        }
+
+        /* at this point (module_init) we can try to turn on interrupts */
+        if (!IS_RUNNING_ON_SIMULATOR()) {
+                sn_sal_switch_to_interrupts(&sal_console_port);
+        }
+        sn_process_input = 1;
+        return 0;
+}
+
+/**
+ * sn_sal_module_exit - When we're unloaded, remove the driver/port
+ *
+ */
+static void __exit sn_sal_module_exit(void)
+{
+        del_timer_sync(&sal_console_port.sc_timer);
+        uart_remove_one_port(&sal_console_uart, &sal_console_port.sc_port);
+        uart_unregister_driver(&sal_console_uart);
+        misc_deregister(&misc);
+}
+
+module_init(sn_sal_module_init);
+module_exit(sn_sal_module_exit);
+
+/**
+ * puts_raw_fixed - sn_sal_console_write helper for adding \r's as required
+ * @puts_raw : puts function to do the writing
+ * @s: input string
+ * @count: length
+ *
+ * We need a \r ahead of every \n for direct writes through
+ * ia64_sn_console_putb (what sal_puts_raw below actually does).
+ *
+ */
+
+static void puts_raw_fixed(int (*puts_raw) (const char *s, int len),
+                           const char *s, int count)
+{
+        const char *s1;
+
+        /* Output '\r' before each '\n' */
+        while ((s1 = memchr(s, '\n', count)) != NULL) {
+                puts_raw(s, s1 - s);
+                puts_raw("\r\n", 2);
+                count -= s1 + 1 - s;
+                s = s1 + 1;
+        }
+        puts_raw(s, count);
+}
+
+/**
+ * sn_sal_console_write - Print statements before serial core available
+ * @console: Console to operate on - we ignore since we have just one
+ * @s: String to send
+ * @count: length
+ *
+ * This is referenced in the console struct.  It is used for early
+ * console printing before we register with serial core and for things
+ * such as kdb.  The console_lock must be held when we get here.
+ *
+ * This function has some code for trying to print output even if the lock
+ * is held.  We try to cover the case where a lock holder could have died.
+ * We don't use this special case code if we're not registered with serial
+ * core yet.  After we're registered with serial core, the only time this
+ * function would be used is for high level kernel output like magic sys req,
+ * kdb, and printk's.
+ */
+static void
+sn_sal_console_write(struct console *co, const char *s, unsigned count)
+{
+        unsigned long flags = 0;
+        struct sn_cons_port *port = &sal_console_port;
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+        static int stole_lock = 0;
+#endif
+
+        BUG_ON(!port->sc_is_asynch);
+
+        /* We can't look at the xmit buffer if we're not registered with serial core
+         *  yet.  So only do the fancy recovery after registering
+         */
+        if (port->sc_port.info) {
+
+                /* somebody really wants this output, might be an
+                 * oops, kdb, panic, etc.  make sure they get it. */
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+                if (spin_is_locked(&port->sc_port.lock)) {
+                        int lhead = port->sc_port.info->xmit.head;
+                        int ltail = port->sc_port.info->xmit.tail;
+                        int counter, got_lock = 0;
+
+                        /*
+                         * We attempt to determine if someone has died with the
+                         * lock. We wait ~20 secs after the head and tail ptrs
+                         * stop moving and assume the lock holder is not functional
+                         * and plow ahead. If the lock is freed within the time out
+                         * period we re-get the lock and go ahead normally. We also
+                         * remember if we have plowed ahead so that we don't have
+                         * to wait out the time out period again - the asumption
+                         * is that we will time out again.
+                         */
+
+                        for (counter = 0; counter < 150; mdelay(125), counter++) {
+                                if (!spin_is_locked(&port->sc_port.lock)
+                                    || stole_lock) {
+                                        if (!stole_lock) {
+                                                spin_lock_irqsave(&port->
+                                                                  sc_port.lock,
+                                                                  flags);
+                                                got_lock = 1;
+                                        }
+                                        break;
+                                } else {
+                                        /* still locked */
+                                        if ((lhead !=
+                                             port->sc_port.info->xmit.head)
+                                            || (ltail !=
+                                                port->sc_port.info->xmit.
+                                                tail)) {
+                                                lhead =
+                                                    port->sc_port.info->xmit.
+                                                    head;
+                                                ltail =
+                                                    port->sc_port.info->xmit.
+                                                    tail;
+                                                counter = 0;
+                                        }
+                                }
+                        }
+                        /* flush anything in the serial core xmit buffer, raw */
+                        sn_transmit_chars(port, 1);
+                        if (got_lock) {
+                                spin_unlock_irqrestore(&port->sc_port.lock,
+                                                       flags);
+                                stole_lock = 0;
+                        } else {
+                                /* fell thru */
+                                stole_lock = 1;
+                        }
+                        puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
+                } else {
+                        stole_lock = 0;
+#endif
+                        spin_lock_irqsave(&port->sc_port.lock, flags);
+                        sn_transmit_chars(port, 1);
+                        spin_unlock_irqrestore(&port->sc_port.lock, flags);
+
+                        puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+                }
+#endif
+        }
+        else {
+                /* Not yet registered with serial core - simple case */
+                puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
+        }
+}
+
+
+/**
+ * sn_sal_console_setup - Set up console for early printing
+ * @co: Console to work with
+ * @options: Options to set
+ *
+ * Altix console doesn't do anything with baud rates, etc, anyway.
+ *
+ * This isn't required since not providing the setup function in the
+ * console struct is ok.  However, other patches like KDB plop something
+ * here so providing it is easier.
+ *
+ */
+static int __init sn_sal_console_setup(struct console *co, char *options)
+{
+        return 0;
+}
+
+/**
+ * sn_sal_console_write_early - simple early output routine
+ * @co - console struct
+ * @s - string to print
+ * @count - count
+ *
+ * Simple function to provide early output, before even
+ * sn_sal_serial_console_init is called.  Referenced in the
+ * console struct registerd in sn_serial_console_early_setup.
+ *
+ */
+static void __init
+sn_sal_console_write_early(struct console *co, const char *s, unsigned count)
+{
+        puts_raw_fixed(sal_console_port.sc_ops->sal_puts_raw, s, count);
+}
+
+/* Used for very early console printing - again, before
+ * sn_sal_serial_console_init is run */
+static struct console sal_console_early __initdata = {
+        .name = "sn_sal",
+        .write = sn_sal_console_write_early,
+        .flags = CON_PRINTBUFFER,
+        .index = -1,
+};
+
+/**
+ * sn_serial_console_early_setup - Sets up early console output support
+ *
+ * Register a console early on...  This is for output before even
+ * sn_sal_serial_cosnole_init is called.  This function is called from
+ * setup.c.  This allows us to do really early polled writes. When
+ * sn_sal_serial_console_init is called, this console is unregistered
+ * and a new one registered.
+ */
+int __init sn_serial_console_early_setup(void)
+{
+        if (!ia64_platform_is("sn2"))
+                return -1;
+
+        sal_console_port.sc_ops = &poll_ops;
+        early_sn_setup();       /* Find SAL entry points */
+        register_console(&sal_console_early);
+
+        return 0;
+}
+
+/**
+ * sn_sal_serial_console_init - Early console output - set up for register
+ *
+ * This function is called when regular console init happens.  Because we
+ * support even earlier console output with sn_serial_console_early_setup
+ * (called from setup.c directly), this function unregisters the really
+ * early console.
+ *
+ * Note: Even if setup.c doesn't register sal_console_early, unregistering
+ * it here doesn't hurt anything.
+ *
+ */
+static int __init sn_sal_serial_console_init(void)
+{
+        if (ia64_platform_is("sn2")) {
+                sn_sal_switch_to_asynch(&sal_console_port);
+                DPRINTF("sn_sal_serial_console_init : register console\n");
+                register_console(&sal_console);
+                unregister_console(&sal_console_early);
+        }
+        return 0;
+}
+
+console_initcall(sn_sal_serial_console_init);
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
new file mode 100644
index 000000000000..5fc4a62173d9
--- /dev/null
+++ b/drivers/serial/suncore.c
@@ -0,0 +1,218 @@
+/* suncore.c
+ *
+ * Common SUN serial routines.  Based entirely
+ * upon drivers/sbus/char/sunserial.c which is:
+ *
+ * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
+ *
+ * Adaptation to new UART layer is:
+ *
+ * Copyright (C) 2002 David S. Miller (davem@redhat.com)
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/init.h>
+
+#include <asm/oplib.h>
+
+#include "suncore.h"
+
+int sunserial_current_minor = 64;
+
+EXPORT_SYMBOL(sunserial_current_minor);
+
+void
+sunserial_console_termios(struct console *con)
+{
+        char mode[16], buf[16], *s;
+        char *mode_prop = "ttyX-mode";
+        char *cd_prop = "ttyX-ignore-cd";
+        char *dtr_prop = "ttyX-rts-dtr-off";
+        int baud, bits, stop, cflag;
+        char parity;
+        int carrier = 0;
+        int rtsdtr = 1;
+        int topnd, nd;
+
+        if (!serial_console)
+                return;
+
+        if (serial_console == 1) {
+                mode_prop[3] = 'a';
+                cd_prop[3] = 'a';
+                dtr_prop[3] = 'a';
+        } else {
+                mode_prop[3] = 'b';
+                cd_prop[3] = 'b';
+                dtr_prop[3] = 'b';
+        }
+
+        topnd = prom_getchild(prom_root_node);
+        nd = prom_searchsiblings(topnd, "options");
+        if (!nd) {
+                strcpy(mode, "9600,8,n,1,-");
+                goto no_options;
+        }
+
+        if (!prom_node_has_property(nd, mode_prop)) {
+                strcpy(mode, "9600,8,n,1,-");
+                goto no_options;
+        }
+
+        memset(mode, 0, sizeof(mode));
+        prom_getstring(nd, mode_prop, mode, sizeof(mode));
+
+        if (prom_node_has_property(nd, cd_prop)) {
+                memset(buf, 0, sizeof(buf));
+                prom_getstring(nd, cd_prop, buf, sizeof(buf));
+                if (!strcmp(buf, "false"))
+                        carrier = 1;
+
+                /* XXX: this is unused below. */
+        }
+
+        if (prom_node_has_property(nd, dtr_prop)) {
+                memset(buf, 0, sizeof(buf));
+                prom_getstring(nd, dtr_prop, buf, sizeof(buf));
+                if (!strcmp(buf, "false"))
+                        rtsdtr = 0;
+
+                /* XXX: this is unused below. */
+        }
+
+no_options:
+        cflag = CREAD | HUPCL | CLOCAL;
+
+        s = mode;
+        baud = simple_strtoul(s, NULL, 0);
+        s = strchr(s, ',');
+        bits = simple_strtoul(++s, NULL, 0);
+        s = strchr(s, ',');
+        parity = *(++s);
+        s = strchr(s, ',');
+        stop = simple_strtoul(++s, NULL, 0);
+        s = strchr(s, ',');
+        /* XXX handshake is not handled here. */
+
+        switch (baud) {
+                case 150: cflag |= B150; break;
+                case 300: cflag |= B300; break;
+                case 600: cflag |= B600; break;
+                case 1200: cflag |= B1200; break;
+                case 2400: cflag |= B2400; break;
+                case 4800: cflag |= B4800; break;
+                case 9600: cflag |= B9600; break;
+                case 19200: cflag |= B19200; break;
+                case 38400: cflag |= B38400; break;
+                default: baud = 9600; cflag |= B9600; break;
+        }
+
+        switch (bits) {
+                case 5: cflag |= CS5; break;
+                case 6: cflag |= CS6; break;
+                case 7: cflag |= CS7; break;
+                case 8: cflag |= CS8; break;
+                default: cflag |= CS8; break;
+        }
+
+        switch (parity) {
+                case 'o': cflag |= (PARENB | PARODD); break;
+                case 'e': cflag |= PARENB; break;
+                case 'n': default: break;
+        }
+
+        switch (stop) {
+                case 2: cflag |= CSTOPB; break;
+                case 1: default: break;
+        }
+
+        con->cflag = cflag;
+}
+
+EXPORT_SYMBOL(sunserial_console_termios);
+
+/* Sun serial MOUSE auto baud rate detection.  */
+static struct mouse_baud_cflag {
+        int baud;
+        unsigned int cflag;
+} mouse_baud_table[] = {
+        { 1200, B1200 },
+        { 2400, B2400 },
+        { 4800, B4800 },
+        { 9600, B9600 },
+        { -1, ~0 },
+        { -1, ~0 },
+};
+
+unsigned int suncore_mouse_baud_cflag_next(unsigned int cflag, int *new_baud)
+{
+        int i;
+
+        for (i = 0; mouse_baud_table[i].baud != -1; i++)
+                if (mouse_baud_table[i].cflag == (cflag & CBAUD))
+                        break;
+
+        i += 1;
+        if (mouse_baud_table[i].baud == -1)
+                i = 0;
+
+        *new_baud = mouse_baud_table[i].baud;
+        return mouse_baud_table[i].cflag;
+}
+
+EXPORT_SYMBOL(suncore_mouse_baud_cflag_next);
+
+/* Basically, when the baud rate is wrong the mouse spits out
+ * breaks to us.
+ */
+int suncore_mouse_baud_detection(unsigned char ch, int is_break)
+{
+        static int mouse_got_break = 0;
+        static int ctr = 0;
+
+        if (is_break) {
+                /* Let a few normal bytes go by before we jump the gun
+                 * and say we need to try another baud rate.
+                 */
+                if (mouse_got_break && ctr < 8)
+                        return 1;
+
+                /* Ok, we need to try another baud. */
+                ctr = 0;
+                mouse_got_break = 1;
+                return 2;
+        }
+        if (mouse_got_break) {
+                ctr++;
+                if (ch == 0x87) {
+                        /* Correct baud rate determined. */
+                        mouse_got_break = 0;
+                }
+                return 1;
+        }
+        return 0;
+}
+
+EXPORT_SYMBOL(suncore_mouse_baud_detection);
+
+static int __init suncore_init(void)
+{
+        return 0;
+}
+
+static void __exit suncore_exit(void)
+{
+}
+
+module_init(suncore_init);
+module_exit(suncore_exit);
+
+MODULE_AUTHOR("Eddie C. Dost, David S. Miller");
+MODULE_DESCRIPTION("Sun serial common layer");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/suncore.h b/drivers/serial/suncore.h
new file mode 100644
index 000000000000..513916a8ce37
--- /dev/null
+++ b/drivers/serial/suncore.h
@@ -0,0 +1,29 @@
+/* suncore.h
+ *
+ * Generic SUN serial/kbd/ms layer.  Based entirely
+ * upon drivers/sbus/char/sunserial.h which is:
+ *
+ * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
+ *
+ * Port to new UART layer is:
+ *
+ * Copyright (C) 2002 David S. Miller (davem@redhat.com)
+ */
+
+#ifndef _SERIAL_SUN_H
+#define _SERIAL_SUN_H
+
+/* Serial keyboard defines for L1-A processing... */
+#define SUNKBD_RESET            0xff
+#define SUNKBD_L1               0x01
+#define SUNKBD_UP               0x80
+#define SUNKBD_A                0x4d
+
+extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *);
+extern int suncore_mouse_baud_detection(unsigned char, int);
+
+extern int sunserial_current_minor;
+
+extern void sunserial_console_termios(struct console *);
+
+#endif /* !(_SERIAL_SUN_H) */
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
new file mode 100644
index 000000000000..8caaf2e5e47c
--- /dev/null
+++ b/drivers/serial/sunsab.c
@@ -0,0 +1,1171 @@
+/* sunsab.c: ASYNC Driver for the SIEMENS SAB82532 DUSCC.
+ *
+ * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
+ * Copyright (C) 2002  David S. Miller (davem@redhat.com)
+ *
+ * Rewrote buffer handling to use CIRC(Circular Buffer) macros.
+ *   Maxim Krasnyanskiy <maxk@qualcomm.com>
+ *
+ * Fixed to use tty_get_baud_rate, and to allow for arbitrary baud
+ * rates to be programmed into the UART.  Also eliminated a lot of
+ * duplicated code in the console setup.
+ *   Theodore Ts'o <tytso@mit.edu>, 2001-Oct-12
+ *
+ * Ported to new 2.5.x UART layer.
+ *   David S. Miller <davem@redhat.com>
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/ptrace.h>
+#include <linux/ioport.h>
+#include <linux/circ_buf.h>
+#include <linux/serial.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/oplib.h>
+#include <asm/ebus.h>
+
+#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+#include "suncore.h"
+#include "sunsab.h"
+
+struct uart_sunsab_port {
+        struct uart_port                port;           /* Generic UART port    */
+        union sab82532_async_regs       __iomem *regs;  /* Chip registers       */
+        unsigned long                   irqflags;       /* IRQ state flags      */
+        int                             dsr;            /* Current DSR state    */
+        unsigned int                    cec_timeout;    /* Chip poll timeout... */
+        unsigned int                    tec_timeout;    /* likewise             */
+        unsigned char                   interrupt_mask0;/* ISR0 masking         */
+        unsigned char                   interrupt_mask1;/* ISR1 masking         */
+        unsigned char                   pvr_dtr_bit;    /* Which PVR bit is DTR */
+        unsigned char                   pvr_dsr_bit;    /* Which PVR bit is DSR */
+        int                             type;           /* SAB82532 version     */
+};
+
+/*
+ * This assumes you have a 29.4912 MHz clock for your UART.
+ */
+#define SAB_BASE_BAUD ( 29491200 / 16 )
+
+static char *sab82532_version[16] = {
+        "V1.0", "V2.0", "V3.2", "V(0x03)",
+        "V(0x04)", "V(0x05)", "V(0x06)", "V(0x07)",
+        "V(0x08)", "V(0x09)", "V(0x0a)", "V(0x0b)",
+        "V(0x0c)", "V(0x0d)", "V(0x0e)", "V(0x0f)"
+};
+
+#define SAB82532_MAX_TEC_TIMEOUT 200000 /* 1 character time (at 50 baud) */
+#define SAB82532_MAX_CEC_TIMEOUT  50000 /* 2.5 TX CLKs (at 50 baud) */
+
+#define SAB82532_RECV_FIFO_SIZE 32      /* Standard async fifo sizes */
+#define SAB82532_XMIT_FIFO_SIZE 32
+
+static __inline__ void sunsab_tec_wait(struct uart_sunsab_port *up)
+{
+        int timeout = up->tec_timeout;
+
+        while ((readb(&up->regs->r.star) & SAB82532_STAR_TEC) && --timeout)
+                udelay(1);
+}
+
+static __inline__ void sunsab_cec_wait(struct uart_sunsab_port *up)
+{
+        int timeout = up->cec_timeout;
+
+        while ((readb(&up->regs->r.star) & SAB82532_STAR_CEC) && --timeout)
+                udelay(1);
+}
+
+static struct tty_struct *
+receive_chars(struct uart_sunsab_port *up,
+              union sab82532_irq_status *stat,
+              struct pt_regs *regs)
+{
+        struct tty_struct *tty = NULL;
+        unsigned char buf[32];
+        int saw_console_brk = 0;
+        int free_fifo = 0;
+        int count = 0;
+        int i;
+
+        if (up->port.info != NULL)              /* Unopened serial console */
+                tty = up->port.info->tty;
+
+        /* Read number of BYTES (Character + Status) available. */
+        if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
+                count = SAB82532_RECV_FIFO_SIZE;
+                free_fifo++;
+        }
+
+        if (stat->sreg.isr0 & SAB82532_ISR0_TCD) {
+                count = readb(&up->regs->r.rbcl) & (SAB82532_RECV_FIFO_SIZE - 1);
+                free_fifo++;
+        }
+
+        /* Issue a FIFO read command in case we where idle. */
+        if (stat->sreg.isr0 & SAB82532_ISR0_TIME) {
+                sunsab_cec_wait(up);
+                writeb(SAB82532_CMDR_RFRD, &up->regs->w.cmdr);
+                return tty;
+        }
+
+        if (stat->sreg.isr0 & SAB82532_ISR0_RFO)
+                free_fifo++;
+
+        /* Read the FIFO. */
+        for (i = 0; i < count; i++)
+                buf[i] = readb(&up->regs->r.rfifo[i]);
+
+        /* Issue Receive Message Complete command. */
+        if (free_fifo) {
+                sunsab_cec_wait(up);
+                writeb(SAB82532_CMDR_RMC, &up->regs->w.cmdr);
+        }
+
+        /* Count may be zero for BRK, so we check for it here */
+        if ((stat->sreg.isr1 & SAB82532_ISR1_BRK) &&
+            (up->port.line == up->port.cons->index))
+                saw_console_brk = 1;
+
+        for (i = 0; i < count; i++) {
+                unsigned char ch = buf[i];
+
+                if (tty == NULL) {
+                        uart_handle_sysrq_char(&up->port, ch, regs);
+                        continue;
+                }
+
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        tty->flip.work.func((void *)tty);
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                return tty; // if TTY_DONT_FLIP is set
+                }
+
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(stat->sreg.isr0 & (SAB82532_ISR0_PERR |
+                                                SAB82532_ISR0_FERR |
+                                                SAB82532_ISR0_RFO)) ||
+                    unlikely(stat->sreg.isr1 & SAB82532_ISR1_BRK)) {
+                        /*
+                         * For statistics only
+                         */
+                        if (stat->sreg.isr1 & SAB82532_ISR1_BRK) {
+                                stat->sreg.isr0 &= ~(SAB82532_ISR0_PERR |
+                                                     SAB82532_ISR0_FERR);
+                                up->port.icount.brk++;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        continue;
+                        } else if (stat->sreg.isr0 & SAB82532_ISR0_PERR)
+                                up->port.icount.parity++;
+                        else if (stat->sreg.isr0 & SAB82532_ISR0_FERR)
+                                up->port.icount.frame++;
+                        if (stat->sreg.isr0 & SAB82532_ISR0_RFO)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ingored.
+                         */
+                        stat->sreg.isr0 &= (up->port.read_status_mask & 0xff);
+                        stat->sreg.isr1 &= ((up->port.read_status_mask >> 8) & 0xff);
+
+                        if (stat->sreg.isr1 & SAB82532_ISR1_BRK) {
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        } else if (stat->sreg.isr0 & SAB82532_ISR0_PERR)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (stat->sreg.isr0 & SAB82532_ISR0_FERR)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        continue;
+
+                if ((stat->sreg.isr0 & (up->port.ignore_status_mask & 0xff)) == 0 &&
+                    (stat->sreg.isr1 & ((up->port.ignore_status_mask >> 8) & 0xff)) == 0){
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((stat->sreg.isr0 & SAB82532_ISR0_RFO) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        }
+
+        if (saw_console_brk)
+                sun_do_break();
+
+        return tty;
+}
+
+static void sunsab_stop_tx(struct uart_port *, unsigned int);
+
+static void transmit_chars(struct uart_sunsab_port *up,
+                           union sab82532_irq_status *stat)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int i;
+
+        if (stat->sreg.isr1 & SAB82532_ISR1_ALLS) {
+                up->interrupt_mask1 |= SAB82532_IMR1_ALLS;
+                writeb(up->interrupt_mask1, &up->regs->w.imr1);
+                set_bit(SAB82532_ALLS, &up->irqflags);
+        }
+
+#if 0 /* bde@nwlink.com says this check causes problems */
+        if (!(stat->sreg.isr1 & SAB82532_ISR1_XPR))
+                return;
+#endif
+
+        if (!(readb(&up->regs->r.star) & SAB82532_STAR_XFW))
+                return;
+
+        set_bit(SAB82532_XPR, &up->irqflags);
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                up->interrupt_mask1 |= SAB82532_IMR1_XPR;
+                writeb(up->interrupt_mask1, &up->regs->w.imr1);
+                uart_write_wakeup(&up->port);
+                return;
+        }
+
+        up->interrupt_mask1 &= ~(SAB82532_IMR1_ALLS|SAB82532_IMR1_XPR);
+        writeb(up->interrupt_mask1, &up->regs->w.imr1);
+        clear_bit(SAB82532_ALLS, &up->irqflags);
+
+        /* Stuff 32 bytes into Transmit FIFO. */
+        clear_bit(SAB82532_XPR, &up->irqflags);
+        for (i = 0; i < up->port.fifosize; i++) {
+                writeb(xmit->buf[xmit->tail],
+                       &up->regs->w.xfifo[i]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        }
+
+        /* Issue a Transmit Frame command. */
+        sunsab_cec_wait(up);
+        writeb(SAB82532_CMDR_XF, &up->regs->w.cmdr);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        if (uart_circ_empty(xmit))
+                sunsab_stop_tx(&up->port, 0);
+}
+
+static void check_status(struct uart_sunsab_port *up,
+                         union sab82532_irq_status *stat)
+{
+        if (stat->sreg.isr0 & SAB82532_ISR0_CDSC)
+                uart_handle_dcd_change(&up->port,
+                                       !(readb(&up->regs->r.vstr) & SAB82532_VSTR_CD));
+
+        if (stat->sreg.isr1 & SAB82532_ISR1_CSC)
+                uart_handle_cts_change(&up->port,
+                                       (readb(&up->regs->r.star) & SAB82532_STAR_CTS));
+
+        if ((readb(&up->regs->r.pvr) & up->pvr_dsr_bit) ^ up->dsr) {
+                up->dsr = (readb(&up->regs->r.pvr) & up->pvr_dsr_bit) ? 0 : 1;
+                up->port.icount.dsr++;
+        }
+
+        wake_up_interruptible(&up->port.info->delta_msr_wait);
+}
+
+static irqreturn_t sunsab_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_sunsab_port *up = dev_id;
+        struct tty_struct *tty;
+        union sab82532_irq_status status;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        status.stat = 0;
+        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISA0)
+                status.sreg.isr0 = readb(&up->regs->r.isr0);
+        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISA1)
+                status.sreg.isr1 = readb(&up->regs->r.isr1);
+
+        tty = NULL;
+        if (status.stat) {
+                if ((status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
+                                         SAB82532_ISR0_RFO | SAB82532_ISR0_RPF)) ||
+                    (status.sreg.isr1 & SAB82532_ISR1_BRK))
+                        tty = receive_chars(up, &status, regs);
+                if ((status.sreg.isr0 & SAB82532_ISR0_CDSC) ||
+                    (status.sreg.isr1 & SAB82532_ISR1_CSC))
+                        check_status(up, &status);
+                if (status.sreg.isr1 & (SAB82532_ISR1_ALLS | SAB82532_ISR1_XPR))
+                        transmit_chars(up, &status);
+        }
+
+        spin_unlock(&up->port.lock);
+
+        if (tty)
+                tty_flip_buffer_push(tty);
+
+        up++;
+
+        spin_lock(&up->port.lock);
+
+        status.stat = 0;
+        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISB0)
+                status.sreg.isr0 = readb(&up->regs->r.isr0);
+        if (readb(&up->regs->r.gis) & SAB82532_GIS_ISB1)
+                status.sreg.isr1 = readb(&up->regs->r.isr1);
+
+        tty = NULL;
+        if (status.stat) {
+                if ((status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
+                                         SAB82532_ISR0_RFO | SAB82532_ISR0_RPF)) ||
+                    (status.sreg.isr1 & SAB82532_ISR1_BRK))
+
+                        tty = receive_chars(up, &status, regs);
+                if ((status.sreg.isr0 & SAB82532_ISR0_CDSC) ||
+                    (status.sreg.isr1 & (SAB82532_ISR1_BRK | SAB82532_ISR1_CSC)))
+                        check_status(up, &status);
+                if (status.sreg.isr1 & (SAB82532_ISR1_ALLS | SAB82532_ISR1_XPR))
+                        transmit_chars(up, &status);
+        }
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        if (tty)
+                tty_flip_buffer_push(tty);
+
+        return IRQ_HANDLED;
+}
+
+/* port->lock is not held.  */
+static unsigned int sunsab_tx_empty(struct uart_port *port)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        int ret;
+
+        /* Do not need a lock for a state test like this.  */
+        if (test_bit(SAB82532_ALLS, &up->irqflags))
+                ret = TIOCSER_TEMT;
+        else
+                ret = 0;
+
+        return ret;
+}
+
+/* port->lock held by caller.  */
+static void sunsab_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+
+        if (mctrl & TIOCM_RTS) {
+                writeb(readb(&up->regs->rw.mode) & ~SAB82532_MODE_FRTS,
+                       &up->regs->rw.mode);
+                writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_RTS,
+                       &up->regs->rw.mode);
+        } else {
+                writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_FRTS,
+                       &up->regs->rw.mode);
+                writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_RTS,
+                       &up->regs->rw.mode);
+        }
+        if (mctrl & TIOCM_DTR) {
+                writeb(readb(&up->regs->rw.pvr) & ~(up->pvr_dtr_bit), &up->regs->rw.pvr);
+        } else {
+                writeb(readb(&up->regs->rw.pvr) | up->pvr_dtr_bit, &up->regs->rw.pvr);
+        }
+}
+
+/* port->lock is not held.  */
+static unsigned int sunsab_get_mctrl(struct uart_port *port)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        unsigned long flags;
+        unsigned char val;
+        unsigned int result;
+
+        result = 0;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        val = readb(&up->regs->r.pvr);
+        result |= (val & up->pvr_dsr_bit) ? 0 : TIOCM_DSR;
+
+        val = readb(&up->regs->r.vstr);
+        result |= (val & SAB82532_VSTR_CD) ? 0 : TIOCM_CAR;
+
+        val = readb(&up->regs->r.star);
+        result |= (val & SAB82532_STAR_CTS) ? TIOCM_CTS : 0;
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return result;
+}
+
+/* port->lock held by caller.  */
+static void sunsab_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+
+        up->interrupt_mask1 |= SAB82532_IMR1_XPR;
+        writeb(up->interrupt_mask1, &up->regs->w.imr1);
+}
+
+/* port->lock held by caller.  */
+static void sunsab_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int i;
+
+        up->interrupt_mask1 &= ~(SAB82532_IMR1_ALLS|SAB82532_IMR1_XPR);
+        writeb(up->interrupt_mask1, &up->regs->w.imr1);
+        
+        if (!test_bit(SAB82532_XPR, &up->irqflags))
+                return;
+
+        clear_bit(SAB82532_ALLS, &up->irqflags);
+        clear_bit(SAB82532_XPR, &up->irqflags);
+
+        for (i = 0; i < up->port.fifosize; i++) {
+                writeb(xmit->buf[xmit->tail],
+                       &up->regs->w.xfifo[i]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        }
+
+        /* Issue a Transmit Frame command.  */
+        sunsab_cec_wait(up);
+        writeb(SAB82532_CMDR_XF, &up->regs->w.cmdr);
+}
+
+/* port->lock is not held.  */
+static void sunsab_send_xchar(struct uart_port *port, char ch)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        sunsab_tec_wait(up);
+        writeb(ch, &up->regs->w.tic);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+/* port->lock held by caller.  */
+static void sunsab_stop_rx(struct uart_port *port)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+
+        up->interrupt_mask0 |= SAB82532_ISR0_TCD;
+        writeb(up->interrupt_mask1, &up->regs->w.imr0);
+}
+
+/* port->lock held by caller.  */
+static void sunsab_enable_ms(struct uart_port *port)
+{
+        /* For now we always receive these interrupts.  */
+}
+
+/* port->lock is not held.  */
+static void sunsab_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        unsigned long flags;
+        unsigned char val;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        val = readb(&up->regs->rw.dafo);
+        if (break_state)
+                val |= SAB82532_DAFO_XBRK;
+        else
+                val &= ~SAB82532_DAFO_XBRK;
+        writeb(val, &up->regs->rw.dafo);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+/* port->lock is not held.  */
+static int sunsab_startup(struct uart_port *port)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        unsigned long flags;
+        unsigned char tmp;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Wait for any commands or immediate characters
+         */
+        sunsab_cec_wait(up);
+        sunsab_tec_wait(up);
+
+        /*
+         * Clear the FIFO buffers.
+         */
+        writeb(SAB82532_CMDR_RRES, &up->regs->w.cmdr);
+        sunsab_cec_wait(up);
+        writeb(SAB82532_CMDR_XRES, &up->regs->w.cmdr);
+
+        /*
+         * Clear the interrupt registers.
+         */
+        (void) readb(&up->regs->r.isr0);
+        (void) readb(&up->regs->r.isr1);
+
+        /*
+         * Now, initialize the UART 
+         */
+        writeb(0, &up->regs->w.ccr0);                           /* power-down */
+        writeb(SAB82532_CCR0_MCE | SAB82532_CCR0_SC_NRZ |
+               SAB82532_CCR0_SM_ASYNC, &up->regs->w.ccr0);
+        writeb(SAB82532_CCR1_ODS | SAB82532_CCR1_BCR | 7, &up->regs->w.ccr1);
+        writeb(SAB82532_CCR2_BDF | SAB82532_CCR2_SSEL |
+               SAB82532_CCR2_TOE, &up->regs->w.ccr2);
+        writeb(0, &up->regs->w.ccr3);
+        writeb(SAB82532_CCR4_MCK4 | SAB82532_CCR4_EBRG, &up->regs->w.ccr4);
+        writeb(SAB82532_MODE_RTS | SAB82532_MODE_FCTS |
+               SAB82532_MODE_RAC, &up->regs->w.mode);
+        writeb(SAB82532_RFC_DPS|SAB82532_RFC_RFTH_32, &up->regs->w.rfc);
+        
+        tmp = readb(&up->regs->rw.ccr0);
+        tmp |= SAB82532_CCR0_PU;        /* power-up */
+        writeb(tmp, &up->regs->rw.ccr0);
+
+        /*
+         * Finally, enable interrupts
+         */
+        up->interrupt_mask0 = (SAB82532_IMR0_PERR | SAB82532_IMR0_FERR |
+                               SAB82532_IMR0_PLLA);
+        writeb(up->interrupt_mask0, &up->regs->w.imr0);
+        up->interrupt_mask1 = (SAB82532_IMR1_BRKT | SAB82532_IMR1_ALLS |
+                               SAB82532_IMR1_XOFF | SAB82532_IMR1_TIN |
+                               SAB82532_IMR1_CSC | SAB82532_IMR1_XON |
+                               SAB82532_IMR1_XPR);
+        writeb(up->interrupt_mask1, &up->regs->w.imr1);
+        set_bit(SAB82532_ALLS, &up->irqflags);
+        set_bit(SAB82532_XPR, &up->irqflags);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return 0;
+}
+
+/* port->lock is not held.  */
+static void sunsab_shutdown(struct uart_port *port)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        unsigned long flags;
+        unsigned char tmp;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /* Disable Interrupts */
+        up->interrupt_mask0 = 0xff;
+        writeb(up->interrupt_mask0, &up->regs->w.imr0);
+        up->interrupt_mask1 = 0xff;
+        writeb(up->interrupt_mask1, &up->regs->w.imr1);
+
+        /* Disable break condition */
+        tmp = readb(&up->regs->rw.dafo);
+        tmp &= ~SAB82532_DAFO_XBRK;
+        writeb(tmp, &up->regs->rw.dafo);
+
+        /* Disable Receiver */  
+        tmp = readb(&up->regs->rw.mode);
+        tmp &= ~SAB82532_MODE_RAC;
+        writeb(tmp, &up->regs->rw.mode);
+
+        /*
+         * XXX FIXME
+         *
+         * If the chip is powered down here the system hangs/crashes during
+         * reboot or shutdown.  This needs to be investigated further,
+         * similar behaviour occurs in 2.4 when the driver is configured
+         * as a module only.  One hint may be that data is sometimes
+         * transmitted at 9600 baud during shutdown (regardless of the
+         * speed the chip was configured for when the port was open).
+         */
+#if 0
+        /* Power Down */        
+        tmp = readb(&up->regs->rw.ccr0);
+        tmp &= ~SAB82532_CCR0_PU;
+        writeb(tmp, &up->regs->rw.ccr0);
+#endif
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+/*
+ * This is used to figure out the divisor speeds.
+ *
+ * The formula is:    Baud = SAB_BASE_BAUD / ((N + 1) * (1 << M)),
+ *
+ * with               0 <= N < 64 and 0 <= M < 16
+ */
+
+static void calc_ebrg(int baud, int *n_ret, int *m_ret)
+{
+        int     n, m;
+
+        if (baud == 0) {
+                *n_ret = 0;
+                *m_ret = 0;
+                return;
+        }
+     
+        /*
+         * We scale numbers by 10 so that we get better accuracy
+         * without having to use floating point.  Here we increment m
+         * until n is within the valid range.
+         */
+        n = (SAB_BASE_BAUD * 10) / baud;
+        m = 0;
+        while (n >= 640) {
+                n = n / 2;
+                m++;
+        }
+        n = (n+5) / 10;
+        /*
+         * We try very hard to avoid speeds with M == 0 since they may
+         * not work correctly for XTAL frequences above 10 MHz.
+         */
+        if ((m == 0) && ((n & 1) == 0)) {
+                n = n / 2;
+                m++;
+        }
+        *n_ret = n - 1;
+        *m_ret = m;
+}
+
+/* Internal routine, port->lock is held and local interrupts are disabled.  */
+static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cflag,
+                                  unsigned int iflag, int baud)
+{
+        unsigned int ebrg;
+        unsigned char dafo;
+        int bits, n, m;
+
+        /* Byte size and parity */
+        switch (cflag & CSIZE) {
+              case CS5: dafo = SAB82532_DAFO_CHL5; bits = 7; break;
+              case CS6: dafo = SAB82532_DAFO_CHL6; bits = 8; break;
+              case CS7: dafo = SAB82532_DAFO_CHL7; bits = 9; break;
+              case CS8: dafo = SAB82532_DAFO_CHL8; bits = 10; break;
+              /* Never happens, but GCC is too dumb to figure it out */
+              default:  dafo = SAB82532_DAFO_CHL5; bits = 7; break;
+        }
+
+        if (cflag & CSTOPB) {
+                dafo |= SAB82532_DAFO_STOP;
+                bits++;
+        }
+
+        if (cflag & PARENB) {
+                dafo |= SAB82532_DAFO_PARE;
+                bits++;
+        }
+
+        if (cflag & PARODD) {
+                dafo |= SAB82532_DAFO_PAR_ODD;
+        } else {
+                dafo |= SAB82532_DAFO_PAR_EVEN;
+        }
+
+        calc_ebrg(baud, &n, &m);
+
+        ebrg = n | (m << 6);
+
+        up->tec_timeout = (10 * 1000000) / baud;
+        up->cec_timeout = up->tec_timeout >> 2;
+
+        /* CTS flow control flags */
+        /* We encode read_status_mask and ignore_status_mask like so:
+         *
+         * ---------------------
+         * | ... | ISR1 | ISR0 |
+         * ---------------------
+         *  ..    15   8 7    0
+         */
+
+        up->port.read_status_mask = (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
+                                     SAB82532_ISR0_RFO | SAB82532_ISR0_RPF |
+                                     SAB82532_ISR0_CDSC);
+        up->port.read_status_mask |= (SAB82532_ISR1_CSC |
+                                      SAB82532_ISR1_ALLS |
+                                      SAB82532_ISR1_XPR) << 8;
+        if (iflag & INPCK)
+                up->port.read_status_mask |= (SAB82532_ISR0_PERR |
+                                              SAB82532_ISR0_FERR);
+        if (iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= (SAB82532_ISR1_BRK << 8);
+
+        /*
+         * Characteres to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (iflag & IGNPAR)
+                up->port.ignore_status_mask |= (SAB82532_ISR0_PERR |
+                                                SAB82532_ISR0_FERR);
+        if (iflag & IGNBRK) {
+                up->port.ignore_status_mask |= (SAB82532_ISR1_BRK << 8);
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (iflag & IGNPAR)
+                        up->port.ignore_status_mask |= SAB82532_ISR0_RFO;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= (SAB82532_ISR0_RPF |
+                                                SAB82532_ISR0_TCD);
+
+        /* Now bang the new settings into the chip.  */
+        sunsab_cec_wait(up);
+        sunsab_tec_wait(up);
+        writeb(dafo, &up->regs->w.dafo);
+        writeb(ebrg & 0xff, &up->regs->w.bgr);
+        writeb((readb(&up->regs->rw.ccr2) & ~0xc0) | ((ebrg >> 2) & 0xc0),
+               &up->regs->rw.ccr2);
+
+        writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_RAC, &up->regs->rw.mode);
+
+}
+
+/* port->lock is not held.  */
+static void sunsab_set_termios(struct uart_port *port, struct termios *termios,
+                               struct termios *old)
+{
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+        unsigned long flags;
+        int baud = uart_get_baud_rate(port, termios, old, 0, 4000000);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        sunsab_convert_to_sab(up, termios->c_cflag, termios->c_iflag, baud);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static const char *sunsab_type(struct uart_port *port)
+{
+        struct uart_sunsab_port *up = (void *)port;
+        static char buf[36];
+        
+        sprintf(buf, "SAB82532 %s", sab82532_version[up->type]);
+        return buf;
+}
+
+static void sunsab_release_port(struct uart_port *port)
+{
+}
+
+static int sunsab_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static void sunsab_config_port(struct uart_port *port, int flags)
+{
+}
+
+static int sunsab_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        return -EINVAL;
+}
+
+static struct uart_ops sunsab_pops = {
+        .tx_empty       = sunsab_tx_empty,
+        .set_mctrl      = sunsab_set_mctrl,
+        .get_mctrl      = sunsab_get_mctrl,
+        .stop_tx        = sunsab_stop_tx,
+        .start_tx       = sunsab_start_tx,
+        .send_xchar     = sunsab_send_xchar,
+        .stop_rx        = sunsab_stop_rx,
+        .enable_ms      = sunsab_enable_ms,
+        .break_ctl      = sunsab_break_ctl,
+        .startup        = sunsab_startup,
+        .shutdown       = sunsab_shutdown,
+        .set_termios    = sunsab_set_termios,
+        .type           = sunsab_type,
+        .release_port   = sunsab_release_port,
+        .request_port   = sunsab_request_port,
+        .config_port    = sunsab_config_port,
+        .verify_port    = sunsab_verify_port,
+};
+
+static struct uart_driver sunsab_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial",
+        .devfs_name             = "tts/",
+        .dev_name               = "ttyS",
+        .major                  = TTY_MAJOR,
+};
+
+static struct uart_sunsab_port *sunsab_ports;
+static int num_channels;
+
+#ifdef CONFIG_SERIAL_SUNSAB_CONSOLE
+
+static __inline__ void sunsab_console_putchar(struct uart_sunsab_port *up, char c)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        sunsab_tec_wait(up);
+        writeb(c, &up->regs->w.tic);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void sunsab_console_write(struct console *con, const char *s, unsigned n)
+{
+        struct uart_sunsab_port *up = &sunsab_ports[con->index];
+        int i;
+
+        for (i = 0; i < n; i++) {
+                if (*s == '\n')
+                        sunsab_console_putchar(up, '\r');
+                sunsab_console_putchar(up, *s++);
+        }
+        sunsab_tec_wait(up);
+}
+
+static int sunsab_console_setup(struct console *con, char *options)
+{
+        struct uart_sunsab_port *up = &sunsab_ports[con->index];
+        unsigned long flags;
+        int baud;
+
+        printk("Console: ttyS%d (SAB82532)\n",
+               (sunsab_reg.minor - 64) + con->index);
+
+        sunserial_console_termios(con);
+
+        /* Firmware console speed is limited to 150-->38400 baud so
+         * this hackish cflag thing is OK.
+         */
+        switch (con->cflag & CBAUD) {
+        case B150: baud = 150; break;
+        case B300: baud = 300; break;
+        case B600: baud = 600; break;
+        case B1200: baud = 1200; break;
+        case B2400: baud = 2400; break;
+        case B4800: baud = 4800; break;
+        default: case B9600: baud = 9600; break;
+        case B19200: baud = 19200; break;
+        case B38400: baud = 38400; break;
+        };
+
+        /*
+         * Temporary fix.
+         */
+        spin_lock_init(&up->port.lock);
+
+        /*
+         * Initialize the hardware
+         */
+        sunsab_startup(&up->port);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Finally, enable interrupts
+         */
+        up->interrupt_mask0 = SAB82532_IMR0_PERR | SAB82532_IMR0_FERR |
+                                SAB82532_IMR0_PLLA | SAB82532_IMR0_CDSC;
+        writeb(up->interrupt_mask0, &up->regs->w.imr0);
+        up->interrupt_mask1 = SAB82532_IMR1_BRKT | SAB82532_IMR1_ALLS |
+                                SAB82532_IMR1_XOFF | SAB82532_IMR1_TIN |
+                                SAB82532_IMR1_CSC | SAB82532_IMR1_XON |
+                                SAB82532_IMR1_XPR;
+        writeb(up->interrupt_mask1, &up->regs->w.imr1);
+
+        sunsab_convert_to_sab(up, con->cflag, 0, baud);
+        sunsab_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+        
+        return 0;
+}
+
+static struct console sunsab_console = {
+        .name   =       "ttyS",
+        .write  =       sunsab_console_write,
+        .device =       uart_console_device,
+        .setup  =       sunsab_console_setup,
+        .flags  =       CON_PRINTBUFFER,
+        .index  =       -1,
+        .data   =       &sunsab_reg,
+};
+#define SUNSAB_CONSOLE  (&sunsab_console)
+
+static void __init sunsab_console_init(void)
+{
+        int i;
+
+        if (con_is_present())
+                return;
+
+        for (i = 0; i < num_channels; i++) {
+                int this_minor = sunsab_reg.minor + i;
+
+                if ((this_minor - 64) == (serial_console - 1))
+                        break;
+        }
+        if (i == num_channels)
+                return;
+
+        sunsab_console.index = i;
+        register_console(&sunsab_console);
+}
+#else
+#define SUNSAB_CONSOLE          (NULL)
+#define sunsab_console_init()   do { } while (0)
+#endif
+
+static void __init for_each_sab_edev(void (*callback)(struct linux_ebus_device *, void *), void *arg)
+{
+        struct linux_ebus *ebus;
+        struct linux_ebus_device *edev = NULL;
+
+        for_each_ebus(ebus) {
+                for_each_ebusdev(edev, ebus) {
+                        if (!strcmp(edev->prom_name, "se")) {
+                                callback(edev, arg);
+                                continue;
+                        } else if (!strcmp(edev->prom_name, "serial")) {
+                                char compat[32];
+                                int clen;
+
+                                /* On RIO this can be an SE, check it.  We could
+                                 * just check ebus->is_rio, but this is more portable.
+                                 */
+                                clen = prom_getproperty(edev->prom_node, "compatible",
+                                                        compat, sizeof(compat));
+                                if (clen > 0) {
+                                        if (strncmp(compat, "sab82532", 8) == 0) {
+                                                callback(edev, arg);
+                                                continue;
+                                        }
+                                }
+                        }
+                }
+        }
+}
+
+static void __init sab_count_callback(struct linux_ebus_device *edev, void *arg)
+{
+        int *count_p = arg;
+
+        (*count_p)++;
+}
+
+static void __init sab_attach_callback(struct linux_ebus_device *edev, void *arg)
+{
+        int *instance_p = arg;
+        struct uart_sunsab_port *up;
+        unsigned long regs, offset;
+        int i;
+
+        /* Note: ports are located in reverse order */
+        regs = edev->resource[0].start;
+        offset = sizeof(union sab82532_async_regs);
+        for (i = 0; i < 2; i++) {
+                up = &sunsab_ports[(*instance_p * 2) + 1 - i];
+
+                memset(up, 0, sizeof(*up));
+                up->regs = ioremap(regs + offset, sizeof(union sab82532_async_regs));
+                up->port.irq = edev->irqs[0];
+                up->port.fifosize = SAB82532_XMIT_FIFO_SIZE;
+                up->port.mapbase = (unsigned long)up->regs;
+                up->port.iotype = SERIAL_IO_MEM;
+
+                writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc);
+
+                offset -= sizeof(union sab82532_async_regs);
+        }
+        
+        (*instance_p)++;
+}
+
+static int __init probe_for_sabs(void)
+{
+        int this_sab = 0;
+
+        /* Find device instances.  */
+        for_each_sab_edev(&sab_count_callback, &this_sab);
+        if (!this_sab)
+                return -ENODEV;
+
+        /* Allocate tables.  */
+        sunsab_ports = kmalloc(sizeof(struct uart_sunsab_port) * this_sab * 2,
+                               GFP_KERNEL);
+        if (!sunsab_ports)
+                return -ENOMEM;
+
+        num_channels = this_sab * 2;
+
+        this_sab = 0;
+        for_each_sab_edev(&sab_attach_callback, &this_sab);
+        return 0;
+}
+
+static void __init sunsab_init_hw(void)
+{
+        int i;
+
+        for (i = 0; i < num_channels; i++) {
+                struct uart_sunsab_port *up = &sunsab_ports[i];
+
+                up->port.line = i;
+                up->port.ops = &sunsab_pops;
+                up->port.type = PORT_SUNSAB;
+                up->port.uartclk = SAB_BASE_BAUD;
+
+                up->type = readb(&up->regs->r.vstr) & 0x0f;
+                writeb(~((1 << 1) | (1 << 2) | (1 << 4)), &up->regs->w.pcr);
+                writeb(0xff, &up->regs->w.pim);
+                if (up->port.line == 0) {
+                        up->pvr_dsr_bit = (1 << 0);
+                        up->pvr_dtr_bit = (1 << 1);
+                } else {
+                        up->pvr_dsr_bit = (1 << 3);
+                        up->pvr_dtr_bit = (1 << 2);
+                }
+                writeb((1 << 1) | (1 << 2) | (1 << 4), &up->regs->w.pvr);
+                writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_FRTS,
+                       &up->regs->rw.mode);
+                writeb(readb(&up->regs->rw.mode) | SAB82532_MODE_RTS,
+                       &up->regs->rw.mode);
+
+                up->tec_timeout = SAB82532_MAX_TEC_TIMEOUT;
+                up->cec_timeout = SAB82532_MAX_CEC_TIMEOUT;
+
+                if (!(up->port.line & 0x01)) {
+                        if (request_irq(up->port.irq, sunsab_interrupt,
+                                        SA_SHIRQ, "serial(sab82532)", up)) {
+                                printk("sunsab%d: can't get IRQ %x\n",
+                                       i, up->port.irq);
+                                continue;
+                        }
+                }
+        }
+}
+
+static int __init sunsab_init(void)
+{
+        int ret = probe_for_sabs();
+        int i;
+
+        if (ret < 0)
+                return ret;
+
+        sunsab_init_hw();
+
+        sunsab_reg.minor = sunserial_current_minor;
+        sunsab_reg.nr = num_channels;
+        sunsab_reg.cons = SUNSAB_CONSOLE;
+
+        ret = uart_register_driver(&sunsab_reg);
+        if (ret < 0) {
+                int i;
+
+                for (i = 0; i < num_channels; i++) {
+                        struct uart_sunsab_port *up = &sunsab_ports[i];
+
+                        if (!(up->port.line & 0x01))
+                                free_irq(up->port.irq, up);
+                        iounmap(up->regs);
+                }
+                kfree(sunsab_ports);
+                sunsab_ports = NULL;
+
+                return ret;
+        }
+
+        sunserial_current_minor += num_channels;
+        
+        sunsab_console_init();
+
+        for (i = 0; i < num_channels; i++) {
+                struct uart_sunsab_port *up = &sunsab_ports[i];
+
+                uart_add_one_port(&sunsab_reg, &up->port);
+        }
+
+        return 0;
+}
+
+static void __exit sunsab_exit(void)
+{
+        int i;
+
+        for (i = 0; i < num_channels; i++) {
+                struct uart_sunsab_port *up = &sunsab_ports[i];
+
+                uart_remove_one_port(&sunsab_reg, &up->port);
+
+                if (!(up->port.line & 0x01))
+                        free_irq(up->port.irq, up);
+                iounmap(up->regs);
+        }
+
+        sunserial_current_minor -= num_channels;
+        uart_unregister_driver(&sunsab_reg);
+
+        kfree(sunsab_ports);
+        sunsab_ports = NULL;
+}
+
+module_init(sunsab_init);
+module_exit(sunsab_exit);
+
+MODULE_AUTHOR("Eddie C. Dost and David S. Miller");
+MODULE_DESCRIPTION("Sun SAB82532 serial port driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/sunsab.h b/drivers/serial/sunsab.h
new file mode 100644
index 000000000000..686086fcbbf5
--- /dev/null
+++ b/drivers/serial/sunsab.h
@@ -0,0 +1,321 @@
+/* sunsab.h: Register Definitions for the Siemens SAB82532 DUSCC
+ *
+ * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
+ */
+
+#ifndef _SUNSAB_H
+#define _SUNSAB_H
+
+struct sab82532_async_rd_regs {
+        u8      rfifo[0x20];    /* Receive FIFO                         */
+        u8      star;           /* Status Register                      */
+        u8      __pad1;
+        u8      mode;           /* Mode Register                        */
+        u8      timr;           /* Timer Register                       */
+        u8      xon;            /* XON Character                        */
+        u8      xoff;           /* XOFF Character                       */
+        u8      tcr;            /* Termination Character Register       */
+        u8      dafo;           /* Data Format                          */
+        u8      rfc;            /* RFIFO Control Register               */
+        u8      __pad2;
+        u8      rbcl;           /* Receive Byte Count Low               */
+        u8      rbch;           /* Receive Byte Count High              */
+        u8      ccr0;           /* Channel Configuration Register 0     */
+        u8      ccr1;           /* Channel Configuration Register 1     */
+        u8      ccr2;           /* Channel Configuration Register 2     */
+        u8      ccr3;           /* Channel Configuration Register 3     */
+        u8      __pad3[4];
+        u8      vstr;           /* Version Status Register              */
+        u8      __pad4[3];
+        u8      gis;            /* Global Interrupt Status              */
+        u8      ipc;            /* Interrupt Port Configuration         */
+        u8      isr0;           /* Interrupt Status 0                   */
+        u8      isr1;           /* Interrupt Status 1                   */
+        u8      pvr;            /* Port Value Register                  */
+        u8      pis;            /* Port Interrupt Status                */
+        u8      pcr;            /* Port Configuration Register          */
+        u8      ccr4;           /* Channel Configuration Register 4     */
+};
+
+struct sab82532_async_wr_regs {
+        u8      xfifo[0x20];    /* Transmit FIFO                        */
+        u8      cmdr;           /* Command Register                     */
+        u8      __pad1;
+        u8      mode;
+        u8      timr;
+        u8      xon;
+        u8      xoff;
+        u8      tcr;
+        u8      dafo;
+        u8      rfc;
+        u8      __pad2;
+        u8      xbcl;           /* Transmit Byte Count Low              */
+        u8      xbch;           /* Transmit Byte Count High             */
+        u8      ccr0;
+        u8      ccr1;
+        u8      ccr2;
+        u8      ccr3;
+        u8      tsax;           /* Time-Slot Assignment Reg. Transmit   */
+        u8      tsar;           /* Time-Slot Assignment Reg. Receive    */
+        u8      xccr;           /* Transmit Channel Capacity Register   */
+        u8      rccr;           /* Receive Channel Capacity Register    */
+        u8      bgr;            /* Baud Rate Generator Register         */
+        u8      tic;            /* Transmit Immediate Character         */
+        u8      mxn;            /* Mask XON Character                   */
+        u8      mxf;            /* Mask XOFF Character                  */
+        u8      iva;            /* Interrupt Vector Address             */
+        u8      ipc;
+        u8      imr0;           /* Interrupt Mask Register 0            */
+        u8      imr1;           /* Interrupt Mask Register 1            */
+        u8      pvr;
+        u8      pim;            /* Port Interrupt Mask                  */
+        u8      pcr;
+        u8      ccr4;
+};
+
+struct sab82532_async_rw_regs { /* Read/Write registers                 */
+        u8      __pad1[0x20];
+        u8      __pad2;
+        u8      __pad3;
+        u8      mode;
+        u8      timr;
+        u8      xon;
+        u8      xoff;
+        u8      tcr;
+        u8      dafo;
+        u8      rfc;
+        u8      __pad4;
+        u8      __pad5;
+        u8      __pad6;
+        u8      ccr0;
+        u8      ccr1;
+        u8      ccr2;
+        u8      ccr3;
+        u8      __pad7;
+        u8      __pad8;
+        u8      __pad9;
+        u8      __pad10;
+        u8      __pad11;
+        u8      __pad12;
+        u8      __pad13;
+        u8      __pad14;
+        u8      __pad15;
+        u8      ipc;
+        u8      __pad16;
+        u8      __pad17;
+        u8      pvr;
+        u8      __pad18;
+        u8      pcr;
+        u8      ccr4;
+};
+
+union sab82532_async_regs {
+        __volatile__ struct sab82532_async_rd_regs      r;
+        __volatile__ struct sab82532_async_wr_regs      w;
+        __volatile__ struct sab82532_async_rw_regs      rw;
+};
+
+union sab82532_irq_status {
+        unsigned short                   stat;
+        struct {
+                unsigned char            isr0;
+                unsigned char            isr1;
+        } sreg;
+};
+
+/* irqflags bits */
+#define SAB82532_ALLS                   0x00000001
+#define SAB82532_XPR                    0x00000002
+
+/* RFIFO Status Byte */
+#define SAB82532_RSTAT_PE               0x80
+#define SAB82532_RSTAT_FE               0x40
+#define SAB82532_RSTAT_PARITY           0x01
+
+/* Status Register (STAR) */
+#define SAB82532_STAR_XDOV              0x80
+#define SAB82532_STAR_XFW               0x40
+#define SAB82532_STAR_RFNE              0x20
+#define SAB82532_STAR_FCS               0x10
+#define SAB82532_STAR_TEC               0x08
+#define SAB82532_STAR_CEC               0x04
+#define SAB82532_STAR_CTS               0x02
+
+/* Command Register (CMDR) */
+#define SAB82532_CMDR_RMC               0x80
+#define SAB82532_CMDR_RRES              0x40
+#define SAB82532_CMDR_RFRD              0x20
+#define SAB82532_CMDR_STI               0x10
+#define SAB82532_CMDR_XF                0x08
+#define SAB82532_CMDR_XRES              0x01
+
+/* Mode Register (MODE) */
+#define SAB82532_MODE_FRTS              0x40
+#define SAB82532_MODE_FCTS              0x20
+#define SAB82532_MODE_FLON              0x10
+#define SAB82532_MODE_RAC               0x08
+#define SAB82532_MODE_RTS               0x04
+#define SAB82532_MODE_TRS               0x02
+#define SAB82532_MODE_TLP               0x01
+
+/* Timer Register (TIMR) */
+#define SAB82532_TIMR_CNT_MASK          0xe0
+#define SAB82532_TIMR_VALUE_MASK        0x1f
+
+/* Data Format (DAFO) */
+#define SAB82532_DAFO_XBRK              0x40
+#define SAB82532_DAFO_STOP              0x20
+#define SAB82532_DAFO_PAR_SPACE         0x00
+#define SAB82532_DAFO_PAR_ODD           0x08
+#define SAB82532_DAFO_PAR_EVEN          0x10
+#define SAB82532_DAFO_PAR_MARK          0x18
+#define SAB82532_DAFO_PARE              0x04
+#define SAB82532_DAFO_CHL8              0x00
+#define SAB82532_DAFO_CHL7              0x01
+#define SAB82532_DAFO_CHL6              0x02
+#define SAB82532_DAFO_CHL5              0x03
+
+/* RFIFO Control Register (RFC) */
+#define SAB82532_RFC_DPS                0x40
+#define SAB82532_RFC_DXS                0x20
+#define SAB82532_RFC_RFDF               0x10
+#define SAB82532_RFC_RFTH_1             0x00
+#define SAB82532_RFC_RFTH_4             0x04
+#define SAB82532_RFC_RFTH_16            0x08
+#define SAB82532_RFC_RFTH_32            0x0c
+#define SAB82532_RFC_TCDE               0x01
+
+/* Received Byte Count High (RBCH) */
+#define SAB82532_RBCH_DMA               0x80
+#define SAB82532_RBCH_CAS               0x20
+
+/* Transmit Byte Count High (XBCH) */
+#define SAB82532_XBCH_DMA               0x80
+#define SAB82532_XBCH_CAS               0x20
+#define SAB82532_XBCH_XC                0x10
+
+/* Channel Configuration Register 0 (CCR0) */
+#define SAB82532_CCR0_PU                0x80
+#define SAB82532_CCR0_MCE               0x40
+#define SAB82532_CCR0_SC_NRZ            0x00
+#define SAB82532_CCR0_SC_NRZI           0x08
+#define SAB82532_CCR0_SC_FM0            0x10
+#define SAB82532_CCR0_SC_FM1            0x14
+#define SAB82532_CCR0_SC_MANCH          0x18
+#define SAB82532_CCR0_SM_HDLC           0x00
+#define SAB82532_CCR0_SM_SDLC_LOOP      0x01
+#define SAB82532_CCR0_SM_BISYNC         0x02
+#define SAB82532_CCR0_SM_ASYNC          0x03
+
+/* Channel Configuration Register 1 (CCR1) */
+#define SAB82532_CCR1_ODS               0x10
+#define SAB82532_CCR1_BCR               0x08
+#define SAB82532_CCR1_CM_MASK           0x07
+
+/* Channel Configuration Register 2 (CCR2) */
+#define SAB82532_CCR2_SOC1              0x80
+#define SAB82532_CCR2_SOC0              0x40
+#define SAB82532_CCR2_BR9               0x80
+#define SAB82532_CCR2_BR8               0x40
+#define SAB82532_CCR2_BDF               0x20
+#define SAB82532_CCR2_SSEL              0x10
+#define SAB82532_CCR2_XCS0              0x20
+#define SAB82532_CCR2_RCS0              0x10
+#define SAB82532_CCR2_TOE               0x08
+#define SAB82532_CCR2_RWX               0x04
+#define SAB82532_CCR2_DIV               0x01
+
+/* Channel Configuration Register 3 (CCR3) */
+#define SAB82532_CCR3_PSD               0x01
+
+/* Time Slot Assignment Register Transmit (TSAX) */
+#define SAB82532_TSAX_TSNX_MASK         0xfc
+#define SAB82532_TSAX_XCS2              0x02    /* see also CCR2 */
+#define SAB82532_TSAX_XCS1              0x01
+
+/* Time Slot Assignment Register Receive (TSAR) */
+#define SAB82532_TSAR_TSNR_MASK         0xfc
+#define SAB82532_TSAR_RCS2              0x02    /* see also CCR2 */
+#define SAB82532_TSAR_RCS1              0x01
+
+/* Version Status Register (VSTR) */
+#define SAB82532_VSTR_CD                0x80
+#define SAB82532_VSTR_DPLA              0x40
+#define SAB82532_VSTR_VN_MASK           0x0f
+#define SAB82532_VSTR_VN_1              0x00
+#define SAB82532_VSTR_VN_2              0x01
+#define SAB82532_VSTR_VN_3_2            0x02
+
+/* Global Interrupt Status Register (GIS) */
+#define SAB82532_GIS_PI                 0x80
+#define SAB82532_GIS_ISA1               0x08
+#define SAB82532_GIS_ISA0               0x04
+#define SAB82532_GIS_ISB1               0x02
+#define SAB82532_GIS_ISB0               0x01
+
+/* Interrupt Vector Address (IVA) */
+#define SAB82532_IVA_MASK               0xf1
+
+/* Interrupt Port Configuration (IPC) */
+#define SAB82532_IPC_VIS                0x80
+#define SAB82532_IPC_SLA1               0x10
+#define SAB82532_IPC_SLA0               0x08
+#define SAB82532_IPC_CASM               0x04
+#define SAB82532_IPC_IC_OPEN_DRAIN      0x00
+#define SAB82532_IPC_IC_ACT_LOW         0x01
+#define SAB82532_IPC_IC_ACT_HIGH        0x03
+
+/* Interrupt Status Register 0 (ISR0) */
+#define SAB82532_ISR0_TCD               0x80
+#define SAB82532_ISR0_TIME              0x40
+#define SAB82532_ISR0_PERR              0x20
+#define SAB82532_ISR0_FERR              0x10
+#define SAB82532_ISR0_PLLA              0x08
+#define SAB82532_ISR0_CDSC              0x04
+#define SAB82532_ISR0_RFO               0x02
+#define SAB82532_ISR0_RPF               0x01
+
+/* Interrupt Status Register 1 (ISR1) */
+#define SAB82532_ISR1_BRK               0x80
+#define SAB82532_ISR1_BRKT              0x40
+#define SAB82532_ISR1_ALLS              0x20
+#define SAB82532_ISR1_XOFF              0x10
+#define SAB82532_ISR1_TIN               0x08
+#define SAB82532_ISR1_CSC               0x04
+#define SAB82532_ISR1_XON               0x02
+#define SAB82532_ISR1_XPR               0x01
+
+/* Interrupt Mask Register 0 (IMR0) */
+#define SAB82532_IMR0_TCD               0x80
+#define SAB82532_IMR0_TIME              0x40
+#define SAB82532_IMR0_PERR              0x20
+#define SAB82532_IMR0_FERR              0x10
+#define SAB82532_IMR0_PLLA              0x08
+#define SAB82532_IMR0_CDSC              0x04
+#define SAB82532_IMR0_RFO               0x02
+#define SAB82532_IMR0_RPF               0x01
+
+/* Interrupt Mask Register 1 (IMR1) */
+#define SAB82532_IMR1_BRK               0x80
+#define SAB82532_IMR1_BRKT              0x40
+#define SAB82532_IMR1_ALLS              0x20
+#define SAB82532_IMR1_XOFF              0x10
+#define SAB82532_IMR1_TIN               0x08
+#define SAB82532_IMR1_CSC               0x04
+#define SAB82532_IMR1_XON               0x02
+#define SAB82532_IMR1_XPR               0x01
+
+/* Port Interrupt Status Register (PIS) */
+#define SAB82532_PIS_SYNC_B             0x08
+#define SAB82532_PIS_DTR_B              0x04
+#define SAB82532_PIS_DTR_A              0x02
+#define SAB82532_PIS_SYNC_A             0x01
+
+/* Channel Configuration Register 4 (CCR4) */
+#define SAB82532_CCR4_MCK4              0x80
+#define SAB82532_CCR4_EBRG              0x40
+#define SAB82532_CCR4_TST1              0x20
+#define SAB82532_CCR4_ICD               0x10
+
+
+#endif /* !(_SUNSAB_H) */
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
new file mode 100644
index 000000000000..23d19d394320
--- /dev/null
+++ b/drivers/serial/sunsu.c
@@ -0,0 +1,1742 @@
+/* $Id: su.c,v 1.55 2002/01/08 16:00:16 davem Exp $
+ * su.c: Small serial driver for keyboard/mouse interface on sparc32/PCI
+ *
+ * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
+ * Copyright (C) 1998-1999  Pete Zaitcev   (zaitcev@yahoo.com)
+ *
+ * This is mainly a variation of 8250.c, credits go to authors mentioned
+ * therein.  In fact this driver should be merged into the generic 8250.c
+ * infrastructure perhaps using a 8250_sparc.c module.
+ *
+ * Fixed to use tty_get_baud_rate().
+ *   Theodore Ts'o <tytso@mit.edu>, 2001-Oct-12
+ *
+ * Converted to new 2.5.x UART layer.
+ *   David S. Miller (davem@redhat.com), 2002-Jul-29
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/ptrace.h>
+#include <linux/ioport.h>
+#include <linux/circ_buf.h>
+#include <linux/serial.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#ifdef CONFIG_SERIO
+#include <linux/serio.h>
+#endif
+#include <linux/serial_reg.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/oplib.h>
+#include <asm/ebus.h>
+#ifdef CONFIG_SPARC64
+#include <asm/isa.h>
+#endif
+
+#if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+#include "suncore.h"
+
+/* We are on a NS PC87303 clocked with 24.0 MHz, which results
+ * in a UART clock of 1.8462 MHz.
+ */
+#define SU_BASE_BAUD    (1846200 / 16)
+
+enum su_type { SU_PORT_NONE, SU_PORT_MS, SU_PORT_KBD, SU_PORT_PORT };
+static char *su_typev[] = { "su(???)", "su(mouse)", "su(kbd)", "su(serial)" };
+
+/*
+ * Here we define the default xmit fifo size used for each type of UART.
+ */
+static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = {
+        { "unknown",    1,      0 },
+        { "8250",       1,      0 },
+        { "16450",      1,      0 },
+        { "16550",      1,      0 },
+        { "16550A",     16,     UART_CLEAR_FIFO | UART_USE_FIFO },
+        { "Cirrus",     1,      0 },
+        { "ST16650",    1,      UART_CLEAR_FIFO | UART_STARTECH },
+        { "ST16650V2",  32,     UART_CLEAR_FIFO | UART_USE_FIFO | UART_STARTECH },
+        { "TI16750",    64,     UART_CLEAR_FIFO | UART_USE_FIFO },
+        { "Startech",   1,      0 },
+        { "16C950/954", 128,    UART_CLEAR_FIFO | UART_USE_FIFO },
+        { "ST16654",    64,     UART_CLEAR_FIFO | UART_USE_FIFO | UART_STARTECH },
+        { "XR16850",    128,    UART_CLEAR_FIFO | UART_USE_FIFO | UART_STARTECH },
+        { "RSA",        2048,   UART_CLEAR_FIFO | UART_USE_FIFO }
+};
+
+struct uart_sunsu_port {
+        struct uart_port        port;
+        unsigned char           acr;
+        unsigned char           ier;
+        unsigned short          rev;
+        unsigned char           lcr;
+        unsigned int            lsr_break_flag;
+        unsigned int            cflag;
+
+        /* Probing information.  */
+        enum su_type            su_type;
+        unsigned int            type_probed;    /* XXX Stupid */
+        int                     port_node;
+
+#ifdef CONFIG_SERIO
+        struct serio            *serio;
+        int                     serio_open;
+#endif
+};
+
+#define _INLINE_
+
+static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset)
+{
+        offset <<= up->port.regshift;
+
+        switch (up->port.iotype) {
+        case SERIAL_IO_HUB6:
+                outb(up->port.hub6 - 1 + offset, up->port.iobase);
+                return inb(up->port.iobase + 1);
+
+        case SERIAL_IO_MEM:
+                return readb(up->port.membase + offset);
+
+        default:
+                return inb(up->port.iobase + offset);
+        }
+}
+
+static _INLINE_ void
+serial_out(struct uart_sunsu_port *up, int offset, int value)
+{
+#ifndef CONFIG_SPARC64
+        /*
+         * MrCoffee has weird schematics: IRQ4 & P10(?) pins of SuperIO are
+         * connected with a gate then go to SlavIO. When IRQ4 goes tristated
+         * gate outputs a logical one. Since we use level triggered interrupts
+         * we have lockup and watchdog reset. We cannot mask IRQ because
+         * keyboard shares IRQ with us (Word has it as Bob Smelik's design).
+         * This problem is similar to what Alpha people suffer, see serial.c.
+         */
+        if (offset == UART_MCR)
+                value |= UART_MCR_OUT2;
+#endif
+        offset <<= up->port.regshift;
+
+        switch (up->port.iotype) {
+        case SERIAL_IO_HUB6:
+                outb(up->port.hub6 - 1 + offset, up->port.iobase);
+                outb(value, up->port.iobase + 1);
+                break;
+
+        case SERIAL_IO_MEM:
+                writeb(value, up->port.membase + offset);
+                break;
+
+        default:
+                outb(value, up->port.iobase + offset);
+        }
+}
+
+/*
+ * We used to support using pause I/O for certain machines.  We
+ * haven't supported this for a while, but just in case it's badly
+ * needed for certain old 386 machines, I've left these #define's
+ * in....
+ */
+#define serial_inp(up, offset)          serial_in(up, offset)
+#define serial_outp(up, offset, value)  serial_out(up, offset, value)
+
+
+/*
+ * For the 16C950
+ */
+static void serial_icr_write(struct uart_sunsu_port *up, int offset, int value)
+{
+        serial_out(up, UART_SCR, offset);
+        serial_out(up, UART_ICR, value);
+}
+
+#if 0 /* Unused currently */
+static unsigned int serial_icr_read(struct uart_sunsu_port *up, int offset)
+{
+        unsigned int value;
+
+        serial_icr_write(up, UART_ACR, up->acr | UART_ACR_ICRRD);
+        serial_out(up, UART_SCR, offset);
+        value = serial_in(up, UART_ICR);
+        serial_icr_write(up, UART_ACR, up->acr);
+
+        return value;
+}
+#endif
+
+#ifdef CONFIG_SERIAL_8250_RSA
+/*
+ * Attempts to turn on the RSA FIFO.  Returns zero on failure.
+ * We set the port uart clock rate if we succeed.
+ */
+static int __enable_rsa(struct uart_sunsu_port *up)
+{
+        unsigned char mode;
+        int result;
+
+        mode = serial_inp(up, UART_RSA_MSR);
+        result = mode & UART_RSA_MSR_FIFO;
+
+        if (!result) {
+                serial_outp(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
+                mode = serial_inp(up, UART_RSA_MSR);
+                result = mode & UART_RSA_MSR_FIFO;
+        }
+
+        if (result)
+                up->port.uartclk = SERIAL_RSA_BAUD_BASE * 16;
+
+        return result;
+}
+
+static void enable_rsa(struct uart_sunsu_port *up)
+{
+        if (up->port.type == PORT_RSA) {
+                if (up->port.uartclk != SERIAL_RSA_BAUD_BASE * 16) {
+                        spin_lock_irq(&up->port.lock);
+                        __enable_rsa(up);
+                        spin_unlock_irq(&up->port.lock);
+                }
+                if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
+                        serial_outp(up, UART_RSA_FRR, 0);
+        }
+}
+
+/*
+ * Attempts to turn off the RSA FIFO.  Returns zero on failure.
+ * It is unknown why interrupts were disabled in here.  However,
+ * the caller is expected to preserve this behaviour by grabbing
+ * the spinlock before calling this function.
+ */
+static void disable_rsa(struct uart_sunsu_port *up)
+{
+        unsigned char mode;
+        int result;
+
+        if (up->port.type == PORT_RSA &&
+            up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16) {
+                spin_lock_irq(&up->port.lock);
+
+                mode = serial_inp(up, UART_RSA_MSR);
+                result = !(mode & UART_RSA_MSR_FIFO);
+
+                if (!result) {
+                        serial_outp(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
+                        mode = serial_inp(up, UART_RSA_MSR);
+                        result = !(mode & UART_RSA_MSR_FIFO);
+                }
+
+                if (result)
+                        up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
+                spin_unlock_irq(&up->port.lock);
+        }
+}
+#endif /* CONFIG_SERIAL_8250_RSA */
+
+static void sunsu_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+
+        if (up->ier & UART_IER_THRI) {
+                up->ier &= ~UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+        if (up->port.type == PORT_16C950 && tty_stop) {
+                up->acr |= UART_ACR_TXDIS;
+                serial_icr_write(up, UART_ACR, up->acr);
+        }
+}
+
+static void sunsu_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+
+        if (!(up->ier & UART_IER_THRI)) {
+                up->ier |= UART_IER_THRI;
+                serial_out(up, UART_IER, up->ier);
+        }
+        /*
+         * We only do this from uart_start
+         */
+        if (tty_start && up->port.type == PORT_16C950) {
+                up->acr &= ~UART_ACR_TXDIS;
+                serial_icr_write(up, UART_ACR, up->acr);
+        }
+}
+
+static void sunsu_stop_rx(struct uart_port *port)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        up->ier &= ~UART_IER_RLSI;
+        up->port.read_status_mask &= ~UART_LSR_DR;
+        serial_out(up, UART_IER, up->ier);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void sunsu_enable_ms(struct uart_port *port)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        up->ier |= UART_IER_MSI;
+        serial_out(up, UART_IER, up->ier);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static _INLINE_ struct tty_struct *
+receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs *regs)
+{
+        struct tty_struct *tty = up->port.info->tty;
+        unsigned char ch;
+        int max_count = 256;
+        int saw_console_brk = 0;
+
+        do {
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        tty->flip.work.func((void *)tty);
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                return tty; // if TTY_DONT_FLIP is set
+                }
+                ch = serial_inp(up, UART_RX);
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
+                                       UART_LSR_FE | UART_LSR_OE))) {
+                        /*
+                         * For statistics only
+                         */
+                        if (*status & UART_LSR_BI) {
+                                *status &= ~(UART_LSR_FE | UART_LSR_PE);
+                                up->port.icount.brk++;
+                                if (up->port.cons != NULL &&
+                                    up->port.line == up->port.cons->index)
+                                        saw_console_brk = 1;
+                                /*
+                                 * We do the SysRQ and SAK checking
+                                 * here because otherwise the break
+                                 * may get masked by ignore_status_mask
+                                 * or read_status_mask.
+                                 */
+                                if (uart_handle_break(&up->port))
+                                        goto ignore_char;
+                        } else if (*status & UART_LSR_PE)
+                                up->port.icount.parity++;
+                        else if (*status & UART_LSR_FE)
+                                up->port.icount.frame++;
+                        if (*status & UART_LSR_OE)
+                                up->port.icount.overrun++;
+
+                        /*
+                         * Mask off conditions which should be ingored.
+                         */
+                        *status &= up->port.read_status_mask;
+
+                        if (up->port.cons != NULL &&
+                            up->port.line == up->port.cons->index) {
+                                /* Recover the break flag from console xmit */
+                                *status |= up->lsr_break_flag;
+                                up->lsr_break_flag = 0;
+                        }
+
+                        if (*status & UART_LSR_BI) {
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        } else if (*status & UART_LSR_PE)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (*status & UART_LSR_FE)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        goto ignore_char;
+                if ((*status & up->port.ignore_status_mask) == 0) {
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((*status & UART_LSR_OE) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        /*
+                         * Overrun is special, since it's reported
+                         * immediately, and doesn't affect the current
+                         * character.
+                         */
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        ignore_char:
+                *status = serial_inp(up, UART_LSR);
+        } while ((*status & UART_LSR_DR) && (max_count-- > 0));
+
+        if (saw_console_brk)
+                sun_do_break();
+
+        return tty;
+}
+
+static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
+{
+        struct circ_buf *xmit = &up->port.info->xmit;
+        int count;
+
+        if (up->port.x_char) {
+                serial_outp(up, UART_TX, up->port.x_char);
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+                sunsu_stop_tx(&up->port, 0);
+                return;
+        }
+
+        count = up->port.fifosize;
+        do {
+                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                up->port.icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        if (uart_circ_empty(xmit))
+                sunsu_stop_tx(&up->port, 0);
+}
+
+static _INLINE_ void check_modem_status(struct uart_sunsu_port *up)
+{
+        int status;
+
+        status = serial_in(up, UART_MSR);
+
+        if ((status & UART_MSR_ANY_DELTA) == 0)
+                return;
+
+        if (status & UART_MSR_TERI)
+                up->port.icount.rng++;
+        if (status & UART_MSR_DDSR)
+                up->port.icount.dsr++;
+        if (status & UART_MSR_DDCD)
+                uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
+        if (status & UART_MSR_DCTS)
+                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+
+        wake_up_interruptible(&up->port.info->delta_msr_wait);
+}
+
+static irqreturn_t sunsu_serial_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_sunsu_port *up = dev_id;
+        unsigned long flags;
+        unsigned char status;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        do {
+                struct tty_struct *tty;
+
+                status = serial_inp(up, UART_LSR);
+                tty = NULL;
+                if (status & UART_LSR_DR)
+                        tty = receive_chars(up, &status, regs);
+                check_modem_status(up);
+                if (status & UART_LSR_THRE)
+                        transmit_chars(up);
+
+                spin_unlock_irqrestore(&up->port.lock, flags);
+
+                if (tty)
+                        tty_flip_buffer_push(tty);
+
+                spin_lock_irqsave(&up->port.lock, flags);
+
+        } while (!(serial_in(up, UART_IIR) & UART_IIR_NO_INT));
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return IRQ_HANDLED;
+}
+
+/* Separate interrupt handling path for keyboard/mouse ports.  */
+
+static void
+sunsu_change_speed(struct uart_port *port, unsigned int cflag,
+                   unsigned int iflag, unsigned int quot);
+
+static void sunsu_change_mouse_baud(struct uart_sunsu_port *up)
+{
+        unsigned int cur_cflag = up->cflag;
+        int quot, new_baud;
+
+        up->cflag &= ~CBAUD;
+        up->cflag |= suncore_mouse_baud_cflag_next(cur_cflag, &new_baud);
+
+        quot = up->port.uartclk / (16 * new_baud);
+
+        spin_unlock(&up->port.lock);
+
+        sunsu_change_speed(&up->port, up->cflag, 0, quot);
+
+        spin_lock(&up->port.lock);
+}
+
+static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *regs, int is_break)
+{
+        do {
+                unsigned char ch = serial_inp(up, UART_RX);
+
+                /* Stop-A is handled by drivers/char/keyboard.c now. */
+                if (up->su_type == SU_PORT_KBD) {
+#ifdef CONFIG_SERIO
+                        serio_interrupt(up->serio, ch, 0, regs);
+#endif
+                } else if (up->su_type == SU_PORT_MS) {
+                        int ret = suncore_mouse_baud_detection(ch, is_break);
+
+                        switch (ret) {
+                        case 2:
+                                sunsu_change_mouse_baud(up);
+                                /* fallthru */
+                        case 1:
+                                break;
+
+                        case 0:
+#ifdef CONFIG_SERIO
+                                serio_interrupt(up->serio, ch, 0, regs);
+#endif
+                                break;
+                        };
+                }
+        } while (serial_in(up, UART_LSR) & UART_LSR_DR);
+}
+
+static irqreturn_t sunsu_kbd_ms_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_sunsu_port *up = dev_id;
+
+        if (!(serial_in(up, UART_IIR) & UART_IIR_NO_INT)) {
+                unsigned char status = serial_inp(up, UART_LSR);
+
+                if ((status & UART_LSR_DR) || (status & UART_LSR_BI))
+                        receive_kbd_ms_chars(up, regs,
+                                             (status & UART_LSR_BI) != 0);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static unsigned int sunsu_tx_empty(struct uart_port *port)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return ret;
+}
+
+static unsigned int sunsu_get_mctrl(struct uart_port *port)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+        unsigned char status;
+        unsigned int ret;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        status = serial_in(up, UART_MSR);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        ret = 0;
+        if (status & UART_MSR_DCD)
+                ret |= TIOCM_CAR;
+        if (status & UART_MSR_RI)
+                ret |= TIOCM_RNG;
+        if (status & UART_MSR_DSR)
+                ret |= TIOCM_DSR;
+        if (status & UART_MSR_CTS)
+                ret |= TIOCM_CTS;
+        return ret;
+}
+
+static void sunsu_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned char mcr = 0;
+
+        if (mctrl & TIOCM_RTS)
+                mcr |= UART_MCR_RTS;
+        if (mctrl & TIOCM_DTR)
+                mcr |= UART_MCR_DTR;
+        if (mctrl & TIOCM_OUT1)
+                mcr |= UART_MCR_OUT1;
+        if (mctrl & TIOCM_OUT2)
+                mcr |= UART_MCR_OUT2;
+        if (mctrl & TIOCM_LOOP)
+                mcr |= UART_MCR_LOOP;
+
+        serial_out(up, UART_MCR, mcr);
+}
+
+static void sunsu_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (break_state == -1)
+                up->lcr |= UART_LCR_SBC;
+        else
+                up->lcr &= ~UART_LCR_SBC;
+        serial_out(up, UART_LCR, up->lcr);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int sunsu_startup(struct uart_port *port)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+        int retval;
+
+        if (up->port.type == PORT_16C950) {
+                /* Wake up and initialize UART */
+                up->acr = 0;
+                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_EFR, UART_EFR_ECB);
+                serial_outp(up, UART_IER, 0);
+                serial_outp(up, UART_LCR, 0);
+                serial_icr_write(up, UART_CSR, 0); /* Reset the UART */
+                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_EFR, UART_EFR_ECB);
+                serial_outp(up, UART_LCR, 0);
+        }
+
+#ifdef CONFIG_SERIAL_8250_RSA
+        /*
+         * If this is an RSA port, see if we can kick it up to the
+         * higher speed clock.
+         */
+        enable_rsa(up);
+#endif
+
+        /*
+         * Clear the FIFO buffers and disable them.
+         * (they will be reeanbled in set_termios())
+         */
+        if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
+                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                                UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+                serial_outp(up, UART_FCR, 0);
+        }
+
+        /*
+         * Clear the interrupt registers.
+         */
+        (void) serial_inp(up, UART_LSR);
+        (void) serial_inp(up, UART_RX);
+        (void) serial_inp(up, UART_IIR);
+        (void) serial_inp(up, UART_MSR);
+
+        /*
+         * At this point, there's no way the LSR could still be 0xff;
+         * if it is, then bail out, because there's likely no UART
+         * here.
+         */
+        if (!(up->port.flags & ASYNC_BUGGY_UART) &&
+            (serial_inp(up, UART_LSR) == 0xff)) {
+                printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
+                return -ENODEV;
+        }
+
+        if (up->su_type != SU_PORT_PORT) {
+                retval = request_irq(up->port.irq, sunsu_kbd_ms_interrupt,
+                                     SA_SHIRQ, su_typev[up->su_type], up);
+        } else {
+                retval = request_irq(up->port.irq, sunsu_serial_interrupt,
+                                     SA_SHIRQ, su_typev[up->su_type], up);
+        }
+        if (retval) {
+                printk("su: Cannot register IRQ %d\n", up->port.irq);
+                return retval;
+        }
+
+        /*
+         * Now, initialize the UART
+         */
+        serial_outp(up, UART_LCR, UART_LCR_WLEN8);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        up->port.mctrl |= TIOCM_OUT2;
+
+        sunsu_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Finally, enable interrupts.  Note: Modem status interrupts
+         * are set via set_termios(), which will be occurring imminently
+         * anyway, so we don't enable them here.
+         */
+        up->ier = UART_IER_RLSI | UART_IER_RDI;
+        serial_outp(up, UART_IER, up->ier);
+
+        if (up->port.flags & ASYNC_FOURPORT) {
+                unsigned int icp;
+                /*
+                 * Enable interrupts on the AST Fourport board
+                 */
+                icp = (up->port.iobase & 0xfe0) | 0x01f;
+                outb_p(0x80, icp);
+                (void) inb_p(icp);
+        }
+
+        /*
+         * And clear the interrupt registers again for luck.
+         */
+        (void) serial_inp(up, UART_LSR);
+        (void) serial_inp(up, UART_RX);
+        (void) serial_inp(up, UART_IIR);
+        (void) serial_inp(up, UART_MSR);
+
+        return 0;
+}
+
+static void sunsu_shutdown(struct uart_port *port)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned long flags;
+
+        /*
+         * Disable interrupts from this port
+         */
+        up->ier = 0;
+        serial_outp(up, UART_IER, 0);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        if (up->port.flags & ASYNC_FOURPORT) {
+                /* reset interrupts on the AST Fourport board */
+                inb((up->port.iobase & 0xfe0) | 0x1f);
+                up->port.mctrl |= TIOCM_OUT1;
+        } else
+                up->port.mctrl &= ~TIOCM_OUT2;
+
+        sunsu_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        /*
+         * Disable break condition and FIFOs
+         */
+        serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC);
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+                                  UART_FCR_CLEAR_RCVR |
+                                  UART_FCR_CLEAR_XMIT);
+        serial_outp(up, UART_FCR, 0);
+
+#ifdef CONFIG_SERIAL_8250_RSA
+        /*
+         * Reset the RSA board back to 115kbps compat mode.
+         */
+        disable_rsa(up);
+#endif
+
+        /*
+         * Read data port to reset things.
+         */
+        (void) serial_in(up, UART_RX);
+
+        free_irq(up->port.irq, up);
+}
+
+static void
+sunsu_change_speed(struct uart_port *port, unsigned int cflag,
+                   unsigned int iflag, unsigned int quot)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+        unsigned char cval, fcr = 0;
+        unsigned long flags;
+
+        switch (cflag & CSIZE) {
+        case CS5:
+                cval = 0x00;
+                break;
+        case CS6:
+                cval = 0x01;
+                break;
+        case CS7:
+                cval = 0x02;
+                break;
+        default:
+        case CS8:
+                cval = 0x03;
+                break;
+        }
+
+        if (cflag & CSTOPB)
+                cval |= 0x04;
+        if (cflag & PARENB)
+                cval |= UART_LCR_PARITY;
+        if (!(cflag & PARODD))
+                cval |= UART_LCR_EPAR;
+#ifdef CMSPAR
+        if (cflag & CMSPAR)
+                cval |= UART_LCR_SPAR;
+#endif
+
+        /*
+         * Work around a bug in the Oxford Semiconductor 952 rev B
+         * chip which causes it to seriously miscalculate baud rates
+         * when DLL is 0.
+         */
+        if ((quot & 0xff) == 0 && up->port.type == PORT_16C950 &&
+            up->rev == 0x5201)
+                quot ++;
+
+        if (uart_config[up->port.type].flags & UART_USE_FIFO) {
+                if ((up->port.uartclk / quot) < (2400 * 16))
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
+#ifdef CONFIG_SERIAL_8250_RSA
+                else if (up->port.type == PORT_RSA)
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_14;
+#endif
+                else
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_8;
+        }
+        if (up->port.type == PORT_16750)
+                fcr |= UART_FCR7_64BYTE;
+
+        /*
+         * Ok, we're now changing the port state.  Do it with
+         * interrupts disabled.
+         */
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, cflag, (port->uartclk / (16 * quot)));
+
+        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
+        if (iflag & INPCK)
+                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= UART_LSR_BI;
+
+        /*
+         * Characteres to ignore
+         */
+        up->port.ignore_status_mask = 0;
+        if (iflag & IGNPAR)
+                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
+        if (iflag & IGNBRK) {
+                up->port.ignore_status_mask |= UART_LSR_BI;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns too (for real raw support).
+                 */
+                if (iflag & IGNPAR)
+                        up->port.ignore_status_mask |= UART_LSR_OE;
+        }
+
+        /*
+         * ignore all characters if CREAD is not set
+         */
+        if ((cflag & CREAD) == 0)
+                up->port.ignore_status_mask |= UART_LSR_DR;
+
+        /*
+         * CTS flow control flag and modem status interrupts
+         */
+        up->ier &= ~UART_IER_MSI;
+        if (UART_ENABLE_MS(&up->port, cflag))
+                up->ier |= UART_IER_MSI;
+
+        serial_out(up, UART_IER, up->ier);
+
+        if (uart_config[up->port.type].flags & UART_STARTECH) {
+                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_EFR, cflag & CRTSCTS ? UART_EFR_CTS :0);
+        }
+        serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
+        serial_outp(up, UART_DLL, quot & 0xff);         /* LS of divisor */
+        serial_outp(up, UART_DLM, quot >> 8);           /* MS of divisor */
+        if (up->port.type == PORT_16750)
+                serial_outp(up, UART_FCR, fcr);         /* set fcr */
+        serial_outp(up, UART_LCR, cval);                /* reset DLAB */
+        up->lcr = cval;                                 /* Save LCR */
+        if (up->port.type != PORT_16750) {
+                if (fcr & UART_FCR_ENABLE_FIFO) {
+                        /* emulated UARTs (Lucent Venus 167x) need two steps */
+                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                }
+                serial_outp(up, UART_FCR, fcr);         /* set fcr */
+        }
+
+        up->cflag = cflag;
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static void
+sunsu_set_termios(struct uart_port *port, struct termios *termios,
+                  struct termios *old)
+{
+        unsigned int baud, quot;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = uart_get_divisor(port, baud);
+
+        sunsu_change_speed(port, termios->c_cflag, termios->c_iflag, quot);
+}
+
+static void sunsu_release_port(struct uart_port *port)
+{
+}
+
+static int sunsu_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+static void sunsu_config_port(struct uart_port *port, int flags)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
+
+        if (flags & UART_CONFIG_TYPE) {
+                /*
+                 * We are supposed to call autoconfig here, but this requires
+                 * splitting all the OBP probing crap from the UART probing.
+                 * We'll do it when we kill sunsu.c altogether.
+                 */
+                port->type = up->type_probed;   /* XXX */
+        }
+}
+
+static int
+sunsu_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        return -EINVAL;
+}
+
+static const char *
+sunsu_type(struct uart_port *port)
+{
+        int type = port->type;
+
+        if (type >= ARRAY_SIZE(uart_config))
+                type = 0;
+        return uart_config[type].name;
+}
+
+static struct uart_ops sunsu_pops = {
+        .tx_empty       = sunsu_tx_empty,
+        .set_mctrl      = sunsu_set_mctrl,
+        .get_mctrl      = sunsu_get_mctrl,
+        .stop_tx        = sunsu_stop_tx,
+        .start_tx       = sunsu_start_tx,
+        .stop_rx        = sunsu_stop_rx,
+        .enable_ms      = sunsu_enable_ms,
+        .break_ctl      = sunsu_break_ctl,
+        .startup        = sunsu_startup,
+        .shutdown       = sunsu_shutdown,
+        .set_termios    = sunsu_set_termios,
+        .type           = sunsu_type,
+        .release_port   = sunsu_release_port,
+        .request_port   = sunsu_request_port,
+        .config_port    = sunsu_config_port,
+        .verify_port    = sunsu_verify_port,
+};
+
+#define UART_NR 4
+
+static struct uart_sunsu_port sunsu_ports[UART_NR];
+
+#ifdef CONFIG_SERIO
+
+static DEFINE_SPINLOCK(sunsu_serio_lock);
+
+static int sunsu_serio_write(struct serio *serio, unsigned char ch)
+{
+        struct uart_sunsu_port *up = serio->port_data;
+        unsigned long flags;
+        int lsr;
+
+        spin_lock_irqsave(&sunsu_serio_lock, flags);
+
+        do {
+                lsr = serial_in(up, UART_LSR);
+        } while (!(lsr & UART_LSR_THRE));
+
+        /* Send the character out. */
+        serial_out(up, UART_TX, ch);
+
+        spin_unlock_irqrestore(&sunsu_serio_lock, flags);
+
+        return 0;
+}
+
+static int sunsu_serio_open(struct serio *serio)
+{
+        struct uart_sunsu_port *up = serio->port_data;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&sunsu_serio_lock, flags);
+        if (!up->serio_open) {
+                up->serio_open = 1;
+                ret = 0;
+        } else
+                ret = -EBUSY;
+        spin_unlock_irqrestore(&sunsu_serio_lock, flags);
+
+        return ret;
+}
+
+static void sunsu_serio_close(struct serio *serio)
+{
+        struct uart_sunsu_port *up = serio->port_data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sunsu_serio_lock, flags);
+        up->serio_open = 0;
+        spin_unlock_irqrestore(&sunsu_serio_lock, flags);
+}
+
+#endif /* CONFIG_SERIO */
+
+static void sunsu_autoconfig(struct uart_sunsu_port *up)
+{
+        unsigned char status1, status2, scratch, scratch2, scratch3;
+        unsigned char save_lcr, save_mcr;
+        struct linux_ebus_device *dev = NULL;
+        struct linux_ebus *ebus;
+#ifdef CONFIG_SPARC64
+        struct sparc_isa_bridge *isa_br;
+        struct sparc_isa_device *isa_dev;
+#endif
+#ifndef CONFIG_SPARC64
+        struct linux_prom_registers reg0;
+#endif
+        unsigned long flags;
+
+        if (!up->port_node || !up->su_type)
+                return;
+
+        up->type_probed = PORT_UNKNOWN;
+        up->port.iotype = SERIAL_IO_MEM;
+
+        /*
+         * First we look for Ebus-bases su's
+         */
+        for_each_ebus(ebus) {
+                for_each_ebusdev(dev, ebus) {
+                        if (dev->prom_node == up->port_node) {
+                                /*
+                                 * The EBus is broken on sparc; it delivers
+                                 * virtual addresses in resources. Oh well...
+                                 * This is correct on sparc64, though.
+                                 */
+                                up->port.membase = (char *) dev->resource[0].start;
+                                /*
+                                 * This is correct on both architectures.
+                                 */
+                                up->port.mapbase = dev->resource[0].start;
+                                up->port.irq = dev->irqs[0];
+                                goto ebus_done;
+                        }
+                }
+        }
+
+#ifdef CONFIG_SPARC64
+        for_each_isa(isa_br) {
+                for_each_isadev(isa_dev, isa_br) {
+                        if (isa_dev->prom_node == up->port_node) {
+                                /* Same on sparc64. Cool architecure... */
+                                up->port.membase = (char *) isa_dev->resource.start;
+                                up->port.mapbase = isa_dev->resource.start;
+                                up->port.irq = isa_dev->irq;
+                                goto ebus_done;
+                        }
+                }
+        }
+#endif
+
+#ifdef CONFIG_SPARC64
+        /*
+         * Not on Ebus, bailing.
+         */
+        return;
+#else
+        /*
+         * Not on Ebus, must be OBIO.
+         */
+        if (prom_getproperty(up->port_node, "reg",
+                             (char *)&reg0, sizeof(reg0)) == -1) {
+                prom_printf("sunsu: no \"reg\" property\n");
+                return;
+        }
+        prom_apply_obio_ranges(&reg0, 1);
+        if (reg0.which_io != 0) {       /* Just in case... */
+                prom_printf("sunsu: bus number nonzero: 0x%x:%x\n",
+                    reg0.which_io, reg0.phys_addr);
+                return;
+        }
+        up->port.mapbase = reg0.phys_addr;
+        if ((up->port.membase = ioremap(reg0.phys_addr, reg0.reg_size)) == 0) {
+                prom_printf("sunsu: Cannot map registers.\n");
+                return;
+        }
+
+        /*
+         * 0x20 is sun4m thing, Dave Redman heritage.
+         * See arch/sparc/kernel/irq.c.
+         */
+#define IRQ_4M(n)       ((n)|0x20)
+
+        /*
+         * There is no intr property on MrCoffee, so hardwire it.
+         */
+        up->port.irq = IRQ_4M(13);
+#endif
+
+ebus_done:
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        if (!(up->port.flags & ASYNC_BUGGY_UART)) {
+                /*
+                 * Do a simple existence test first; if we fail this, there's
+                 * no point trying anything else.
+                 *
+                 * 0x80 is used as a nonsense port to prevent against false
+                 * positives due to ISA bus float.  The assumption is that
+                 * 0x80 is a non-existent port; which should be safe since
+                 * include/asm/io.h also makes this assumption.
+                 */
+                scratch = serial_inp(up, UART_IER);
+                serial_outp(up, UART_IER, 0);
+#ifdef __i386__
+                outb(0xff, 0x080);
+#endif
+                scratch2 = serial_inp(up, UART_IER);
+                serial_outp(up, UART_IER, 0x0f);
+#ifdef __i386__
+                outb(0, 0x080);
+#endif
+                scratch3 = serial_inp(up, UART_IER);
+                serial_outp(up, UART_IER, scratch);
+                if (scratch2 != 0 || scratch3 != 0x0F)
+                        goto out;       /* We failed; there's nothing here */
+        }
+
+        save_mcr = serial_in(up, UART_MCR);
+        save_lcr = serial_in(up, UART_LCR);
+
+        /* 
+         * Check to see if a UART is really there.  Certain broken
+         * internal modems based on the Rockwell chipset fail this
+         * test, because they apparently don't implement the loopback
+         * test mode.  So this test is skipped on the COM 1 through
+         * COM 4 ports.  This *should* be safe, since no board
+         * manufacturer would be stupid enough to design a board
+         * that conflicts with COM 1-4 --- we hope!
+         */
+        if (!(up->port.flags & ASYNC_SKIP_TEST)) {
+                serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A);
+                status1 = serial_inp(up, UART_MSR) & 0xF0;
+                serial_outp(up, UART_MCR, save_mcr);
+                if (status1 != 0x90)
+                        goto out;       /* We failed loopback test */
+        }
+        serial_outp(up, UART_LCR, 0xBF);        /* set up for StarTech test */
+        serial_outp(up, UART_EFR, 0);           /* EFR is the same as FCR */
+        serial_outp(up, UART_LCR, 0);
+        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        scratch = serial_in(up, UART_IIR) >> 6;
+        switch (scratch) {
+                case 0:
+                        up->port.type = PORT_16450;
+                        break;
+                case 1:
+                        up->port.type = PORT_UNKNOWN;
+                        break;
+                case 2:
+                        up->port.type = PORT_16550;
+                        break;
+                case 3:
+                        up->port.type = PORT_16550A;
+                        break;
+        }
+        if (up->port.type == PORT_16550A) {
+                /* Check for Startech UART's */
+                serial_outp(up, UART_LCR, UART_LCR_DLAB);
+                if (serial_in(up, UART_EFR) == 0) {
+                        up->port.type = PORT_16650;
+                } else {
+                        serial_outp(up, UART_LCR, 0xBF);
+                        if (serial_in(up, UART_EFR) == 0)
+                                up->port.type = PORT_16650V2;
+                }
+        }
+        if (up->port.type == PORT_16550A) {
+                /* Check for TI 16750 */
+                serial_outp(up, UART_LCR, save_lcr | UART_LCR_DLAB);
+                serial_outp(up, UART_FCR,
+                            UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
+                scratch = serial_in(up, UART_IIR) >> 5;
+                if (scratch == 7) {
+                        /*
+                         * If this is a 16750, and not a cheap UART
+                         * clone, then it should only go into 64 byte
+                         * mode if the UART_FCR7_64BYTE bit was set
+                         * while UART_LCR_DLAB was latched.
+                         */
+                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                        serial_outp(up, UART_LCR, 0);
+                        serial_outp(up, UART_FCR,
+                                    UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
+                        scratch = serial_in(up, UART_IIR) >> 5;
+                        if (scratch == 6)
+                                up->port.type = PORT_16750;
+                }
+                serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        }
+        serial_outp(up, UART_LCR, save_lcr);
+        if (up->port.type == PORT_16450) {
+                scratch = serial_in(up, UART_SCR);
+                serial_outp(up, UART_SCR, 0xa5);
+                status1 = serial_in(up, UART_SCR);
+                serial_outp(up, UART_SCR, 0x5a);
+                status2 = serial_in(up, UART_SCR);
+                serial_outp(up, UART_SCR, scratch);
+
+                if ((status1 != 0xa5) || (status2 != 0x5a))
+                        up->port.type = PORT_8250;
+        }
+
+        up->port.fifosize = uart_config[up->port.type].dfl_xmit_fifo_size;
+
+        if (up->port.type == PORT_UNKNOWN)
+                goto out;
+        up->type_probed = up->port.type;        /* XXX */
+
+        /*
+         * Reset the UART.
+         */
+#ifdef CONFIG_SERIAL_8250_RSA
+        if (up->port.type == PORT_RSA)
+                serial_outp(up, UART_RSA_FRR, 0);
+#endif
+        serial_outp(up, UART_MCR, save_mcr);
+        serial_outp(up, UART_FCR, (UART_FCR_ENABLE_FIFO |
+                                     UART_FCR_CLEAR_RCVR |
+                                     UART_FCR_CLEAR_XMIT));
+        serial_outp(up, UART_FCR, 0);
+        (void)serial_in(up, UART_RX);
+        serial_outp(up, UART_IER, 0);
+
+out:
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static struct uart_driver sunsu_reg = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "serial",
+        .devfs_name             = "tts/",
+        .dev_name               = "ttyS",
+        .major                  = TTY_MAJOR,
+};
+
+static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)
+{
+#ifdef CONFIG_SERIO
+        struct serio *serio;
+#endif
+
+        up->port.line = channel;
+        up->port.type = PORT_UNKNOWN;
+        up->port.uartclk = (SU_BASE_BAUD * 16);
+
+        if (up->su_type == SU_PORT_KBD)
+                up->cflag = B1200 | CS8 | CLOCAL | CREAD;
+        else
+                up->cflag = B4800 | CS8 | CLOCAL | CREAD;
+
+        sunsu_autoconfig(up);
+        if (up->port.type == PORT_UNKNOWN)
+                return -1;
+
+        printk(KERN_INFO "su%d at 0x%p (irq = %s) is a %s\n",
+               channel,
+               up->port.membase, __irq_itoa(up->port.irq),
+               sunsu_type(&up->port));
+
+#ifdef CONFIG_SERIO
+        up->serio = serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        if (serio) {
+                memset(serio, 0, sizeof(*serio));
+
+                serio->port_data = up;
+
+                serio->id.type = SERIO_RS232;
+                if (up->su_type == SU_PORT_KBD) {
+                        serio->id.proto = SERIO_SUNKBD;
+                        strlcpy(serio->name, "sukbd", sizeof(serio->name));
+                } else {
+                        serio->id.proto = SERIO_SUN;
+                        serio->id.extra = 1;
+                        strlcpy(serio->name, "sums", sizeof(serio->name));
+                }
+                strlcpy(serio->phys, (channel == 0 ? "su/serio0" : "su/serio1"),
+                        sizeof(serio->phys));
+
+                serio->write = sunsu_serio_write;
+                serio->open = sunsu_serio_open;
+                serio->close = sunsu_serio_close;
+
+                serio_register_port(serio);
+        } else {
+                printk(KERN_WARNING "su%d: not enough memory for serio port\n",
+                        channel);
+        }
+#endif
+
+        sunsu_startup(&up->port);
+        return 0;
+}
+
+/*
+ * ------------------------------------------------------------
+ * Serial console driver
+ * ------------------------------------------------------------
+ */
+
+#ifdef CONFIG_SERIAL_SUNSU_CONSOLE
+
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static __inline__ void wait_for_xmitr(struct uart_sunsu_port *up)
+{
+        unsigned int status, tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        do {
+                status = serial_in(up, UART_LSR);
+
+                if (status & UART_LSR_BI)
+                        up->lsr_break_flag = UART_LSR_BI;
+
+                if (--tmout == 0)
+                        break;
+                udelay(1);
+        } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & ASYNC_CONS_FLOW) {
+                tmout = 1000000;
+                while (--tmout &&
+                       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
+                        udelay(1);
+        }
+}
+
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ */
+static void sunsu_console_write(struct console *co, const char *s,
+                                unsigned int count)
+{
+        struct uart_sunsu_port *up = &sunsu_ports[co->index];
+        unsigned int ier;
+        int i;
+
+        /*
+         *      First save the UER then disable the interrupts
+         */
+        ier = serial_in(up, UART_IER);
+        serial_out(up, UART_IER, 0);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++, s++) {
+                wait_for_xmitr(up);
+
+                /*
+                 *      Send the character out.
+                 *      If a LF, also do CR...
+                 */
+                serial_out(up, UART_TX, *s);
+                if (*s == 10) {
+                        wait_for_xmitr(up);
+                        serial_out(up, UART_TX, 13);
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(up);
+        serial_out(up, UART_IER, ier);
+}
+
+/*
+ *      Setup initial baud/bits/parity. We do two things here:
+ *      - construct a cflag setting for the first su_open()
+ *      - initialize the serial port
+ *      Return non-zero if we didn't find a serial port.
+ */
+static int __init sunsu_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        printk("Console: ttyS%d (SU)\n",
+               (sunsu_reg.minor - 64) + co->index);
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= UART_NR)
+                co->index = 0;
+        port = &sunsu_ports[co->index].port;
+
+        /*
+         * Temporary fix.
+         */
+        spin_lock_init(&port->lock);
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static struct console sunsu_cons = {
+        .name   =       "ttyS",
+        .write  =       sunsu_console_write,
+        .device =       uart_console_device,
+        .setup  =       sunsu_console_setup,
+        .flags  =       CON_PRINTBUFFER,
+        .index  =       -1,
+        .data   =       &sunsu_reg,
+};
+#define SUNSU_CONSOLE   (&sunsu_cons)
+
+/*
+ *      Register console.
+ */
+
+static int __init sunsu_serial_console_init(void)
+{
+        int i;
+
+        if (con_is_present())
+                return 0;
+
+        for (i = 0; i < UART_NR; i++) {
+                int this_minor = sunsu_reg.minor + i;
+
+                if ((this_minor - 64) == (serial_console - 1))
+                        break;
+        }
+        if (i == UART_NR)
+                return 0;
+        if (sunsu_ports[i].port_node == 0)
+                return 0;
+
+        sunsu_cons.index = i;
+        register_console(&sunsu_cons);
+        return 0;
+}
+#else
+#define SUNSU_CONSOLE                   (NULL)
+#define sunsu_serial_console_init()     do { } while (0)
+#endif
+
+static int __init sunsu_serial_init(void)
+{
+        int instance, ret, i;
+
+        /* How many instances do we need?  */
+        instance = 0;
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_sunsu_port *up = &sunsu_ports[i];
+
+                if (up->su_type == SU_PORT_MS ||
+                    up->su_type == SU_PORT_KBD)
+                        continue;
+
+                up->port.flags |= ASYNC_BOOT_AUTOCONF;
+                up->port.type = PORT_UNKNOWN;
+                up->port.uartclk = (SU_BASE_BAUD * 16);
+
+                sunsu_autoconfig(up);
+                if (up->port.type == PORT_UNKNOWN)
+                        continue;
+
+                up->port.line = instance++;
+                up->port.ops = &sunsu_pops;
+        }
+
+        sunsu_reg.minor = sunserial_current_minor;
+        sunserial_current_minor += instance;
+
+        sunsu_reg.nr = instance;
+        sunsu_reg.cons = SUNSU_CONSOLE;
+
+        ret = uart_register_driver(&sunsu_reg);
+        if (ret < 0)
+                return ret;
+
+        sunsu_serial_console_init();
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_sunsu_port *up = &sunsu_ports[i];
+
+                /* Do not register Keyboard/Mouse lines with UART
+                 * layer.
+                 */
+                if (up->su_type == SU_PORT_MS ||
+                    up->su_type == SU_PORT_KBD)
+                        continue;
+
+                if (up->port.type == PORT_UNKNOWN)
+                        continue;
+
+                uart_add_one_port(&sunsu_reg, &up->port);
+        }
+
+        return 0;
+}
+
+static int su_node_ok(int node, char *name, int namelen)
+{
+        if (strncmp(name, "su", namelen) == 0 ||
+            strncmp(name, "su_pnp", namelen) == 0)
+                return 1;
+
+        if (strncmp(name, "serial", namelen) == 0) {
+                char compat[32];
+                int clen;
+
+                /* Is it _really_ a 'su' device? */
+                clen = prom_getproperty(node, "compatible", compat, sizeof(compat));
+                if (clen > 0) {
+                        if (strncmp(compat, "sab82532", 8) == 0) {
+                                /* Nope, Siemens serial, not for us. */
+                                return 0;
+                        }
+                }
+                return 1;
+        }
+
+        return 0;
+}
+
+#define SU_PROPSIZE     128
+
+/*
+ * Scan status structure.
+ * "prop" is a local variable but it eats stack to keep it in each
+ * stack frame of a recursive procedure.
+ */
+struct su_probe_scan {
+        int msnode, kbnode;     /* PROM nodes for mouse and keyboard */
+        int msx, kbx;           /* minors for mouse and keyboard */
+        int devices;            /* scan index */
+        char prop[SU_PROPSIZE];
+};
+
+/*
+ * We have several platforms which present 'su' in different parts
+ * of the device tree. 'su' may be found under obio, ebus, isa and pci.
+ * We walk over the tree and find them wherever PROM hides them.
+ */
+static void __init su_probe_any(struct su_probe_scan *t, int sunode)
+{
+        struct uart_sunsu_port *up;
+        int len;
+
+        if (t->devices >= UART_NR)
+                return;
+
+        for (; sunode != 0; sunode = prom_getsibling(sunode)) {
+                len = prom_getproperty(sunode, "name", t->prop, SU_PROPSIZE);
+                if (len <= 1)
+                        continue;               /* Broken PROM node */
+
+                if (su_node_ok(sunode, t->prop, len)) {
+                        up = &sunsu_ports[t->devices];
+                        if (t->kbnode != 0 && sunode == t->kbnode) {
+                                t->kbx = t->devices;
+                                up->su_type = SU_PORT_KBD;
+                        } else if (t->msnode != 0 && sunode == t->msnode) {
+                                t->msx = t->devices;
+                                up->su_type = SU_PORT_MS;
+                        } else {
+#ifdef CONFIG_SPARC64
+                                /*
+                                 * Do not attempt to use the truncated
+                                 * keyboard/mouse ports as serial ports
+                                 * on Ultras with PC keyboard attached.
+                                 */
+                                if (prom_getbool(sunode, "mouse"))
+                                        continue;
+                                if (prom_getbool(sunode, "keyboard"))
+                                        continue;
+#endif
+                                up->su_type = SU_PORT_PORT;
+                        }
+                        up->port_node = sunode;
+                        ++t->devices;
+                } else {
+                        su_probe_any(t, prom_getchild(sunode));
+                }
+        }
+}
+
+static int __init sunsu_probe(void)
+{
+        int node;
+        int len;
+        struct su_probe_scan scan;
+
+        /*
+         * First, we scan the tree.
+         */
+        scan.devices = 0;
+        scan.msx = -1;
+        scan.kbx = -1;
+        scan.kbnode = 0;
+        scan.msnode = 0;
+
+        /*
+         * Get the nodes for keyboard and mouse from 'aliases'...
+         */
+        node = prom_getchild(prom_root_node);
+        node = prom_searchsiblings(node, "aliases");
+        if (node != 0) {
+                len = prom_getproperty(node, "keyboard", scan.prop, SU_PROPSIZE);
+                if (len > 0) {
+                        scan.prop[len] = 0;
+                        scan.kbnode = prom_finddevice(scan.prop);
+                }
+
+                len = prom_getproperty(node, "mouse", scan.prop, SU_PROPSIZE);
+                if (len > 0) {
+                        scan.prop[len] = 0;
+                        scan.msnode = prom_finddevice(scan.prop);
+                }
+        }
+
+        su_probe_any(&scan, prom_getchild(prom_root_node));
+
+        /*
+         * Second, we process the special case of keyboard and mouse.
+         *
+         * Currently if we got keyboard and mouse hooked to "su" ports
+         * we do not use any possible remaining "su" as a serial port.
+         * Thus, we ignore values of .msx and .kbx, then compact ports.
+         */
+        if (scan.msx != -1 && scan.kbx != -1) {
+                sunsu_ports[0].su_type = SU_PORT_MS;
+                sunsu_ports[0].port_node = scan.msnode;
+                sunsu_kbd_ms_init(&sunsu_ports[0], 0);
+
+                sunsu_ports[1].su_type = SU_PORT_KBD;
+                sunsu_ports[1].port_node = scan.kbnode;
+                sunsu_kbd_ms_init(&sunsu_ports[1], 1);
+
+                return 0;
+        }
+
+        if (scan.msx != -1 || scan.kbx != -1) {
+                printk("sunsu_probe: cannot match keyboard and mouse, confused\n");
+                return -ENODEV;
+        }
+
+        if (scan.devices == 0)
+                return -ENODEV;
+
+        /*
+         * Console must be initiated after the generic initialization.
+         */
+        sunsu_serial_init();
+
+        return 0;
+}
+
+static void __exit sunsu_exit(void)
+{
+        int i, saw_uart;
+
+        saw_uart = 0;
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_sunsu_port *up = &sunsu_ports[i];
+
+                if (up->su_type == SU_PORT_MS ||
+                    up->su_type == SU_PORT_KBD) {
+#ifdef CONFIG_SERIO
+                        if (up->serio) {
+                                serio_unregister_port(up->serio);
+                                up->serio = NULL;
+                        }
+#endif
+                } else if (up->port.type != PORT_UNKNOWN) {
+                        uart_remove_one_port(&sunsu_reg, &up->port);
+                        saw_uart++;
+                }
+        }
+
+        if (saw_uart)
+                uart_unregister_driver(&sunsu_reg);
+}
+
+module_init(sunsu_probe);
+module_exit(sunsu_exit);
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
new file mode 100644
index 000000000000..5c4231ae295b
--- /dev/null
+++ b/drivers/serial/sunzilog.c
@@ -0,0 +1,1773 @@
+/*
+ * sunzilog.c
+ *
+ * Driver for Zilog serial chips found on Sun workstations and
+ * servers.  This driver could actually be made more generic.
+ *
+ * This is based on the old drivers/sbus/char/zs.c code.  A lot
+ * of code has been simply moved over directly from there but
+ * much has been rewritten.  Credits therefore go out to Eddie
+ * C. Dost, Pete Zaitcev, Ted Ts'o and Alex Buell for their
+ * work there.
+ *
+ *  Copyright (C) 2002 David S. Miller (davem@redhat.com)
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/ptrace.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/circ_buf.h>
+#include <linux/serial.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#include <linux/spinlock.h>
+#ifdef CONFIG_SERIO
+#include <linux/serio.h>
+#endif
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#ifdef CONFIG_SPARC64
+#include <asm/fhc.h>
+#endif
+#include <asm/sbus.h>
+
+#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/serial_core.h>
+
+#include "suncore.h"
+#include "sunzilog.h"
+
+/* On 32-bit sparcs we need to delay after register accesses
+ * to accommodate sun4 systems, but we do not need to flush writes.
+ * On 64-bit sparc we only need to flush single writes to ensure
+ * completion.
+ */
+#ifndef CONFIG_SPARC64
+#define ZSDELAY()               udelay(5)
+#define ZSDELAY_LONG()          udelay(20)
+#define ZS_WSYNC(channel)       do { } while (0)
+#else
+#define ZSDELAY()
+#define ZSDELAY_LONG()
+#define ZS_WSYNC(__channel) \
+        sbus_readb(&((__channel)->control))
+#endif
+
+static int num_sunzilog;
+#define NUM_SUNZILOG    num_sunzilog
+#define NUM_CHANNELS    (NUM_SUNZILOG * 2)
+
+#define KEYBOARD_LINE 0x2
+#define MOUSE_LINE    0x3
+
+#define ZS_CLOCK                4915200 /* Zilog input clock rate. */
+#define ZS_CLOCK_DIVISOR        16      /* Divisor this driver uses. */
+
+/*
+ * We wrap our port structure around the generic uart_port.
+ */
+struct uart_sunzilog_port {
+        struct uart_port                port;
+
+        /* IRQ servicing chain.  */
+        struct uart_sunzilog_port       *next;
+
+        /* Current values of Zilog write registers.  */
+        unsigned char                   curregs[NUM_ZSREGS];
+
+        unsigned int                    flags;
+#define SUNZILOG_FLAG_CONS_KEYB         0x00000001
+#define SUNZILOG_FLAG_CONS_MOUSE        0x00000002
+#define SUNZILOG_FLAG_IS_CONS           0x00000004
+#define SUNZILOG_FLAG_IS_KGDB           0x00000008
+#define SUNZILOG_FLAG_MODEM_STATUS      0x00000010
+#define SUNZILOG_FLAG_IS_CHANNEL_A      0x00000020
+#define SUNZILOG_FLAG_REGS_HELD         0x00000040
+#define SUNZILOG_FLAG_TX_STOPPED        0x00000080
+#define SUNZILOG_FLAG_TX_ACTIVE         0x00000100
+
+        unsigned int cflag;
+
+        unsigned char                   parity_mask;
+        unsigned char                   prev_status;
+
+#ifdef CONFIG_SERIO
+        struct serio                    *serio;
+        int                             serio_open;
+#endif
+};
+
+#define ZILOG_CHANNEL_FROM_PORT(PORT)   ((struct zilog_channel __iomem *)((PORT)->membase))
+#define UART_ZILOG(PORT)                ((struct uart_sunzilog_port *)(PORT))
+
+#define ZS_IS_KEYB(UP)  ((UP)->flags & SUNZILOG_FLAG_CONS_KEYB)
+#define ZS_IS_MOUSE(UP) ((UP)->flags & SUNZILOG_FLAG_CONS_MOUSE)
+#define ZS_IS_CONS(UP)  ((UP)->flags & SUNZILOG_FLAG_IS_CONS)
+#define ZS_IS_KGDB(UP)  ((UP)->flags & SUNZILOG_FLAG_IS_KGDB)
+#define ZS_WANTS_MODEM_STATUS(UP)       ((UP)->flags & SUNZILOG_FLAG_MODEM_STATUS)
+#define ZS_IS_CHANNEL_A(UP)     ((UP)->flags & SUNZILOG_FLAG_IS_CHANNEL_A)
+#define ZS_REGS_HELD(UP)        ((UP)->flags & SUNZILOG_FLAG_REGS_HELD)
+#define ZS_TX_STOPPED(UP)       ((UP)->flags & SUNZILOG_FLAG_TX_STOPPED)
+#define ZS_TX_ACTIVE(UP)        ((UP)->flags & SUNZILOG_FLAG_TX_ACTIVE)
+
+/* Reading and writing Zilog8530 registers.  The delays are to make this
+ * driver work on the Sun4 which needs a settling delay after each chip
+ * register access, other machines handle this in hardware via auxiliary
+ * flip-flops which implement the settle time we do in software.
+ *
+ * The port lock must be held and local IRQs must be disabled
+ * when {read,write}_zsreg is invoked.
+ */
+static unsigned char read_zsreg(struct zilog_channel __iomem *channel,
+                                unsigned char reg)
+{
+        unsigned char retval;
+
+        sbus_writeb(reg, &channel->control);
+        ZSDELAY();
+        retval = sbus_readb(&channel->control);
+        ZSDELAY();
+
+        return retval;
+}
+
+static void write_zsreg(struct zilog_channel __iomem *channel,
+                        unsigned char reg, unsigned char value)
+{
+        sbus_writeb(reg, &channel->control);
+        ZSDELAY();
+        sbus_writeb(value, &channel->control);
+        ZSDELAY();
+}
+
+static void sunzilog_clear_fifo(struct zilog_channel __iomem *channel)
+{
+        int i;
+
+        for (i = 0; i < 32; i++) {
+                unsigned char regval;
+
+                regval = sbus_readb(&channel->control);
+                ZSDELAY();
+                if (regval & Rx_CH_AV)
+                        break;
+
+                regval = read_zsreg(channel, R1);
+                sbus_readb(&channel->data);
+                ZSDELAY();
+
+                if (regval & (PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        sbus_writeb(ERR_RES, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+                }
+        }
+}
+
+/* This function must only be called when the TX is not busy.  The UART
+ * port lock must be held and local interrupts disabled.
+ */
+static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs)
+{
+        int i;
+
+        /* Let pending transmits finish.  */
+        for (i = 0; i < 1000; i++) {
+                unsigned char stat = read_zsreg(channel, R1);
+                if (stat & ALL_SNT)
+                        break;
+                udelay(100);
+        }
+
+        sbus_writeb(ERR_RES, &channel->control);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+
+        sunzilog_clear_fifo(channel);
+
+        /* Disable all interrupts.  */
+        write_zsreg(channel, R1,
+                    regs[R1] & ~(RxINT_MASK | TxINT_ENAB | EXT_INT_ENAB));
+
+        /* Set parity, sync config, stop bits, and clock divisor.  */
+        write_zsreg(channel, R4, regs[R4]);
+
+        /* Set misc. TX/RX control bits.  */
+        write_zsreg(channel, R10, regs[R10]);
+
+        /* Set TX/RX controls sans the enable bits.  */
+        write_zsreg(channel, R3, regs[R3] & ~RxENAB);
+        write_zsreg(channel, R5, regs[R5] & ~TxENAB);
+
+        /* Synchronous mode config.  */
+        write_zsreg(channel, R6, regs[R6]);
+        write_zsreg(channel, R7, regs[R7]);
+
+        /* Don't mess with the interrupt vector (R2, unused by us) and
+         * master interrupt control (R9).  We make sure this is setup
+         * properly at probe time then never touch it again.
+         */
+
+        /* Disable baud generator.  */
+        write_zsreg(channel, R14, regs[R14] & ~BRENAB);
+
+        /* Clock mode control.  */
+        write_zsreg(channel, R11, regs[R11]);
+
+        /* Lower and upper byte of baud rate generator divisor.  */
+        write_zsreg(channel, R12, regs[R12]);
+        write_zsreg(channel, R13, regs[R13]);
+        
+        /* Now rewrite R14, with BRENAB (if set).  */
+        write_zsreg(channel, R14, regs[R14]);
+
+        /* External status interrupt control.  */
+        write_zsreg(channel, R15, regs[R15]);
+
+        /* Reset external status interrupts.  */
+        write_zsreg(channel, R0, RES_EXT_INT);
+        write_zsreg(channel, R0, RES_EXT_INT);
+
+        /* Rewrite R3/R5, this time without enables masked.  */
+        write_zsreg(channel, R3, regs[R3]);
+        write_zsreg(channel, R5, regs[R5]);
+
+        /* Rewrite R1, this time without IRQ enabled masked.  */
+        write_zsreg(channel, R1, regs[R1]);
+}
+
+/* Reprogram the Zilog channel HW registers with the copies found in the
+ * software state struct.  If the transmitter is busy, we defer this update
+ * until the next TX complete interrupt.  Else, we do it right now.
+ *
+ * The UART port lock must be held and local interrupts disabled.
+ */
+static void sunzilog_maybe_update_regs(struct uart_sunzilog_port *up,
+                                       struct zilog_channel __iomem *channel)
+{
+        if (!ZS_REGS_HELD(up)) {
+                if (ZS_TX_ACTIVE(up)) {
+                        up->flags |= SUNZILOG_FLAG_REGS_HELD;
+                } else {
+                        __load_zsregs(channel, up->curregs);
+                }
+        }
+}
+
+static void sunzilog_change_mouse_baud(struct uart_sunzilog_port *up)
+{
+        unsigned int cur_cflag = up->cflag;
+        int brg, new_baud;
+
+        up->cflag &= ~CBAUD;
+        up->cflag |= suncore_mouse_baud_cflag_next(cur_cflag, &new_baud);
+
+        brg = BPS_TO_BRG(new_baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+        up->curregs[R12] = (brg & 0xff);
+        up->curregs[R13] = (brg >> 8) & 0xff;
+        sunzilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(&up->port));
+}
+
+static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,
+                                         unsigned char ch, int is_break,
+                                         struct pt_regs *regs)
+{
+        if (ZS_IS_KEYB(up)) {
+                /* Stop-A is handled by drivers/char/keyboard.c now. */
+#ifdef CONFIG_SERIO
+                if (up->serio_open)
+                        serio_interrupt(up->serio, ch, 0, regs);
+#endif
+        } else if (ZS_IS_MOUSE(up)) {
+                int ret = suncore_mouse_baud_detection(ch, is_break);
+
+                switch (ret) {
+                case 2:
+                        sunzilog_change_mouse_baud(up);
+                        /* fallthru */
+                case 1:
+                        break;
+
+                case 0:
+#ifdef CONFIG_SERIO
+                        if (up->serio_open)
+                                serio_interrupt(up->serio, ch, 0, regs);
+#endif
+                        break;
+                };
+        }
+}
+
+static struct tty_struct *
+sunzilog_receive_chars(struct uart_sunzilog_port *up,
+                       struct zilog_channel __iomem *channel,
+                       struct pt_regs *regs)
+{
+        struct tty_struct *tty;
+        unsigned char ch, r1;
+
+        tty = NULL;
+        if (up->port.info != NULL &&            /* Unopened serial console */
+            up->port.info->tty != NULL)         /* Keyboard || mouse */
+                tty = up->port.info->tty;
+
+        for (;;) {
+
+                r1 = read_zsreg(channel, R1);
+                if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        sbus_writeb(ERR_RES, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+                }
+
+                ch = sbus_readb(&channel->control);
+                ZSDELAY();
+
+                /* This funny hack depends upon BRK_ABRT not interfering
+                 * with the other bits we care about in R1.
+                 */
+                if (ch & BRK_ABRT)
+                        r1 |= BRK_ABRT;
+
+                if (!(ch & Rx_CH_AV))
+                        break;
+
+                ch = sbus_readb(&channel->data);
+                ZSDELAY();
+
+                ch &= up->parity_mask;
+
+                if (unlikely(ZS_IS_KEYB(up)) || unlikely(ZS_IS_MOUSE(up))) {
+                        sunzilog_kbdms_receive_chars(up, ch, 0, regs);
+                        continue;
+                }
+
+                if (tty == NULL) {
+                        uart_handle_sysrq_char(&up->port, ch, regs);
+                        continue;
+                }
+
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        tty->flip.work.func((void *)tty);
+                        /*
+                         * The 8250 bails out of the loop here,
+                         * but we need to read everything, or die.
+                         */
+                        if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                continue;
+                }
+
+                /* A real serial line, record the character and status.  */
+                *tty->flip.char_buf_ptr = ch;
+                *tty->flip.flag_buf_ptr = TTY_NORMAL;
+                up->port.icount.rx++;
+                if (r1 & (BRK_ABRT | PAR_ERR | Rx_OVR | CRC_ERR)) {
+                        if (r1 & BRK_ABRT) {
+                                r1 &= ~(PAR_ERR | CRC_ERR);
+                                up->port.icount.brk++;
+                                if (uart_handle_break(&up->port))
+                                        continue;
+                        }
+                        else if (r1 & PAR_ERR)
+                                up->port.icount.parity++;
+                        else if (r1 & CRC_ERR)
+                                up->port.icount.frame++;
+                        if (r1 & Rx_OVR)
+                                up->port.icount.overrun++;
+                        r1 &= up->port.read_status_mask;
+                        if (r1 & BRK_ABRT)
+                                *tty->flip.flag_buf_ptr = TTY_BREAK;
+                        else if (r1 & PAR_ERR)
+                                *tty->flip.flag_buf_ptr = TTY_PARITY;
+                        else if (r1 & CRC_ERR)
+                                *tty->flip.flag_buf_ptr = TTY_FRAME;
+                }
+                if (uart_handle_sysrq_char(&up->port, ch, regs))
+                        continue;
+
+                if (up->port.ignore_status_mask == 0xff ||
+                    (r1 & up->port.ignore_status_mask) == 0) {
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+                if ((r1 & Rx_OVR) &&
+                    tty->flip.count < TTY_FLIPBUF_SIZE) {
+                        *tty->flip.flag_buf_ptr = TTY_OVERRUN;
+                        tty->flip.flag_buf_ptr++;
+                        tty->flip.char_buf_ptr++;
+                        tty->flip.count++;
+                }
+        }
+
+        return tty;
+}
+
+static void sunzilog_status_handle(struct uart_sunzilog_port *up,
+                                   struct zilog_channel __iomem *channel,
+                                   struct pt_regs *regs)
+{
+        unsigned char status;
+
+        status = sbus_readb(&channel->control);
+        ZSDELAY();
+
+        sbus_writeb(RES_EXT_INT, &channel->control);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+
+        if (status & BRK_ABRT) {
+                if (ZS_IS_MOUSE(up))
+                        sunzilog_kbdms_receive_chars(up, 0, 1, regs);
+                if (ZS_IS_CONS(up)) {
+                        /* Wait for BREAK to deassert to avoid potentially
+                         * confusing the PROM.
+                         */
+                        while (1) {
+                                status = sbus_readb(&channel->control);
+                                ZSDELAY();
+                                if (!(status & BRK_ABRT))
+                                        break;
+                        }
+                        sun_do_break();
+                        return;
+                }
+        }
+
+        if (ZS_WANTS_MODEM_STATUS(up)) {
+                if (status & SYNC)
+                        up->port.icount.dsr++;
+
+                /* The Zilog just gives us an interrupt when DCD/CTS/etc. change.
+                 * But it does not tell us which bit has changed, we have to keep
+                 * track of this ourselves.
+                 */
+                if ((status ^ up->prev_status) ^ DCD)
+                        uart_handle_dcd_change(&up->port,
+                                               (status & DCD));
+                if ((status ^ up->prev_status) ^ CTS)
+                        uart_handle_cts_change(&up->port,
+                                               (status & CTS));
+
+                wake_up_interruptible(&up->port.info->delta_msr_wait);
+        }
+
+        up->prev_status = status;
+}
+
+static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
+                                    struct zilog_channel __iomem *channel)
+{
+        struct circ_buf *xmit;
+
+        if (ZS_IS_CONS(up)) {
+                unsigned char status = sbus_readb(&channel->control);
+                ZSDELAY();
+
+                /* TX still busy?  Just wait for the next TX done interrupt.
+                 *
+                 * It can occur because of how we do serial console writes.  It would
+                 * be nice to transmit console writes just like we normally would for
+                 * a TTY line. (ie. buffered and TX interrupt driven).  That is not
+                 * easy because console writes cannot sleep.  One solution might be
+                 * to poll on enough port->xmit space becomming free.  -DaveM
+                 */
+                if (!(status & Tx_BUF_EMP))
+                        return;
+        }
+
+        up->flags &= ~SUNZILOG_FLAG_TX_ACTIVE;
+
+        if (ZS_REGS_HELD(up)) {
+                __load_zsregs(channel, up->curregs);
+                up->flags &= ~SUNZILOG_FLAG_REGS_HELD;
+        }
+
+        if (ZS_TX_STOPPED(up)) {
+                up->flags &= ~SUNZILOG_FLAG_TX_STOPPED;
+                goto ack_tx_int;
+        }
+
+        if (up->port.x_char) {
+                up->flags |= SUNZILOG_FLAG_TX_ACTIVE;
+                sbus_writeb(up->port.x_char, &channel->data);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+
+                up->port.icount.tx++;
+                up->port.x_char = 0;
+                return;
+        }
+
+        if (up->port.info == NULL)
+                goto ack_tx_int;
+        xmit = &up->port.info->xmit;
+        if (uart_circ_empty(xmit)) {
+                uart_write_wakeup(&up->port);
+                goto ack_tx_int;
+        }
+        if (uart_tx_stopped(&up->port))
+                goto ack_tx_int;
+
+        up->flags |= SUNZILOG_FLAG_TX_ACTIVE;
+        sbus_writeb(xmit->buf[xmit->tail], &channel->data);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+
+        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+        up->port.icount.tx++;
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        return;
+
+ack_tx_int:
+        sbus_writeb(RES_Tx_P, &channel->control);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+}
+
+static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_sunzilog_port *up = dev_id;
+
+        while (up) {
+                struct zilog_channel __iomem *channel
+                        = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                struct tty_struct *tty;
+                unsigned char r3;
+
+                spin_lock(&up->port.lock);
+                r3 = read_zsreg(channel, R3);
+
+                /* Channel A */
+                tty = NULL;
+                if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
+                        sbus_writeb(RES_H_IUS, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+
+                        if (r3 & CHARxIP)
+                                tty = sunzilog_receive_chars(up, channel, regs);
+                        if (r3 & CHAEXT)
+                                sunzilog_status_handle(up, channel, regs);
+                        if (r3 & CHATxIP)
+                                sunzilog_transmit_chars(up, channel);
+                }
+                spin_unlock(&up->port.lock);
+
+                if (tty)
+                        tty_flip_buffer_push(tty);
+
+                /* Channel B */
+                up = up->next;
+                channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+
+                spin_lock(&up->port.lock);
+                tty = NULL;
+                if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) {
+                        sbus_writeb(RES_H_IUS, &channel->control);
+                        ZSDELAY();
+                        ZS_WSYNC(channel);
+
+                        if (r3 & CHBRxIP)
+                                tty = sunzilog_receive_chars(up, channel, regs);
+                        if (r3 & CHBEXT)
+                                sunzilog_status_handle(up, channel, regs);
+                        if (r3 & CHBTxIP)
+                                sunzilog_transmit_chars(up, channel);
+                }
+                spin_unlock(&up->port.lock);
+
+                if (tty)
+                        tty_flip_buffer_push(tty);
+
+                up = up->next;
+        }
+
+        return IRQ_HANDLED;
+}
+
+/* A convenient way to quickly get R0 status.  The caller must _not_ hold the
+ * port lock, it is acquired here.
+ */
+static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port)
+{
+        struct zilog_channel __iomem *channel;
+        unsigned long flags;
+        unsigned char status;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        channel = ZILOG_CHANNEL_FROM_PORT(port);
+        status = sbus_readb(&channel->control);
+        ZSDELAY();
+
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        return status;
+}
+
+/* The port lock is not held.  */
+static unsigned int sunzilog_tx_empty(struct uart_port *port)
+{
+        unsigned char status;
+        unsigned int ret;
+
+        status = sunzilog_read_channel_status(port);
+        if (status & Tx_BUF_EMP)
+                ret = TIOCSER_TEMT;
+        else
+                ret = 0;
+
+        return ret;
+}
+
+/* The port lock is not held.  */
+static unsigned int sunzilog_get_mctrl(struct uart_port *port)
+{
+        unsigned char status;
+        unsigned int ret;
+
+        status = sunzilog_read_channel_status(port);
+
+        ret = 0;
+        if (status & DCD)
+                ret |= TIOCM_CAR;
+        if (status & SYNC)
+                ret |= TIOCM_DSR;
+        if (status & CTS)
+                ret |= TIOCM_CTS;
+
+        return ret;
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void sunzilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+        struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char set_bits, clear_bits;
+
+        set_bits = clear_bits = 0;
+
+        if (mctrl & TIOCM_RTS)
+                set_bits |= RTS;
+        else
+                clear_bits |= RTS;
+        if (mctrl & TIOCM_DTR)
+                set_bits |= DTR;
+        else
+                clear_bits |= DTR;
+
+        /* NOTE: Not subject to 'transmitter active' rule.  */ 
+        up->curregs[R5] |= set_bits;
+        up->curregs[R5] &= ~clear_bits;
+        write_zsreg(channel, R5, up->curregs[R5]);
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void sunzilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+
+        up->flags |= SUNZILOG_FLAG_TX_STOPPED;
+}
+
+/* The port lock is held and interrupts are disabled.  */
+static void sunzilog_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+        struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char status;
+
+        up->flags |= SUNZILOG_FLAG_TX_ACTIVE;
+        up->flags &= ~SUNZILOG_FLAG_TX_STOPPED;
+
+        status = sbus_readb(&channel->control);
+        ZSDELAY();
+
+        /* TX busy?  Just wait for the TX done interrupt.  */
+        if (!(status & Tx_BUF_EMP))
+                return;
+
+        /* Send the first character to jump-start the TX done
+         * IRQ sending engine.
+         */
+        if (port->x_char) {
+                sbus_writeb(port->x_char, &channel->data);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+
+                port->icount.tx++;
+                port->x_char = 0;
+        } else {
+                struct circ_buf *xmit = &port->info->xmit;
+
+                sbus_writeb(xmit->buf[xmit->tail], &channel->data);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+
+                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                        uart_write_wakeup(&up->port);
+        }
+}
+
+/* The port lock is held.  */
+static void sunzilog_stop_rx(struct uart_port *port)
+{
+        struct uart_sunzilog_port *up = UART_ZILOG(port);
+        struct zilog_channel __iomem *channel;
+
+        if (ZS_IS_CONS(up))
+                return;
+
+        channel = ZILOG_CHANNEL_FROM_PORT(port);
+
+        /* Disable all RX interrupts.  */
+        up->curregs[R1] &= ~RxINT_MASK;
+        sunzilog_maybe_update_regs(up, channel);
+}
+
+/* The port lock is held.  */
+static void sunzilog_enable_ms(struct uart_port *port)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+        struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char new_reg;
+
+        new_reg = up->curregs[R15] | (DCDIE | SYNCIE | CTSIE);
+        if (new_reg != up->curregs[R15]) {
+                up->curregs[R15] = new_reg;
+
+                /* NOTE: Not subject to 'transmitter active' rule.  */ 
+                write_zsreg(channel, R15, up->curregs[R15]);
+        }
+}
+
+/* The port lock is not held.  */
+static void sunzilog_break_ctl(struct uart_port *port, int break_state)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+        struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
+        unsigned char set_bits, clear_bits, new_reg;
+        unsigned long flags;
+
+        set_bits = clear_bits = 0;
+
+        if (break_state)
+                set_bits |= SND_BRK;
+        else
+                clear_bits |= SND_BRK;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        new_reg = (up->curregs[R5] | set_bits) & ~clear_bits;
+        if (new_reg != up->curregs[R5]) {
+                up->curregs[R5] = new_reg;
+
+                /* NOTE: Not subject to 'transmitter active' rule.  */ 
+                write_zsreg(channel, R5, up->curregs[R5]);
+        }
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void __sunzilog_startup(struct uart_sunzilog_port *up)
+{
+        struct zilog_channel __iomem *channel;
+
+        channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+        up->prev_status = sbus_readb(&channel->control);
+
+        /* Enable receiver and transmitter.  */
+        up->curregs[R3] |= RxENAB;
+        up->curregs[R5] |= TxENAB;
+
+        up->curregs[R1] |= EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;
+        sunzilog_maybe_update_regs(up, channel);
+}
+
+static int sunzilog_startup(struct uart_port *port)
+{
+        struct uart_sunzilog_port *up = UART_ZILOG(port);
+        unsigned long flags;
+
+        if (ZS_IS_CONS(up))
+                return 0;
+
+        spin_lock_irqsave(&port->lock, flags);
+        __sunzilog_startup(up);
+        spin_unlock_irqrestore(&port->lock, flags);
+        return 0;
+}
+
+/*
+ * The test for ZS_IS_CONS is explained by the following e-mail:
+ *****
+ * From: Russell King <rmk@arm.linux.org.uk>
+ * Date: Sun, 8 Dec 2002 10:18:38 +0000
+ *
+ * On Sun, Dec 08, 2002 at 02:43:36AM -0500, Pete Zaitcev wrote:
+ * > I boot my 2.5 boxes using "console=ttyS0,9600" argument,
+ * > and I noticed that something is not right with reference
+ * > counting in this case. It seems that when the console
+ * > is open by kernel initially, this is not accounted
+ * > as an open, and uart_startup is not called.
+ *
+ * That is correct.  We are unable to call uart_startup when the serial
+ * console is initialised because it may need to allocate memory (as
+ * request_irq does) and the memory allocators may not have been
+ * initialised.
+ *
+ * 1. initialise the port into a state where it can send characters in the
+ *    console write method.
+ *
+ * 2. don't do the actual hardware shutdown in your shutdown() method (but
+ *    do the normal software shutdown - ie, free irqs etc)
+ *****
+ */
+static void sunzilog_shutdown(struct uart_port *port)
+{
+        struct uart_sunzilog_port *up = UART_ZILOG(port);
+        struct zilog_channel __iomem *channel;
+        unsigned long flags;
+
+        if (ZS_IS_CONS(up))
+                return;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        channel = ZILOG_CHANNEL_FROM_PORT(port);
+
+        /* Disable receiver and transmitter.  */
+        up->curregs[R3] &= ~RxENAB;
+        up->curregs[R5] &= ~TxENAB;
+
+        /* Disable all interrupts and BRK assertion.  */
+        up->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+        up->curregs[R5] &= ~SND_BRK;
+        sunzilog_maybe_update_regs(up, channel);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+/* Shared by TTY driver and serial console setup.  The port lock is held
+ * and local interrupts are disabled.
+ */
+static void
+sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag,
+                       unsigned int iflag, int brg)
+{
+
+        up->curregs[R10] = NRZ;
+        up->curregs[R11] = TCBR | RCBR;
+
+        /* Program BAUD and clock source. */
+        up->curregs[R4] &= ~XCLK_MASK;
+        up->curregs[R4] |= X16CLK;
+        up->curregs[R12] = brg & 0xff;
+        up->curregs[R13] = (brg >> 8) & 0xff;
+        up->curregs[R14] = BRSRC | BRENAB;
+
+        /* Character size, stop bits, and parity. */
+        up->curregs[3] &= ~RxN_MASK;
+        up->curregs[5] &= ~TxN_MASK;
+        switch (cflag & CSIZE) {
+        case CS5:
+                up->curregs[3] |= Rx5;
+                up->curregs[5] |= Tx5;
+                up->parity_mask = 0x1f;
+                break;
+        case CS6:
+                up->curregs[3] |= Rx6;
+                up->curregs[5] |= Tx6;
+                up->parity_mask = 0x3f;
+                break;
+        case CS7:
+                up->curregs[3] |= Rx7;
+                up->curregs[5] |= Tx7;
+                up->parity_mask = 0x7f;
+                break;
+        case CS8:
+        default:
+                up->curregs[3] |= Rx8;
+                up->curregs[5] |= Tx8;
+                up->parity_mask = 0xff;
+                break;
+        };
+        up->curregs[4] &= ~0x0c;
+        if (cflag & CSTOPB)
+                up->curregs[4] |= SB2;
+        else
+                up->curregs[4] |= SB1;
+        if (cflag & PARENB)
+                up->curregs[4] |= PAR_ENAB;
+        else
+                up->curregs[4] &= ~PAR_ENAB;
+        if (!(cflag & PARODD))
+                up->curregs[4] |= PAR_EVEN;
+        else
+                up->curregs[4] &= ~PAR_EVEN;
+
+        up->port.read_status_mask = Rx_OVR;
+        if (iflag & INPCK)
+                up->port.read_status_mask |= CRC_ERR | PAR_ERR;
+        if (iflag & (BRKINT | PARMRK))
+                up->port.read_status_mask |= BRK_ABRT;
+
+        up->port.ignore_status_mask = 0;
+        if (iflag & IGNPAR)
+                up->port.ignore_status_mask |= CRC_ERR | PAR_ERR;
+        if (iflag & IGNBRK) {
+                up->port.ignore_status_mask |= BRK_ABRT;
+                if (iflag & IGNPAR)
+                        up->port.ignore_status_mask |= Rx_OVR;
+        }
+
+        if ((cflag & CREAD) == 0)
+                up->port.ignore_status_mask = 0xff;
+}
+
+/* The port lock is not held.  */
+static void
+sunzilog_set_termios(struct uart_port *port, struct termios *termios,
+                     struct termios *old)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+        unsigned long flags;
+        int baud, brg;
+
+        baud = uart_get_baud_rate(port, termios, old, 1200, 76800);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+
+        sunzilog_convert_to_zs(up, termios->c_cflag, termios->c_iflag, brg);
+
+        if (UART_ENABLE_MS(&up->port, termios->c_cflag))
+                up->flags |= SUNZILOG_FLAG_MODEM_STATUS;
+        else
+                up->flags &= ~SUNZILOG_FLAG_MODEM_STATUS;
+
+        up->cflag = termios->c_cflag;
+
+        sunzilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(port));
+
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static const char *sunzilog_type(struct uart_port *port)
+{
+        return "SunZilog";
+}
+
+/* We do not request/release mappings of the registers here, this
+ * happens at early serial probe time.
+ */
+static void sunzilog_release_port(struct uart_port *port)
+{
+}
+
+static int sunzilog_request_port(struct uart_port *port)
+{
+        return 0;
+}
+
+/* These do not need to do anything interesting either.  */
+static void sunzilog_config_port(struct uart_port *port, int flags)
+{
+}
+
+/* We do not support letting the user mess with the divisor, IRQ, etc. */
+static int sunzilog_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        return -EINVAL;
+}
+
+static struct uart_ops sunzilog_pops = {
+        .tx_empty       =       sunzilog_tx_empty,
+        .set_mctrl      =       sunzilog_set_mctrl,
+        .get_mctrl      =       sunzilog_get_mctrl,
+        .stop_tx        =       sunzilog_stop_tx,
+        .start_tx       =       sunzilog_start_tx,
+        .stop_rx        =       sunzilog_stop_rx,
+        .enable_ms      =       sunzilog_enable_ms,
+        .break_ctl      =       sunzilog_break_ctl,
+        .startup        =       sunzilog_startup,
+        .shutdown       =       sunzilog_shutdown,
+        .set_termios    =       sunzilog_set_termios,
+        .type           =       sunzilog_type,
+        .release_port   =       sunzilog_release_port,
+        .request_port   =       sunzilog_request_port,
+        .config_port    =       sunzilog_config_port,
+        .verify_port    =       sunzilog_verify_port,
+};
+
+static struct uart_sunzilog_port *sunzilog_port_table;
+static struct zilog_layout __iomem **sunzilog_chip_regs;
+
+static struct uart_sunzilog_port *sunzilog_irq_chain;
+static int zilog_irq = -1;
+
+static struct uart_driver sunzilog_reg = {
+        .owner          =       THIS_MODULE,
+        .driver_name    =       "ttyS",
+        .devfs_name     =       "tts/",
+        .dev_name       =       "ttyS",
+        .major          =       TTY_MAJOR,
+};
+
+static void * __init alloc_one_table(unsigned long size)
+{
+        void *ret;
+
+        ret = kmalloc(size, GFP_KERNEL);
+        if (ret != NULL)
+                memset(ret, 0, size);
+
+        return ret;
+}
+
+static void __init sunzilog_alloc_tables(void)
+{
+        sunzilog_port_table = 
+                alloc_one_table(NUM_CHANNELS * sizeof(struct uart_sunzilog_port));
+        sunzilog_chip_regs = 
+                alloc_one_table(NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *));
+
+        if (sunzilog_port_table == NULL || sunzilog_chip_regs == NULL) {
+                prom_printf("SunZilog: Cannot allocate tables.\n");
+                prom_halt();
+        }
+}
+
+#ifdef CONFIG_SPARC64
+
+/* We used to attempt to use the address property of the Zilog device node
+ * but that totally is not necessary on sparc64.
+ */
+static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)
+{
+        unsigned long mapped_addr;
+        unsigned int sun4u_ino;
+        struct sbus_bus *sbus = NULL;
+        struct sbus_dev *sdev = NULL;
+        int err;
+
+        if (central_bus == NULL) {
+                for_each_sbus(sbus) {
+                        for_each_sbusdev(sdev, sbus) {
+                                if (sdev->prom_node == zsnode)
+                                        goto found;
+                        }
+                }
+        }
+ found:
+        if (sdev == NULL && central_bus == NULL) {
+                prom_printf("SunZilog: sdev&&central == NULL for "
+                            "Zilog %d in get_zs_sun4u.\n", chip);
+                prom_halt();
+        }
+        if (central_bus == NULL) {
+                mapped_addr =
+                        sbus_ioremap(&sdev->resource[0], 0,
+                                     PAGE_SIZE,
+                                     "Zilog Registers");
+        } else {
+                struct linux_prom_registers zsregs[1];
+
+                err = prom_getproperty(zsnode, "reg",
+                                       (char *) &zsregs[0],
+                                       sizeof(zsregs));
+                if (err == -1) {
+                        prom_printf("SunZilog: Cannot map "
+                                    "Zilog %d regs on "
+                                    "central bus.\n", chip);
+                        prom_halt();
+                }
+                apply_fhc_ranges(central_bus->child,
+                                 &zsregs[0], 1);
+                apply_central_ranges(central_bus, &zsregs[0], 1);
+                mapped_addr =
+                        (((u64)zsregs[0].which_io)<<32UL) |
+                        ((u64)zsregs[0].phys_addr);
+        }
+
+        if (zilog_irq == -1) {
+                if (central_bus) {
+                        unsigned long iclr, imap;
+
+                        iclr = central_bus->child->fhc_regs.uregs
+                                + FHC_UREGS_ICLR;
+                        imap = central_bus->child->fhc_regs.uregs
+                                + FHC_UREGS_IMAP;
+                        zilog_irq = build_irq(12, 0, iclr, imap);
+                } else {
+                        err = prom_getproperty(zsnode, "interrupts",
+                                               (char *) &sun4u_ino,
+                                               sizeof(sun4u_ino));
+                        zilog_irq = sbus_build_irq(sbus_root, sun4u_ino);
+                }
+        }
+
+        return (struct zilog_layout __iomem *) mapped_addr;
+}
+#else /* CONFIG_SPARC64 */
+
+/*
+ * XXX The sun4d case is utterly screwed: it tries to re-walk the tree
+ * (for the 3rd time) in order to find bootbus and cpu. Streamline it.
+ */
+static struct zilog_layout __iomem * __init get_zs_sun4cmd(int chip, int node)
+{
+        struct linux_prom_irqs irq_info[2];
+        void __iomem *mapped_addr = NULL;
+        int zsnode, cpunode, bbnode;
+        struct linux_prom_registers zsreg[4];
+        struct resource res;
+
+        if (sparc_cpu_model == sun4d) {
+                int walk;
+
+                zsnode = 0;
+                bbnode = 0;
+                cpunode = 0;
+                for (walk = prom_getchild(prom_root_node);
+                     (walk = prom_searchsiblings(walk, "cpu-unit")) != 0;
+                     walk = prom_getsibling(walk)) {
+                        bbnode = prom_getchild(walk);
+                        if (bbnode &&
+                            (bbnode = prom_searchsiblings(bbnode, "bootbus"))) {
+                                if ((zsnode = prom_getchild(bbnode)) == node) {
+                                        cpunode = walk;
+                                        break;
+                                }
+                        }
+                }
+                if (!walk) {
+                        prom_printf("SunZilog: Cannot find the %d'th bootbus on sun4d.\n",
+                                    (chip / 2));
+                        prom_halt();
+                }
+
+                if (prom_getproperty(zsnode, "reg",
+                                     (char *) zsreg, sizeof(zsreg)) == -1) {
+                        prom_printf("SunZilog: Cannot map Zilog %d\n", chip);
+                        prom_halt();
+                }
+                /* XXX Looks like an off by one? */
+                prom_apply_generic_ranges(bbnode, cpunode, zsreg, 1);
+                res.start = zsreg[0].phys_addr;
+                res.end = res.start + (8 - 1);
+                res.flags = zsreg[0].which_io | IORESOURCE_IO;
+                mapped_addr = sbus_ioremap(&res, 0, 8, "Zilog Serial");
+
+        } else {
+                zsnode = node;
+
+#if 0 /* XXX When was this used? */
+                if (prom_getintdefault(zsnode, "slave", -1) != chipid) {
+                        zsnode = prom_getsibling(zsnode);
+                        continue;
+                }
+#endif
+
+                /*
+                 * "address" is only present on ports that OBP opened
+                 * (from Mitch Bradley's "Hitchhiker's Guide to OBP").
+                 * We do not use it.
+                 */
+
+                if (prom_getproperty(zsnode, "reg",
+                                     (char *) zsreg, sizeof(zsreg)) == -1) {
+                        prom_printf("SunZilog: Cannot map Zilog %d\n", chip);
+                        prom_halt();
+                }
+                if (sparc_cpu_model == sun4m)   /* Crude. Pass parent. XXX */
+                        prom_apply_obio_ranges(zsreg, 1);
+                res.start = zsreg[0].phys_addr;
+                res.end = res.start + (8 - 1);
+                res.flags = zsreg[0].which_io | IORESOURCE_IO;
+                mapped_addr = sbus_ioremap(&res, 0, 8, "Zilog Serial");
+        }
+
+        if (prom_getproperty(zsnode, "intr",
+                             (char *) irq_info, sizeof(irq_info))
+                    % sizeof(struct linux_prom_irqs)) {
+                prom_printf("SunZilog: Cannot get IRQ property for Zilog %d.\n",
+                            chip);
+                prom_halt();
+        }
+        if (zilog_irq == -1) {
+                zilog_irq = irq_info[0].pri;
+        } else if (zilog_irq != irq_info[0].pri) {
+                /* XXX. Dumb. Should handle per-chip IRQ, for add-ons. */
+                prom_printf("SunZilog: Inconsistent IRQ layout for Zilog %d.\n",
+                            chip);
+                prom_halt();
+        }
+
+        return (struct zilog_layout __iomem *) mapped_addr;
+}
+#endif /* !(CONFIG_SPARC64) */
+
+/* Get the address of the registers for SunZilog instance CHIP.  */
+static struct zilog_layout __iomem * __init get_zs(int chip, int node)
+{
+        if (chip < 0 || chip >= NUM_SUNZILOG) {
+                prom_printf("SunZilog: Illegal chip number %d in get_zs.\n", chip);
+                prom_halt();
+        }
+
+#ifdef CONFIG_SPARC64
+        return get_zs_sun4u(chip, node);
+#else
+
+        if (sparc_cpu_model == sun4) {
+                struct resource res;
+
+                /* Not probe-able, hard code it. */
+                switch (chip) {
+                case 0:
+                        res.start = 0xf1000000;
+                        break;
+                case 1:
+                        res.start = 0xf0000000;
+                        break;
+                };
+                zilog_irq = 12;
+                res.end = (res.start + (8 - 1));
+                res.flags = IORESOURCE_IO;
+                return sbus_ioremap(&res, 0, 8, "SunZilog");
+        }
+
+        return get_zs_sun4cmd(chip, node);
+#endif
+}
+
+#define ZS_PUT_CHAR_MAX_DELAY   2000    /* 10 ms */
+
+static void sunzilog_put_char(struct zilog_channel __iomem *channel, unsigned char ch)
+{
+        int loops = ZS_PUT_CHAR_MAX_DELAY;
+
+        /* This is a timed polling loop so do not switch the explicit
+         * udelay with ZSDELAY as that is a NOP on some platforms.  -DaveM
+         */
+        do {
+                unsigned char val = sbus_readb(&channel->control);
+                if (val & Tx_BUF_EMP) {
+                        ZSDELAY();
+                        break;
+                }
+                udelay(5);
+        } while (--loops);
+
+        sbus_writeb(ch, &channel->data);
+        ZSDELAY();
+        ZS_WSYNC(channel);
+}
+
+#ifdef CONFIG_SERIO
+
+static DEFINE_SPINLOCK(sunzilog_serio_lock);
+
+static int sunzilog_serio_write(struct serio *serio, unsigned char ch)
+{
+        struct uart_sunzilog_port *up = serio->port_data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sunzilog_serio_lock, flags);
+
+        sunzilog_put_char(ZILOG_CHANNEL_FROM_PORT(&up->port), ch);
+
+        spin_unlock_irqrestore(&sunzilog_serio_lock, flags);
+
+        return 0;
+}
+
+static int sunzilog_serio_open(struct serio *serio)
+{
+        struct uart_sunzilog_port *up = serio->port_data;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&sunzilog_serio_lock, flags);
+        if (!up->serio_open) {
+                up->serio_open = 1;
+                ret = 0;
+        } else
+                ret = -EBUSY;
+        spin_unlock_irqrestore(&sunzilog_serio_lock, flags);
+
+        return ret;
+}
+
+static void sunzilog_serio_close(struct serio *serio)
+{
+        struct uart_sunzilog_port *up = serio->port_data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sunzilog_serio_lock, flags);
+        up->serio_open = 0;
+        spin_unlock_irqrestore(&sunzilog_serio_lock, flags);
+}
+
+#endif /* CONFIG_SERIO */
+
+#ifdef CONFIG_SERIAL_SUNZILOG_CONSOLE
+static void
+sunzilog_console_write(struct console *con, const char *s, unsigned int count)
+{
+        struct uart_sunzilog_port *up = &sunzilog_port_table[con->index];
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&up->port.lock, flags);
+        for (i = 0; i < count; i++, s++) {
+                sunzilog_put_char(channel, *s);
+                if (*s == 10)
+                        sunzilog_put_char(channel, 13);
+        }
+        udelay(2);
+        spin_unlock_irqrestore(&up->port.lock, flags);
+}
+
+static int __init sunzilog_console_setup(struct console *con, char *options)
+{
+        struct uart_sunzilog_port *up = &sunzilog_port_table[con->index];
+        unsigned long flags;
+        int baud, brg;
+
+        printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",
+               (sunzilog_reg.minor - 64) + con->index, con->index);
+
+        /* Get firmware console settings.  */
+        sunserial_console_termios(con);
+
+        /* Firmware console speed is limited to 150-->38400 baud so
+         * this hackish cflag thing is OK.
+         */
+        switch (con->cflag & CBAUD) {
+        case B150: baud = 150; break;
+        case B300: baud = 300; break;
+        case B600: baud = 600; break;
+        case B1200: baud = 1200; break;
+        case B2400: baud = 2400; break;
+        case B4800: baud = 4800; break;
+        default: case B9600: baud = 9600; break;
+        case B19200: baud = 19200; break;
+        case B38400: baud = 38400; break;
+        };
+
+        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        up->curregs[R15] = BRKIE;
+        sunzilog_convert_to_zs(up, con->cflag, 0, brg);
+
+        sunzilog_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
+        __sunzilog_startup(up);
+
+        spin_unlock_irqrestore(&up->port.lock, flags);
+
+        return 0;
+}
+
+static struct console sunzilog_console = {
+        .name   =       "ttyS",
+        .write  =       sunzilog_console_write,
+        .device =       uart_console_device,
+        .setup  =       sunzilog_console_setup,
+        .flags  =       CON_PRINTBUFFER,
+        .index  =       -1,
+        .data   =       &sunzilog_reg,
+};
+#define SUNZILOG_CONSOLE        (&sunzilog_console)
+
+static int __init sunzilog_console_init(void)
+{
+        int i;
+
+        if (con_is_present())
+                return 0;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                int this_minor = sunzilog_reg.minor + i;
+
+                if ((this_minor - 64) == (serial_console - 1))
+                        break;
+        }
+        if (i == NUM_CHANNELS)
+                return 0;
+
+        sunzilog_console.index = i;
+        sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS;
+        register_console(&sunzilog_console);
+        return 0;
+}
+#else
+#define SUNZILOG_CONSOLE        (NULL)
+#define sunzilog_console_init() do { } while (0)
+#endif
+
+/*
+ * We scan the PROM tree recursively. This is the most reliable way
+ * to find Zilog nodes on various platforms. However, we face an extreme
+ * shortage of kernel stack, so we must be very careful. To that end,
+ * we scan only to a certain depth, and we use a common property buffer
+ * in the scan structure.
+ */
+#define ZS_PROPSIZE  128
+#define ZS_SCAN_DEPTH   5
+
+struct zs_probe_scan {
+        int depth;
+        void (*scanner)(struct zs_probe_scan *t, int node);
+
+        int devices;
+        char prop[ZS_PROPSIZE];
+};
+
+static int __inline__ sunzilog_node_ok(int node, const char *name, int len)
+{
+        if (strncmp(name, "zs", len) == 0)
+                return 1;
+        /* Don't fold this procedure just yet. Compare to su_node_ok(). */
+        return 0;
+}
+
+static void __init sunzilog_scan(struct zs_probe_scan *t, int node)
+{
+        int len;
+
+        for (; node != 0; node = prom_getsibling(node)) {
+                len = prom_getproperty(node, "name", t->prop, ZS_PROPSIZE);
+                if (len <= 1)
+                        continue;               /* Broken PROM node */
+                if (sunzilog_node_ok(node, t->prop, len)) {
+                        (*t->scanner)(t, node);
+                } else {
+                        if (t->depth < ZS_SCAN_DEPTH) {
+                                t->depth++;
+                                sunzilog_scan(t, prom_getchild(node));
+                                --t->depth;
+                        }
+                }
+        }
+}
+
+static void __init sunzilog_prepare(void)
+{
+        struct uart_sunzilog_port *up;
+        struct zilog_layout __iomem *rp;
+        int channel, chip;
+
+        /*
+         * Temporary fix.
+         */
+        for (channel = 0; channel < NUM_CHANNELS; channel++)
+                spin_lock_init(&sunzilog_port_table[channel].port.lock);
+
+        sunzilog_irq_chain = up = &sunzilog_port_table[0];
+        for (channel = 0; channel < NUM_CHANNELS - 1; channel++)
+                up[channel].next = &up[channel + 1];
+        up[channel].next = NULL;
+
+        for (chip = 0; chip < NUM_SUNZILOG; chip++) {
+                rp = sunzilog_chip_regs[chip];
+                up[(chip * 2) + 0].port.membase = (void __iomem *)&rp->channelA;
+                up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB;
+
+                /* Channel A */
+                up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM;
+                up[(chip * 2) + 0].port.irq = zilog_irq;
+                up[(chip * 2) + 0].port.uartclk = ZS_CLOCK;
+                up[(chip * 2) + 0].port.fifosize = 1;
+                up[(chip * 2) + 0].port.ops = &sunzilog_pops;
+                up[(chip * 2) + 0].port.type = PORT_SUNZILOG;
+                up[(chip * 2) + 0].port.flags = 0;
+                up[(chip * 2) + 0].port.line = (chip * 2) + 0;
+                up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A;
+
+                /* Channel B */
+                up[(chip * 2) + 1].port.iotype = SERIAL_IO_MEM;
+                up[(chip * 2) + 1].port.irq = zilog_irq;
+                up[(chip * 2) + 1].port.uartclk = ZS_CLOCK;
+                up[(chip * 2) + 1].port.fifosize = 1;
+                up[(chip * 2) + 1].port.ops = &sunzilog_pops;
+                up[(chip * 2) + 1].port.type = PORT_SUNZILOG;
+                up[(chip * 2) + 1].port.flags = 0;
+                up[(chip * 2) + 1].port.line = (chip * 2) + 1;
+                up[(chip * 2) + 1].flags |= 0;
+        }
+}
+
+static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel)
+{
+        int baud, brg;
+
+        if (channel == KEYBOARD_LINE) {
+                up->flags |= SUNZILOG_FLAG_CONS_KEYB;
+                up->cflag = B1200 | CS8 | CLOCAL | CREAD;
+                baud = 1200;
+        } else {
+                up->flags |= SUNZILOG_FLAG_CONS_MOUSE;
+                up->cflag = B4800 | CS8 | CLOCAL | CREAD;
+                baud = 4800;
+        }
+        printk(KERN_INFO "zs%d at 0x%p (irq = %s) is a SunZilog\n",
+               channel, up->port.membase, __irq_itoa(zilog_irq));
+
+        up->curregs[R15] = BRKIE;
+        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+        sunzilog_convert_to_zs(up, up->cflag, 0, brg);
+        sunzilog_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
+        __sunzilog_startup(up);
+}
+
+#ifdef CONFIG_SERIO
+static void __init sunzilog_register_serio(struct uart_sunzilog_port *up, int channel)
+{
+        struct serio *serio;
+
+        up->serio = serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        if (serio) {
+                memset(serio, 0, sizeof(*serio));
+
+                serio->port_data = up;
+
+                serio->id.type = SERIO_RS232;
+                if (channel == KEYBOARD_LINE) {
+                        serio->id.proto = SERIO_SUNKBD;
+                        strlcpy(serio->name, "zskbd", sizeof(serio->name));
+                } else {
+                        serio->id.proto = SERIO_SUN;
+                        serio->id.extra = 1;
+                        strlcpy(serio->name, "zsms", sizeof(serio->name));
+                }
+                strlcpy(serio->phys,
+                        (channel == KEYBOARD_LINE ? "zs/serio0" : "zs/serio1"),
+                        sizeof(serio->phys));
+
+                serio->write = sunzilog_serio_write;
+                serio->open = sunzilog_serio_open;
+                serio->close = sunzilog_serio_close;
+
+                serio_register_port(serio);
+        } else {
+                printk(KERN_WARNING "zs%d: not enough memory for serio port\n",
+                        channel);
+        }
+}
+#endif
+
+static void __init sunzilog_init_hw(void)
+{
+        int i;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                struct uart_sunzilog_port *up = &sunzilog_port_table[i];
+                struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
+                unsigned long flags;
+                int baud, brg;
+
+                spin_lock_irqsave(&up->port.lock, flags);
+
+                if (ZS_IS_CHANNEL_A(up)) {
+                        write_zsreg(channel, R9, FHWRES);
+                        ZSDELAY_LONG();
+                        (void) read_zsreg(channel, R0);
+                }
+
+                if (i == KEYBOARD_LINE || i == MOUSE_LINE) {
+                        sunzilog_init_kbdms(up, i);
+                        up->curregs[R9] |= (NV | MIE);
+                        write_zsreg(channel, R9, up->curregs[R9]);
+                } else {
+                        /* Normal serial TTY. */
+                        up->parity_mask = 0xff;
+                        up->curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;
+                        up->curregs[R4] = PAR_EVEN | X16CLK | SB1;
+                        up->curregs[R3] = RxENAB | Rx8;
+                        up->curregs[R5] = TxENAB | Tx8;
+                        up->curregs[R9] = NV | MIE;
+                        up->curregs[R10] = NRZ;
+                        up->curregs[R11] = TCBR | RCBR;
+                        baud = 9600;
+                        brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
+                        up->curregs[R12] = (brg & 0xff);
+                        up->curregs[R13] = (brg >> 8) & 0xff;
+                        up->curregs[R14] = BRSRC | BRENAB;
+                        __load_zsregs(channel, up->curregs);
+                        write_zsreg(channel, R9, up->curregs[R9]);
+                }
+
+                spin_unlock_irqrestore(&up->port.lock, flags);
+
+#ifdef CONFIG_SERIO
+                if (i == KEYBOARD_LINE || i == MOUSE_LINE)
+                        sunzilog_register_serio(up, i);
+#endif
+        }
+}
+
+static struct zilog_layout __iomem * __init get_zs(int chip, int node);
+
+static void __init sunzilog_scan_probe(struct zs_probe_scan *t, int node)
+{
+        sunzilog_chip_regs[t->devices] = get_zs(t->devices, node);
+        t->devices++;
+}
+
+static int __init sunzilog_ports_init(void)
+{
+        struct zs_probe_scan scan;
+        int ret;
+        int uart_count;
+        int i;
+
+        printk(KERN_DEBUG "SunZilog: %d chips.\n", NUM_SUNZILOG);
+
+        scan.scanner = sunzilog_scan_probe;
+        scan.depth = 0;
+        scan.devices = 0;
+        sunzilog_scan(&scan, prom_getchild(prom_root_node));
+
+        sunzilog_prepare();
+
+        if (request_irq(zilog_irq, sunzilog_interrupt, SA_SHIRQ,
+                        "SunZilog", sunzilog_irq_chain)) {
+                prom_printf("SunZilog: Unable to register zs interrupt handler.\n");
+                prom_halt();
+        }
+
+        sunzilog_init_hw();
+
+        /* We can only init this once we have probed the Zilogs
+         * in the system. Do not count channels assigned to keyboards
+         * or mice when we are deciding how many ports to register.
+         */
+        uart_count = 0;
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                struct uart_sunzilog_port *up = &sunzilog_port_table[i];
+
+                if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up))
+                        continue;
+
+                uart_count++;
+        }
+                
+        sunzilog_reg.nr = uart_count;
+        sunzilog_reg.cons = SUNZILOG_CONSOLE;
+
+        sunzilog_reg.minor = sunserial_current_minor;
+        sunserial_current_minor += uart_count;
+
+        ret = uart_register_driver(&sunzilog_reg);
+        if (ret == 0) {
+                sunzilog_console_init();
+                for (i = 0; i < NUM_CHANNELS; i++) {
+                        struct uart_sunzilog_port *up = &sunzilog_port_table[i];
+
+                        if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up))
+                                continue;
+
+                        if (uart_add_one_port(&sunzilog_reg, &up->port)) {
+                                printk(KERN_ERR
+                                    "SunZilog: failed to add port zs%d\n", i);
+                        }
+                }
+        }
+
+        return ret;
+}
+
+static void __init sunzilog_scan_count(struct zs_probe_scan *t, int node)
+{
+        t->devices++;
+}
+
+static int __init sunzilog_ports_count(void)
+{
+        struct zs_probe_scan scan;
+
+        /* Sun4 Zilog setup is hard coded, no probing to do.  */
+        if (sparc_cpu_model == sun4)
+                return 2;
+
+        scan.scanner = sunzilog_scan_count;
+        scan.depth = 0;
+        scan.devices = 0;
+
+        sunzilog_scan(&scan, prom_getchild(prom_root_node));
+
+        return scan.devices;
+}
+
+static int __init sunzilog_init(void)
+{
+
+        NUM_SUNZILOG = sunzilog_ports_count();
+        if (NUM_SUNZILOG == 0)
+                return -ENODEV;
+
+        sunzilog_alloc_tables();
+
+        sunzilog_ports_init();
+
+        return 0;
+}
+
+static void __exit sunzilog_exit(void)
+{
+        int i;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                struct uart_sunzilog_port *up = &sunzilog_port_table[i];
+
+                if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) {
+#ifdef CONFIG_SERIO
+                        if (up->serio) {
+                                serio_unregister_port(up->serio);
+                                up->serio = NULL;
+                        }
+#endif
+                } else
+                        uart_remove_one_port(&sunzilog_reg, &up->port);
+        }
+
+        uart_unregister_driver(&sunzilog_reg);
+}
+
+module_init(sunzilog_init);
+module_exit(sunzilog_exit);
+
+MODULE_AUTHOR("David S. Miller");
+MODULE_DESCRIPTION("Sun Zilog serial port driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/sunzilog.h b/drivers/serial/sunzilog.h
new file mode 100644
index 000000000000..7939b6d71270
--- /dev/null
+++ b/drivers/serial/sunzilog.h
@@ -0,0 +1,272 @@
+#ifndef _SUNZILOG_H
+#define _SUNZILOG_H
+
+struct zilog_channel {
+        volatile unsigned char control;
+        volatile unsigned char __pad1;
+        volatile unsigned char data;
+        volatile unsigned char __pad2;
+};
+
+struct zilog_layout {
+        struct zilog_channel channelB;
+        struct zilog_channel channelA;
+};
+
+#define NUM_ZSREGS    16
+
+/* Conversion routines to/from brg time constants from/to bits
+ * per second.
+ */
+#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2))
+#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2)
+
+/* The Zilog register set */
+
+#define FLAG    0x7e
+
+/* Write Register 0 */
+#define R0      0               /* Register selects */
+#define R1      1
+#define R2      2
+#define R3      3
+#define R4      4
+#define R5      5
+#define R6      6
+#define R7      7
+#define R8      8
+#define R9      9
+#define R10     10
+#define R11     11
+#define R12     12
+#define R13     13
+#define R14     14
+#define R15     15
+
+#define NULLCODE        0       /* Null Code */
+#define POINT_HIGH      0x8     /* Select upper half of registers */
+#define RES_EXT_INT     0x10    /* Reset Ext. Status Interrupts */
+#define SEND_ABORT      0x18    /* HDLC Abort */
+#define RES_RxINT_FC    0x20    /* Reset RxINT on First Character */
+#define RES_Tx_P        0x28    /* Reset TxINT Pending */
+#define ERR_RES         0x30    /* Error Reset */
+#define RES_H_IUS       0x38    /* Reset highest IUS */
+
+#define RES_Rx_CRC      0x40    /* Reset Rx CRC Checker */
+#define RES_Tx_CRC      0x80    /* Reset Tx CRC Checker */
+#define RES_EOM_L       0xC0    /* Reset EOM latch */
+
+/* Write Register 1 */
+
+#define EXT_INT_ENAB    0x1     /* Ext Int Enable */
+#define TxINT_ENAB      0x2     /* Tx Int Enable */
+#define PAR_SPEC        0x4     /* Parity is special condition */
+
+#define RxINT_DISAB     0       /* Rx Int Disable */
+#define RxINT_FCERR     0x8     /* Rx Int on First Character Only or Error */
+#define INT_ALL_Rx      0x10    /* Int on all Rx Characters or error */
+#define INT_ERR_Rx      0x18    /* Int on error only */
+#define RxINT_MASK      0x18
+
+#define WT_RDY_RT       0x20    /* Wait/Ready on R/T */
+#define WT_FN_RDYFN     0x40    /* Wait/FN/Ready FN */
+#define WT_RDY_ENAB     0x80    /* Wait/Ready Enable */
+
+/* Write Register #2 (Interrupt Vector) */
+
+/* Write Register 3 */
+
+#define RxENAB          0x1     /* Rx Enable */
+#define SYNC_L_INH      0x2     /* Sync Character Load Inhibit */
+#define ADD_SM          0x4     /* Address Search Mode (SDLC) */
+#define RxCRC_ENAB      0x8     /* Rx CRC Enable */
+#define ENT_HM          0x10    /* Enter Hunt Mode */
+#define AUTO_ENAB       0x20    /* Auto Enables */
+#define Rx5             0x0     /* Rx 5 Bits/Character */
+#define Rx7             0x40    /* Rx 7 Bits/Character */
+#define Rx6             0x80    /* Rx 6 Bits/Character */
+#define Rx8             0xc0    /* Rx 8 Bits/Character */
+#define RxN_MASK        0xc0
+
+/* Write Register 4 */
+
+#define PAR_ENAB        0x1     /* Parity Enable */
+#define PAR_EVEN        0x2     /* Parity Even/Odd* */
+
+#define SYNC_ENAB       0       /* Sync Modes Enable */
+#define SB1             0x4     /* 1 stop bit/char */
+#define SB15            0x8     /* 1.5 stop bits/char */
+#define SB2             0xc     /* 2 stop bits/char */
+
+#define MONSYNC         0       /* 8 Bit Sync character */
+#define BISYNC          0x10    /* 16 bit sync character */
+#define SDLC            0x20    /* SDLC Mode (01111110 Sync Flag) */
+#define EXTSYNC         0x30    /* External Sync Mode */
+
+#define X1CLK           0x0     /* x1 clock mode */
+#define X16CLK          0x40    /* x16 clock mode */
+#define X32CLK          0x80    /* x32 clock mode */
+#define X64CLK          0xC0    /* x64 clock mode */
+#define XCLK_MASK       0xC0
+
+/* Write Register 5 */
+
+#define TxCRC_ENAB      0x1     /* Tx CRC Enable */
+#define RTS             0x2     /* RTS */
+#define SDLC_CRC        0x4     /* SDLC/CRC-16 */
+#define TxENAB          0x8     /* Tx Enable */
+#define SND_BRK         0x10    /* Send Break */
+#define Tx5             0x0     /* Tx 5 bits (or less)/character */
+#define Tx7             0x20    /* Tx 7 bits/character */
+#define Tx6             0x40    /* Tx 6 bits/character */
+#define Tx8             0x60    /* Tx 8 bits/character */
+#define TxN_MASK        0x60
+#define DTR             0x80    /* DTR */
+
+/* Write Register 6 (Sync bits 0-7/SDLC Address Field) */
+
+/* Write Register 7 (Sync bits 8-15/SDLC 01111110) */
+
+/* Write Register 8 (transmit buffer) */
+
+/* Write Register 9 (Master interrupt control) */
+#define VIS     1       /* Vector Includes Status */
+#define NV      2       /* No Vector */
+#define DLC     4       /* Disable Lower Chain */
+#define MIE     8       /* Master Interrupt Enable */
+#define STATHI  0x10    /* Status high */
+#define NORESET 0       /* No reset on write to R9 */
+#define CHRB    0x40    /* Reset channel B */
+#define CHRA    0x80    /* Reset channel A */
+#define FHWRES  0xc0    /* Force hardware reset */
+
+/* Write Register 10 (misc control bits) */
+#define BIT6    1       /* 6 bit/8bit sync */
+#define LOOPMODE 2      /* SDLC Loop mode */
+#define ABUNDER 4       /* Abort/flag on SDLC xmit underrun */
+#define MARKIDLE 8      /* Mark/flag on idle */
+#define GAOP    0x10    /* Go active on poll */
+#define NRZ     0       /* NRZ mode */
+#define NRZI    0x20    /* NRZI mode */
+#define FM1     0x40    /* FM1 (transition = 1) */
+#define FM0     0x60    /* FM0 (transition = 0) */
+#define CRCPS   0x80    /* CRC Preset I/O */
+
+/* Write Register 11 (Clock Mode control) */
+#define TRxCXT  0       /* TRxC = Xtal output */
+#define TRxCTC  1       /* TRxC = Transmit clock */
+#define TRxCBR  2       /* TRxC = BR Generator Output */
+#define TRxCDP  3       /* TRxC = DPLL output */
+#define TRxCOI  4       /* TRxC O/I */
+#define TCRTxCP 0       /* Transmit clock = RTxC pin */
+#define TCTRxCP 8       /* Transmit clock = TRxC pin */
+#define TCBR    0x10    /* Transmit clock = BR Generator output */
+#define TCDPLL  0x18    /* Transmit clock = DPLL output */
+#define RCRTxCP 0       /* Receive clock = RTxC pin */
+#define RCTRxCP 0x20    /* Receive clock = TRxC pin */
+#define RCBR    0x40    /* Receive clock = BR Generator output */
+#define RCDPLL  0x60    /* Receive clock = DPLL output */
+#define RTxCX   0x80    /* RTxC Xtal/No Xtal */
+
+/* Write Register 12 (lower byte of baud rate generator time constant) */
+
+/* Write Register 13 (upper byte of baud rate generator time constant) */
+
+/* Write Register 14 (Misc control bits) */
+#define BRENAB  1       /* Baud rate generator enable */
+#define BRSRC   2       /* Baud rate generator source */
+#define DTRREQ  4       /* DTR/Request function */
+#define AUTOECHO 8      /* Auto Echo */
+#define LOOPBAK 0x10    /* Local loopback */
+#define SEARCH  0x20    /* Enter search mode */
+#define RMC     0x40    /* Reset missing clock */
+#define DISDPLL 0x60    /* Disable DPLL */
+#define SSBR    0x80    /* Set DPLL source = BR generator */
+#define SSRTxC  0xa0    /* Set DPLL source = RTxC */
+#define SFMM    0xc0    /* Set FM mode */
+#define SNRZI   0xe0    /* Set NRZI mode */
+
+/* Write Register 15 (external/status interrupt control) */
+#define ZCIE    2       /* Zero count IE */
+#define DCDIE   8       /* DCD IE */
+#define SYNCIE  0x10    /* Sync/hunt IE */
+#define CTSIE   0x20    /* CTS IE */
+#define TxUIE   0x40    /* Tx Underrun/EOM IE */
+#define BRKIE   0x80    /* Break/Abort IE */
+
+
+/* Read Register 0 */
+#define Rx_CH_AV        0x1     /* Rx Character Available */
+#define ZCOUNT          0x2     /* Zero count */
+#define Tx_BUF_EMP      0x4     /* Tx Buffer empty */
+#define DCD             0x8     /* DCD */
+#define SYNC            0x10    /* Sync/hunt */
+#define CTS             0x20    /* CTS */
+#define TxEOM           0x40    /* Tx underrun */
+#define BRK_ABRT        0x80    /* Break/Abort */
+
+/* Read Register 1 */
+#define ALL_SNT         0x1     /* All sent */
+/* Residue Data for 8 Rx bits/char programmed */
+#define RES3            0x8     /* 0/3 */
+#define RES4            0x4     /* 0/4 */
+#define RES5            0xc     /* 0/5 */
+#define RES6            0x2     /* 0/6 */
+#define RES7            0xa     /* 0/7 */
+#define RES8            0x6     /* 0/8 */
+#define RES18           0xe     /* 1/8 */
+#define RES28           0x0     /* 2/8 */
+/* Special Rx Condition Interrupts */
+#define PAR_ERR         0x10    /* Parity error */
+#define Rx_OVR          0x20    /* Rx Overrun Error */
+#define CRC_ERR         0x40    /* CRC/Framing Error */
+#define END_FR          0x80    /* End of Frame (SDLC) */
+
+/* Read Register 2 (channel b only) - Interrupt vector */
+#define CHB_Tx_EMPTY    0x00
+#define CHB_EXT_STAT    0x02
+#define CHB_Rx_AVAIL    0x04
+#define CHB_SPECIAL     0x06
+#define CHA_Tx_EMPTY    0x08
+#define CHA_EXT_STAT    0x0a
+#define CHA_Rx_AVAIL    0x0c
+#define CHA_SPECIAL     0x0e
+#define STATUS_MASK     0x0e
+
+/* Read Register 3 (interrupt pending register) ch a only */
+#define CHBEXT  0x1             /* Channel B Ext/Stat IP */
+#define CHBTxIP 0x2             /* Channel B Tx IP */
+#define CHBRxIP 0x4             /* Channel B Rx IP */
+#define CHAEXT  0x8             /* Channel A Ext/Stat IP */
+#define CHATxIP 0x10            /* Channel A Tx IP */
+#define CHARxIP 0x20            /* Channel A Rx IP */
+
+/* Read Register 8 (receive data register) */
+
+/* Read Register 10  (misc status bits) */
+#define ONLOOP  2               /* On loop */
+#define LOOPSEND 0x10           /* Loop sending */
+#define CLK2MIS 0x40            /* Two clocks missing */
+#define CLK1MIS 0x80            /* One clock missing */
+
+/* Read Register 12 (lower byte of baud rate generator constant) */
+
+/* Read Register 13 (upper byte of baud rate generator constant) */
+
+/* Read Register 15 (value of WR 15) */
+
+/* Misc macros */
+#define ZS_CLEARERR(channel)    do { sbus_writeb(ERR_RES, &channel->control); \
+                                     udelay(5); } while(0)
+
+#define ZS_CLEARSTAT(channel)   do { sbus_writeb(RES_EXT_INT, &channel->control); \
+                                     udelay(5); } while(0)
+
+#define ZS_CLEARFIFO(channel)   do { sbus_readb(&channel->data); \
+                                     udelay(2); \
+                                     sbus_readb(&channel->data); \
+                                     udelay(2); \
+                                     sbus_readb(&channel->data); \
+                                     udelay(2); } while(0)
+
+#endif /* _SUNZILOG_H */
diff --git a/drivers/serial/uart00.c b/drivers/serial/uart00.c
new file mode 100644
index 000000000000..186f1300cead
--- /dev/null
+++ b/drivers/serial/uart00.c
@@ -0,0 +1,782 @@
+/*
+ *  linux/drivers/serial/uart00.c
+ *
+ *  Driver for UART00 serial ports
+ *
+ *  Based on drivers/char/serial_amba.c, by ARM Limited & 
+ *                                          Deep Blue Solutions Ltd.
+ *  Copyright 2001 Altera Corporation
+ *
+ *  Update for 2.6.4 by Dirk Behme <dirk.behme@de.bosch.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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: uart00.c,v 1.35 2002/07/28 10:03:28 rmk Exp $
+ *
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_UART00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/sizes.h>
+
+#include <asm/arch/excalibur.h>
+#define UART00_TYPE (volatile unsigned int*)
+#include <asm/arch/uart00.h>
+#include <asm/arch/int_ctrl00.h>
+
+#define UART_NR         2
+
+#define SERIAL_UART00_NAME      "ttyUA"
+#define SERIAL_UART00_MAJOR     204
+#define SERIAL_UART00_MINOR     16      /* Temporary - will change in future */
+#define SERIAL_UART00_NR        UART_NR
+#define UART_PORT_SIZE 0x50
+
+#define UART00_ISR_PASS_LIMIT   256
+
+/*
+ * Access macros for the UART00 UARTs
+ */
+#define UART_GET_INT_STATUS(p)  inl(UART_ISR((p)->membase))
+#define UART_PUT_IES(p, c)      outl(c,UART_IES((p)->membase))
+#define UART_GET_IES(p)         inl(UART_IES((p)->membase))
+#define UART_PUT_IEC(p, c)      outl(c,UART_IEC((p)->membase))
+#define UART_GET_IEC(p)         inl(UART_IEC((p)->membase))
+#define UART_PUT_CHAR(p, c)     outl(c,UART_TD((p)->membase))
+#define UART_GET_CHAR(p)        inl(UART_RD((p)->membase))
+#define UART_GET_RSR(p)         inl(UART_RSR((p)->membase))
+#define UART_GET_RDS(p)         inl(UART_RDS((p)->membase))
+#define UART_GET_MSR(p)         inl(UART_MSR((p)->membase))
+#define UART_GET_MCR(p)         inl(UART_MCR((p)->membase))
+#define UART_PUT_MCR(p, c)      outl(c,UART_MCR((p)->membase))
+#define UART_GET_MC(p)          inl(UART_MC((p)->membase))
+#define UART_PUT_MC(p, c)       outl(c,UART_MC((p)->membase))
+#define UART_GET_TSR(p)         inl(UART_TSR((p)->membase))
+#define UART_GET_DIV_HI(p)      inl(UART_DIV_HI((p)->membase))
+#define UART_PUT_DIV_HI(p,c)    outl(c,UART_DIV_HI((p)->membase))
+#define UART_GET_DIV_LO(p)      inl(UART_DIV_LO((p)->membase))
+#define UART_PUT_DIV_LO(p,c)    outl(c,UART_DIV_LO((p)->membase))
+#define UART_RX_DATA(s)         ((s) & UART_RSR_RX_LEVEL_MSK)
+#define UART_TX_READY(s)        (((s) & UART_TSR_TX_LEVEL_MSK) < 15)
+//#define UART_TX_EMPTY(p)      ((UART_GET_FR(p) & UART00_UARTFR_TMSK) == 0)
+
+static void uart00_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        UART_PUT_IEC(port, UART_IEC_TIE_MSK);
+}
+
+static void uart00_stop_rx(struct uart_port *port)
+{
+        UART_PUT_IEC(port, UART_IEC_RE_MSK);
+}
+
+static void uart00_enable_ms(struct uart_port *port)
+{
+        UART_PUT_IES(port, UART_IES_ME_MSK);
+}
+
+static void
+uart00_rx_chars(struct uart_port *port, struct pt_regs *regs)
+{
+        struct tty_struct *tty = port->info->tty;
+        unsigned int status, ch, rds, flg, ignored = 0;
+
+        status = UART_GET_RSR(port);
+        while (UART_RX_DATA(status)) {
+                /* 
+                 * We need to read rds before reading the 
+                 * character from the fifo
+                 */
+                rds = UART_GET_RDS(port);
+                ch = UART_GET_CHAR(port);
+                port->icount.rx++;
+
+                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                        goto ignore_char;
+
+                flg = TTY_NORMAL;
+
+                /*
+                 * Note that the error handling code is
+                 * out of the main execution path
+                 */
+                if (rds & (UART_RDS_BI_MSK |UART_RDS_FE_MSK|
+                           UART_RDS_PE_MSK |UART_RDS_PE_MSK))
+                        goto handle_error;
+                if (uart_handle_sysrq_char(port, ch, regs))
+                        goto ignore_char;
+
+        error_return:
+                tty_insert_flip_char(tty, ch, flg);
+
+        ignore_char:
+                status = UART_GET_RSR(port);
+        }
+ out:
+        tty_flip_buffer_push(tty);
+        return;
+
+ handle_error:
+        if (rds & UART_RDS_BI_MSK) {
+                status &= ~(UART_RDS_FE_MSK | UART_RDS_PE_MSK);
+                port->icount.brk++;
+                if (uart_handle_break(port))
+                        goto ignore_char;
+        } else if (rds & UART_RDS_PE_MSK)
+                port->icount.parity++;
+        else if (rds & UART_RDS_FE_MSK)
+                port->icount.frame++;
+        if (rds & UART_RDS_OE_MSK)
+                port->icount.overrun++;
+
+        if (rds & port->ignore_status_mask) {
+                if (++ignored > 100)
+                        goto out;
+                goto ignore_char;
+        }
+        rds &= port->read_status_mask;
+
+        if (rds & UART_RDS_BI_MSK)
+                flg = TTY_BREAK;
+        else if (rds & UART_RDS_PE_MSK)
+                flg = TTY_PARITY;
+        else if (rds & UART_RDS_FE_MSK)
+                flg = TTY_FRAME;
+
+        if (rds & UART_RDS_OE_MSK) {
+                /*
+                 * CHECK: does overrun affect the current character?
+                 * ASSUMPTION: it does not.
+                 */
+                tty_insert_flip_char(tty, ch, flg);
+                ch = 0;
+                flg = TTY_OVERRUN;
+        }
+#ifdef SUPPORT_SYSRQ
+        port->sysrq = 0;
+#endif
+        goto error_return;
+}
+
+static void uart00_tx_chars(struct uart_port *port)
+{
+        struct circ_buf *xmit = &port->info->xmit;
+        int count;
+
+        if (port->x_char) {
+                while ((UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK) == 15)
+                        barrier();
+                UART_PUT_CHAR(port, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                return;
+        }
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                uart00_stop_tx(port, 0);
+                return;
+        }
+
+        count = port->fifosize >> 1;
+        do {
+                while ((UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK) == 15)
+                        barrier();
+                UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (--count > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                uart00_stop_tx(port, 0);
+}
+
+static void uart00_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        UART_PUT_IES(port, UART_IES_TIE_MSK);
+        uart00_tx_chars(port);
+}
+
+static void uart00_modem_status(struct uart_port *port)
+{
+        unsigned int status;
+
+        status = UART_GET_MSR(port);
+
+        if (!(status & (UART_MSR_DCTS_MSK | UART_MSR_DDSR_MSK | 
+                        UART_MSR_TERI_MSK | UART_MSR_DDCD_MSK)))
+                return;
+
+        if (status & UART_MSR_DDCD_MSK)
+                uart_handle_dcd_change(port, status & UART_MSR_DCD_MSK);
+
+        if (status & UART_MSR_DDSR_MSK)
+                port->icount.dsr++;
+
+        if (status & UART_MSR_DCTS_MSK)
+                uart_handle_cts_change(port, status & UART_MSR_CTS_MSK);
+
+        wake_up_interruptible(&port->info->delta_msr_wait);
+}
+
+static irqreturn_t uart00_int(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port = dev_id;
+        unsigned int status, pass_counter = 0;
+
+        status = UART_GET_INT_STATUS(port);
+        do {
+                if (status & UART_ISR_RI_MSK)
+                        uart00_rx_chars(port, regs);
+                if (status & UART_ISR_MI_MSK)
+                        uart00_modem_status(port);
+                if (status & (UART_ISR_TI_MSK | UART_ISR_TII_MSK))
+                        uart00_tx_chars(port);
+                if (pass_counter++ > UART00_ISR_PASS_LIMIT)
+                        break;
+
+                status = UART_GET_INT_STATUS(port);
+        } while (status);
+
+        return IRQ_HANDLED;
+}
+
+static unsigned int uart00_tx_empty(struct uart_port *port)
+{
+        return UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK? 0 : TIOCSER_TEMT;
+}
+
+static unsigned int uart00_get_mctrl(struct uart_port *port)
+{
+        unsigned int result = 0;
+        unsigned int status;
+
+        status = UART_GET_MSR(port);
+        if (status & UART_MSR_DCD_MSK)
+                result |= TIOCM_CAR;
+        if (status & UART_MSR_DSR_MSK)
+                result |= TIOCM_DSR;
+        if (status & UART_MSR_CTS_MSK)
+                result |= TIOCM_CTS;
+        if (status & UART_MSR_RI_MSK)
+                result |= TIOCM_RI;
+
+        return result;
+}
+
+static void uart00_set_mctrl_null(struct uart_port *port, unsigned int mctrl)
+{
+}
+
+static void uart00_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long flags;
+        unsigned int mcr;
+
+        spin_lock_irqsave(&port->lock, flags);
+        mcr = UART_GET_MCR(port);
+        if (break_state == -1)
+                mcr |= UART_MCR_BR_MSK;
+        else
+                mcr &= ~UART_MCR_BR_MSK;
+        UART_PUT_MCR(port, mcr);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void
+uart00_set_termios(struct uart_port *port, struct termios *termios,
+                   struct termios *old)
+{
+        unsigned int uart_mc, old_ies, baud, quot;
+        unsigned long flags;
+
+        /*
+         * We don't support CREAD (yet)
+         */
+        termios->c_cflag |= CREAD;
+
+        /*
+         * Ask the core to calculate the divisor for us.
+         */
+        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+        quot = uart_get_divisor(port, baud);
+
+        /* byte size and parity */
+        switch (termios->c_cflag & CSIZE) {
+        case CS5:
+                uart_mc = UART_MC_CLS_CHARLEN_5;
+                break;
+        case CS6:
+                uart_mc = UART_MC_CLS_CHARLEN_6;
+                break;
+        case CS7:
+                uart_mc = UART_MC_CLS_CHARLEN_7;
+                break;
+        default: // CS8
+                uart_mc = UART_MC_CLS_CHARLEN_8;
+                break;
+        }
+        if (termios->c_cflag & CSTOPB)
+                uart_mc|= UART_MC_ST_TWO;
+        if (termios->c_cflag & PARENB) {
+                uart_mc |= UART_MC_PE_MSK;
+                if (!(termios->c_cflag & PARODD))
+                        uart_mc |= UART_MC_EP_MSK;
+        }
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        /*
+         * Update the per-port timeout.
+         */
+        uart_update_timeout(port, termios->c_cflag, baud);
+
+        port->read_status_mask = UART_RDS_OE_MSK;
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |= UART_RDS_FE_MSK | UART_RDS_PE_MSK;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= UART_RDS_BI_MSK;
+
+        /*
+         * Characters to ignore
+         */
+        port->ignore_status_mask = 0;
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |= UART_RDS_FE_MSK | UART_RDS_PE_MSK;
+        if (termios->c_iflag & IGNBRK) {
+                port->ignore_status_mask |= UART_RDS_BI_MSK;
+                /*
+                 * If we're ignoring parity and break indicators,
+                 * ignore overruns to (for real raw support).
+                 */
+                if (termios->c_iflag & IGNPAR)
+                        port->ignore_status_mask |= UART_RDS_OE_MSK;
+        }
+
+        /* first, disable everything */
+        old_ies = UART_GET_IES(port); 
+
+        if (UART_ENABLE_MS(port, termios->c_cflag))
+                old_ies |= UART_IES_ME_MSK;
+
+        /* Set baud rate */
+        UART_PUT_DIV_LO(port, (quot & 0xff));
+        UART_PUT_DIV_HI(port, ((quot & 0xf00) >> 8));
+
+        UART_PUT_MC(port, uart_mc);
+        UART_PUT_IES(port, old_ies);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static int uart00_startup(struct uart_port *port)
+{
+        int result;
+
+        /*
+         * Allocate the IRQ
+         */
+        result = request_irq(port->irq, uart00_int, 0, "uart00", port);
+        if (result) {
+                printk(KERN_ERR "Request of irq %d failed\n", port->irq);
+                return result;
+        }
+
+        /*
+         * Finally, enable interrupts. Use the TII interrupt to minimise 
+         * the number of interrupts generated. If higher performance is 
+         * needed, consider using the TI interrupt with a suitable FIFO
+         * threshold
+         */
+        UART_PUT_IES(port, UART_IES_RE_MSK | UART_IES_TIE_MSK);
+
+        return 0;
+}
+
+static void uart00_shutdown(struct uart_port *port)
+{
+        /*
+         * disable all interrupts, disable the port
+         */
+        UART_PUT_IEC(port, 0xff);
+
+        /* disable break condition and fifos */
+        UART_PUT_MCR(port, UART_GET_MCR(port) &~UART_MCR_BR_MSK);
+
+        /*
+         * Free the interrupt
+         */
+        free_irq(port->irq, port);
+}
+
+static const char *uart00_type(struct uart_port *port)
+{
+        return port->type == PORT_UART00 ? "Altera UART00" : NULL;
+}
+
+/*
+ * Release the memory region(s) being used by 'port'
+ */
+static void uart00_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, UART_PORT_SIZE);
+
+#ifdef CONFIG_ARCH_CAMELOT
+        if (port->membase != (void*)IO_ADDRESS(EXC_UART00_BASE)) {
+                iounmap(port->membase);
+        }
+#endif
+}
+
+/*
+ * Request the memory region(s) being used by 'port'
+ */
+static int uart00_request_port(struct uart_port *port)
+{
+        return request_mem_region(port->mapbase, UART_PORT_SIZE, "serial_uart00")
+                        != NULL ? 0 : -EBUSY;
+}
+
+/*
+ * Configure/autoconfigure the port.
+ */
+static void uart00_config_port(struct uart_port *port, int flags)
+{
+
+        /*
+         * Map the io memory if this is a soft uart
+         */
+        if (!port->membase)
+                port->membase = ioremap_nocache(port->mapbase,SZ_4K);
+
+        if (!port->membase)
+                printk(KERN_ERR "serial00: cannot map io memory\n");
+        else
+                port->type = PORT_UART00;
+
+}
+
+/*
+ * verify the new serial_struct (for TIOCSSERIAL).
+ */
+static int uart00_verify_port(struct uart_port *port, struct serial_struct *ser)
+{
+        int ret = 0;
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_UART00)
+                ret = -EINVAL;
+        if (ser->irq < 0 || ser->irq >= NR_IRQS)
+                ret = -EINVAL;
+        if (ser->baud_base < 9600)
+                ret = -EINVAL;
+        return ret;
+}
+
+static struct uart_ops uart00_pops = {
+        .tx_empty       = uart00_tx_empty,
+        .set_mctrl      = uart00_set_mctrl_null,
+        .get_mctrl      = uart00_get_mctrl,
+        .stop_tx        = uart00_stop_tx,
+        .start_tx       = uart00_start_tx,
+        .stop_rx        = uart00_stop_rx,
+        .enable_ms      = uart00_enable_ms,
+        .break_ctl      = uart00_break_ctl,
+        .startup        = uart00_startup,
+        .shutdown       = uart00_shutdown,
+        .set_termios    = uart00_set_termios,
+        .type           = uart00_type,
+        .release_port   = uart00_release_port,
+        .request_port   = uart00_request_port,
+        .config_port    = uart00_config_port,
+        .verify_port    = uart00_verify_port,
+};
+
+
+#ifdef CONFIG_ARCH_CAMELOT
+static struct uart_port epxa10db_port = {
+        .membase        = (void*)IO_ADDRESS(EXC_UART00_BASE),
+        .mapbase        = EXC_UART00_BASE,
+        .iotype         = SERIAL_IO_MEM,
+        .irq            = IRQ_UART,
+        .uartclk        = EXC_AHB2_CLK_FREQUENCY,
+        .fifosize       = 16,
+        .ops            = &uart00_pops,
+        .flags          = ASYNC_BOOT_AUTOCONF,
+};
+#endif
+
+
+#ifdef CONFIG_SERIAL_UART00_CONSOLE
+static void uart00_console_write(struct console *co, const char *s, unsigned count)
+{
+#ifdef CONFIG_ARCH_CAMELOT
+        struct uart_port *port = &epxa10db_port;
+        unsigned int status, old_ies;
+        int i;
+
+        /*
+         *      First save the CR then disable the interrupts
+         */
+        old_ies = UART_GET_IES(port);
+        UART_PUT_IEC(port,0xff);
+
+        /*
+         *      Now, do each character
+         */
+        for (i = 0; i < count; i++) {
+                do {
+                        status = UART_GET_TSR(port);
+                } while (!UART_TX_READY(status));
+                UART_PUT_CHAR(port, s[i]);
+                if (s[i] == '\n') {
+                        do {
+                                status = UART_GET_TSR(port);
+                        } while (!UART_TX_READY(status));
+                        UART_PUT_CHAR(port, '\r');
+                }
+        }
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IES
+         */
+        do {
+                status = UART_GET_TSR(port);
+        } while (status & UART_TSR_TX_LEVEL_MSK);
+        UART_PUT_IES(port, old_ies);
+#endif
+}
+
+static void __init
+uart00_console_get_options(struct uart_port *port, int *baud,
+                           int *parity, int *bits)
+{
+        unsigned int uart_mc, quot;
+
+        uart_mc = UART_GET_MC(port);
+
+        *parity = 'n';
+        if (uart_mc & UART_MC_PE_MSK) {
+                if (uart_mc & UART_MC_EP_MSK)
+                        *parity = 'e';
+                else
+                        *parity = 'o';
+        }
+
+        switch (uart_mc & UART_MC_CLS_MSK) {
+        case UART_MC_CLS_CHARLEN_5:
+                *bits = 5;
+                break;
+        case UART_MC_CLS_CHARLEN_6:
+                *bits = 6;
+                break;
+        case UART_MC_CLS_CHARLEN_7:
+                *bits = 7;
+                break;
+        case UART_MC_CLS_CHARLEN_8:
+                *bits = 8;
+                break;
+        }
+        quot = UART_GET_DIV_LO(port) | (UART_GET_DIV_HI(port) << 8);
+        *baud = port->uartclk / (16 *quot );
+}
+
+static int __init uart00_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 115200;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+#ifdef CONFIG_ARCH_CAMELOT
+        port = &epxa10db_port;             ;
+#else
+        return -ENODEV;
+#endif
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                uart00_console_get_options(port, &baud, &parity, &bits);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+extern struct uart_driver uart00_reg;
+static struct console uart00_console = {
+        .name           = SERIAL_UART00_NAME,
+        .write          = uart00_console_write,
+        .device         = uart_console_device,
+        .setup          = uart00_console_setup,
+        .flags          = CON_PRINTBUFFER,
+        .index          = 0,
+        .data           = &uart00_reg,
+};
+
+static int __init uart00_console_init(void)
+{
+        register_console(&uart00_console);
+        return 0;
+}
+console_initcall(uart00_console_init);
+
+#define UART00_CONSOLE  &uart00_console
+#else
+#define UART00_CONSOLE  NULL
+#endif
+
+static struct uart_driver uart00_reg = {
+        .owner                  = NULL,
+        .driver_name            = SERIAL_UART00_NAME,
+        .dev_name               = SERIAL_UART00_NAME,
+        .major                  = SERIAL_UART00_MAJOR,
+        .minor                  = SERIAL_UART00_MINOR,
+        .nr                     = UART_NR,
+        .cons                   = UART00_CONSOLE,
+};
+
+struct dev_port_entry{
+        unsigned int base_addr;
+        struct uart_port *port;
+};
+
+#ifdef CONFIG_PLD_HOTSWAP
+
+static struct dev_port_entry dev_port_map[UART_NR];
+
+/*
+ * Keep a mapping of dev_info addresses -> port lines to use when
+ * removing ports dev==NULL indicates unused entry
+ */
+
+struct uart00_ps_data{
+        unsigned int clk;
+        unsigned int fifosize;
+};
+
+int uart00_add_device(struct pldhs_dev_info* dev_info, void* dev_ps_data)
+{
+        struct uart00_ps_data* dev_ps=dev_ps_data;
+        struct uart_port * port;
+        int i,result;
+
+        i=0;
+        while(dev_port_map[i].port)
+                i++;
+
+        if(i==UART_NR){
+                printk(KERN_WARNING "uart00: Maximum number of ports reached\n");
+                return 0;
+        }
+
+        port=kmalloc(sizeof(struct uart_port),GFP_KERNEL);
+        if(!port)
+                return -ENOMEM;
+
+        printk("clk=%d fifo=%d\n",dev_ps->clk,dev_ps->fifosize);
+        port->membase=0;
+        port->mapbase=dev_info->base_addr;
+        port->iotype=SERIAL_IO_MEM;
+        port->irq=dev_info->irq;
+        port->uartclk=dev_ps->clk;
+        port->fifosize=dev_ps->fifosize;
+        port->ops=&uart00_pops;
+        port->line=i;
+        port->flags=ASYNC_BOOT_AUTOCONF;
+
+        result=uart_add_one_port(&uart00_reg, port);
+        if(result){
+                printk("uart_add_one_port returned %d\n",result);
+                return result;
+        }
+        dev_port_map[i].base_addr=dev_info->base_addr;
+        dev_port_map[i].port=port;
+        printk("uart00: added device at %x as ttyUA%d\n",dev_port_map[i].base_addr,i);
+        return 0;
+
+}
+
+int uart00_remove_devices(void)
+{
+        int i,result;
+
+
+        result=0;
+        for(i=1;i<UART_NR;i++){
+                if(dev_port_map[i].base_addr){
+                        result=uart_remove_one_port(&uart00_reg, dev_port_map[i].port);
+                        if(result)
+                                return result;
+
+                        /* port removed sucessfully, so now tidy up */
+                        kfree(dev_port_map[i].port);
+                        dev_port_map[i].base_addr=0;
+                        dev_port_map[i].port=NULL;
+                }
+        }
+        return 0;
+
+}
+
+struct pld_hotswap_ops uart00_pldhs_ops={
+        .name           = "uart00",
+        .add_device     = uart00_add_device,
+        .remove_devices = uart00_remove_devices,
+};
+
+#endif
+
+static int __init uart00_init(void)
+{
+        int result;
+
+        printk(KERN_INFO "Serial: UART00 driver $Revision: 1.35 $\n");
+
+        printk(KERN_WARNING "serial_uart00:Using temporary major/minor pairs"
+                " - these WILL change in the future\n");
+
+        result = uart_register_driver(&uart00_reg);
+        if (result)
+                return result;
+#ifdef CONFIG_ARCH_CAMELOT
+        result = uart_add_one_port(&uart00_reg,&epxa10db_port);
+#endif
+        if (result)
+                uart_unregister_driver(&uart00_reg);
+
+#ifdef  CONFIG_PLD_HOTSWAP
+        pldhs_register_driver(&uart00_pldhs_ops);
+#endif
+        return result;
+}
+
+__initcall(uart00_init);
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c
new file mode 100644
index 000000000000..bb482780a41d
--- /dev/null
+++ b/drivers/serial/v850e_uart.c
@@ -0,0 +1,549 @@
+/*
+ * drivers/serial/v850e_uart.c -- Serial I/O using V850E on-chip UART or UARTB
+ *
+ *  Copyright (C) 2001,02,03  NEC Electronics Corporation
+ *  Copyright (C) 2001,02,03  Miles Bader <miles@gnu.org>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file COPYING in the main directory of this
+ * archive for more details.
+ *
+ * Written by Miles Bader <miles@gnu.org>
+ */
+
+/* This driver supports both the original V850E UART interface (called
+   merely `UART' in the docs) and the newer `UARTB' interface, which is
+   roughly a superset of the first one.  The selection is made at
+   configure time -- if CONFIG_V850E_UARTB is defined, then UARTB is
+   presumed, otherwise the old UART -- as these are on-CPU UARTS, a system
+   can never have both.
+
+   The UARTB interface also has a 16-entry FIFO mode, which is not
+   yet supported by this driver.  */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+
+#include <asm/v850e_uart.h>
+
+/* Initial UART state.  This may be overridden by machine-dependent headers. */
+#ifndef V850E_UART_INIT_BAUD
+#define V850E_UART_INIT_BAUD    115200
+#endif
+#ifndef V850E_UART_INIT_CFLAGS
+#define V850E_UART_INIT_CFLAGS  (B115200 | CS8 | CREAD)
+#endif
+
+/* A string used for prefixing printed descriptions; since the same UART
+   macro is actually used on other chips than the V850E.  This must be a
+   constant string.  */
+#ifndef V850E_UART_CHIP_NAME
+#define V850E_UART_CHIP_NAME    "V850E"
+#endif
+
+#define V850E_UART_MINOR_BASE   64         /* First tty minor number */
+
+
+/* Low-level UART functions.  */
+
+/* Configure and turn on uart channel CHAN, using the termios `control
+   modes' bits in CFLAGS, and a baud-rate of BAUD.  */
+void v850e_uart_configure (unsigned chan, unsigned cflags, unsigned baud)
+{
+        int flags;
+        v850e_uart_speed_t old_speed;
+        v850e_uart_config_t old_config;
+        v850e_uart_speed_t new_speed = v850e_uart_calc_speed (baud);
+        v850e_uart_config_t new_config = v850e_uart_calc_config (cflags);
+
+        /* Disable interrupts while we're twiddling the hardware.  */
+        local_irq_save (flags);
+
+#ifdef V850E_UART_PRE_CONFIGURE
+        V850E_UART_PRE_CONFIGURE (chan, cflags, baud);
+#endif
+
+        old_config = V850E_UART_CONFIG (chan);
+        old_speed = v850e_uart_speed (chan);
+
+        if (! v850e_uart_speed_eq (old_speed, new_speed)) {
+                /* The baud rate has changed.  First, disable the UART.  */
+                V850E_UART_CONFIG (chan) = V850E_UART_CONFIG_FINI;
+                old_config = 0; /* Force the uart to be re-initialized. */
+
+                /* Reprogram the baud-rate generator.  */
+                v850e_uart_set_speed (chan, new_speed);
+        }
+
+        if (! (old_config & V850E_UART_CONFIG_ENABLED)) {
+                /* If we are using the uart for the first time, start by
+                   enabling it, which must be done before turning on any
+                   other bits.  */
+                V850E_UART_CONFIG (chan) = V850E_UART_CONFIG_INIT;
+                /* See the initial state.  */
+                old_config = V850E_UART_CONFIG (chan);
+        }
+
+        if (new_config != old_config) {
+                /* Which of the TXE/RXE bits we'll temporarily turn off
+                   before changing other control bits.  */
+                unsigned temp_disable = 0;
+                /* Which of the TXE/RXE bits will be enabled.  */
+                unsigned enable = 0;
+                unsigned changed_bits = new_config ^ old_config;
+
+                /* Which of RX/TX will be enabled in the new configuration.  */
+                if (new_config & V850E_UART_CONFIG_RX_BITS)
+                        enable |= (new_config & V850E_UART_CONFIG_RX_ENABLE);
+                if (new_config & V850E_UART_CONFIG_TX_BITS)
+                        enable |= (new_config & V850E_UART_CONFIG_TX_ENABLE);
+
+                /* Figure out which of RX/TX needs to be disabled; note
+                   that this will only happen if they're not already
+                   disabled.  */
+                if (changed_bits & V850E_UART_CONFIG_RX_BITS)
+                        temp_disable
+                                |= (old_config & V850E_UART_CONFIG_RX_ENABLE);
+                if (changed_bits & V850E_UART_CONFIG_TX_BITS)
+                        temp_disable
+                                |= (old_config & V850E_UART_CONFIG_TX_ENABLE);
+
+                /* We have to turn off RX and/or TX mode before changing
+                   any associated control bits.  */
+                if (temp_disable)
+                        V850E_UART_CONFIG (chan) = old_config & ~temp_disable;
+
+                /* Write the new control bits, while RX/TX are disabled. */ 
+                if (changed_bits & ~enable)
+                        V850E_UART_CONFIG (chan) = new_config & ~enable;
+
+                v850e_uart_config_delay (new_config, new_speed);
+
+                /* Write the final version, with enable bits turned on.  */
+                V850E_UART_CONFIG (chan) = new_config;
+        }
+
+        local_irq_restore (flags);
+}
+
+
+/*  Low-level console. */
+
+#ifdef CONFIG_V850E_UART_CONSOLE
+
+static void v850e_uart_cons_write (struct console *co,
+                                   const char *s, unsigned count)
+{
+        if (count > 0) {
+                unsigned chan = co->index;
+                unsigned irq = V850E_UART_TX_IRQ (chan);
+                int irq_was_enabled, irq_was_pending, flags;
+
+                /* We don't want to get `transmission completed'
+                   interrupts, since we're busy-waiting, so we disable them
+                   while sending (we don't disable interrupts entirely
+                   because sending over a serial line is really slow).  We
+                   save the status of the tx interrupt and restore it when
+                   we're done so that using printk doesn't interfere with
+                   normal serial transmission (other than interleaving the
+                   output, of course!).  This should work correctly even if
+                   this function is interrupted and the interrupt printks
+                   something.  */
+
+                /* Disable interrupts while fiddling with tx interrupt.  */
+                local_irq_save (flags);
+                /* Get current tx interrupt status.  */
+                irq_was_enabled = v850e_intc_irq_enabled (irq);
+                irq_was_pending = v850e_intc_irq_pending (irq);
+                /* Disable tx interrupt if necessary.  */
+                if (irq_was_enabled)
+                        v850e_intc_disable_irq (irq);
+                /* Turn interrupts back on.  */
+                local_irq_restore (flags);
+
+                /* Send characters.  */
+                while (count > 0) {
+                        int ch = *s++;
+
+                        if (ch == '\n') {
+                                /* We don't have the benefit of a tty
+                                   driver, so translate NL into CR LF.  */
+                                v850e_uart_wait_for_xmit_ok (chan);
+                                v850e_uart_putc (chan, '\r');
+                        }
+
+                        v850e_uart_wait_for_xmit_ok (chan);
+                        v850e_uart_putc (chan, ch);
+
+                        count--;
+                }
+
+                /* Restore saved tx interrupt status.  */
+                if (irq_was_enabled) {
+                        /* Wait for the last character we sent to be
+                           completely transmitted (as we'll get an
+                           interrupt interrupt at that point).  */
+                        v850e_uart_wait_for_xmit_done (chan);
+                        /* Clear pending interrupts received due
+                           to our transmission, unless there was already
+                           one pending, in which case we want the
+                           handler to be called.  */
+                        if (! irq_was_pending)
+                                v850e_intc_clear_pending_irq (irq);
+                        /* ... and then turn back on handling.  */
+                        v850e_intc_enable_irq (irq);
+                }
+        }
+}
+
+extern struct uart_driver v850e_uart_driver;
+static struct console v850e_uart_cons =
+{
+    .name       = "ttyS",
+    .write      = v850e_uart_cons_write,
+    .device     = uart_console_device,
+    .flags      = CON_PRINTBUFFER,
+    .cflag      = V850E_UART_INIT_CFLAGS,
+    .index      = -1,
+    .data       = &v850e_uart_driver,
+};
+
+void v850e_uart_cons_init (unsigned chan)
+{
+        v850e_uart_configure (chan, V850E_UART_INIT_CFLAGS,
+                              V850E_UART_INIT_BAUD);
+        v850e_uart_cons.index = chan;
+        register_console (&v850e_uart_cons);
+        printk ("Console: %s on-chip UART channel %d\n",
+                V850E_UART_CHIP_NAME, chan);
+}
+
+/* This is what the init code actually calls.  */
+static int v850e_uart_console_init (void)
+{
+        v850e_uart_cons_init (V850E_UART_CONSOLE_CHANNEL);
+        return 0;
+}
+console_initcall(v850e_uart_console_init);
+
+#define V850E_UART_CONSOLE &v850e_uart_cons
+
+#else /* !CONFIG_V850E_UART_CONSOLE */
+#define V850E_UART_CONSOLE 0
+#endif /* CONFIG_V850E_UART_CONSOLE */
+
+/* TX/RX interrupt handlers.  */
+
+static void v850e_uart_stop_tx (struct uart_port *port, unsigned tty_stop);
+
+void v850e_uart_tx (struct uart_port *port)
+{
+        struct circ_buf *xmit = &port->info->xmit;
+        int stopped = uart_tx_stopped (port);
+
+        if (v850e_uart_xmit_ok (port->line)) {
+                int tx_ch;
+
+                if (port->x_char) {
+                        tx_ch = port->x_char;
+                        port->x_char = 0;
+                } else if (!uart_circ_empty (xmit) && !stopped) {
+                        tx_ch = xmit->buf[xmit->tail];
+                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                } else
+                        goto no_xmit;
+
+                v850e_uart_putc (port->line, tx_ch);
+                port->icount.tx++;
+
+                if (uart_circ_chars_pending (xmit) < WAKEUP_CHARS)
+                        uart_write_wakeup (port);
+        }
+
+ no_xmit:
+        if (uart_circ_empty (xmit) || stopped)
+                v850e_uart_stop_tx (port, stopped);
+}
+
+static irqreturn_t v850e_uart_tx_irq(int irq, void *data, struct pt_regs *regs)
+{
+        struct uart_port *port = data;
+        v850e_uart_tx (port);
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t v850e_uart_rx_irq(int irq, void *data, struct pt_regs *regs)
+{
+        struct uart_port *port = data;
+        unsigned ch_stat = TTY_NORMAL;
+        unsigned ch = v850e_uart_getc (port->line);
+        unsigned err = v850e_uart_err (port->line);
+
+        if (err) {
+                if (err & V850E_UART_ERR_OVERRUN) {
+                        ch_stat = TTY_OVERRUN;
+                        port->icount.overrun++;
+                } else if (err & V850E_UART_ERR_FRAME) {
+                        ch_stat = TTY_FRAME;
+                        port->icount.frame++;
+                } else if (err & V850E_UART_ERR_PARITY) {
+                        ch_stat = TTY_PARITY;
+                        port->icount.parity++;
+                }
+        }
+
+        port->icount.rx++;
+
+        tty_insert_flip_char (port->info->tty, ch, ch_stat);
+        tty_schedule_flip (port->info->tty);
+
+        return IRQ_HANDLED;
+}
+
+
+/* Control functions for the serial framework.  */
+
+static void v850e_uart_nop (struct uart_port *port) { }
+static int v850e_uart_success (struct uart_port *port) { return 0; }
+
+static unsigned v850e_uart_tx_empty (struct uart_port *port)
+{
+        return TIOCSER_TEMT;    /* Can't detect.  */
+}
+
+static void v850e_uart_set_mctrl (struct uart_port *port, unsigned mctrl)
+{
+#ifdef V850E_UART_SET_RTS
+        V850E_UART_SET_RTS (port->line, (mctrl & TIOCM_RTS));
+#endif
+}
+
+static unsigned v850e_uart_get_mctrl (struct uart_port *port)
+{
+        /* We don't support DCD or DSR, so consider them permanently active. */
+        int mctrl = TIOCM_CAR | TIOCM_DSR;
+
+        /* We may support CTS.  */
+#ifdef V850E_UART_CTS
+        mctrl |= V850E_UART_CTS(port->line) ? TIOCM_CTS : 0;
+#else
+        mctrl |= TIOCM_CTS;
+#endif
+
+        return mctrl;
+}
+
+static void v850e_uart_start_tx (struct uart_port *port, unsigned tty_start)
+{
+        v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
+        v850e_uart_tx (port);
+        v850e_intc_enable_irq (V850E_UART_TX_IRQ (port->line));
+}
+
+static void v850e_uart_stop_tx (struct uart_port *port, unsigned tty_stop)
+{
+        v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
+}
+
+static void v850e_uart_start_rx (struct uart_port *port)
+{
+        v850e_intc_enable_irq (V850E_UART_RX_IRQ (port->line));
+}
+
+static void v850e_uart_stop_rx (struct uart_port *port)
+{
+        v850e_intc_disable_irq (V850E_UART_RX_IRQ (port->line));
+}
+
+static void v850e_uart_break_ctl (struct uart_port *port, int break_ctl)
+{
+        /* Umm, do this later.  */
+}
+
+static int v850e_uart_startup (struct uart_port *port)
+{
+        int err;
+
+        /* Alloc RX irq.  */
+        err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq,
+                           SA_INTERRUPT, "v850e_uart", port);
+        if (err)
+                return err;
+
+        /* Alloc TX irq.  */
+        err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq,
+                           SA_INTERRUPT, "v850e_uart", port);
+        if (err) {
+                free_irq (V850E_UART_RX_IRQ (port->line), port);
+                return err;
+        }
+
+        v850e_uart_start_rx (port);
+
+        return 0;
+}
+
+static void v850e_uart_shutdown (struct uart_port *port)
+{
+        /* Disable port interrupts.  */
+        free_irq (V850E_UART_TX_IRQ (port->line), port);
+        free_irq (V850E_UART_RX_IRQ (port->line), port);
+
+        /* Turn off xmit/recv enable bits.  */
+        V850E_UART_CONFIG (port->line)
+                &= ~(V850E_UART_CONFIG_TX_ENABLE
+                     | V850E_UART_CONFIG_RX_ENABLE);
+        /* Then reset the channel.  */
+        V850E_UART_CONFIG (port->line) = 0;
+}
+
+static void
+v850e_uart_set_termios (struct uart_port *port, struct termios *termios,
+                        struct termios *old)
+{
+        unsigned cflags = termios->c_cflag;
+
+        /* Restrict flags to legal values.  */
+        if ((cflags & CSIZE) != CS7 && (cflags & CSIZE) != CS8)
+                /* The new value of CSIZE is invalid, use the old value.  */
+                cflags = (cflags & ~CSIZE)
+                        | (old ? (old->c_cflag & CSIZE) : CS8);
+
+        termios->c_cflag = cflags;
+
+        v850e_uart_configure (port->line, cflags,
+                              uart_get_baud_rate (port, termios, old,
+                                                  v850e_uart_min_baud(),
+                                                  v850e_uart_max_baud()));
+}
+
+static const char *v850e_uart_type (struct uart_port *port)
+{
+        return port->type == PORT_V850E_UART ? "v850e_uart" : 0;
+}
+
+static void v850e_uart_config_port (struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE)
+                port->type = PORT_V850E_UART;
+}
+
+static int
+v850e_uart_verify_port (struct uart_port *port, struct serial_struct *ser)
+{
+        if (ser->type != PORT_UNKNOWN && ser->type != PORT_V850E_UART)
+                return -EINVAL;
+        if (ser->irq != V850E_UART_TX_IRQ (port->line))
+                return -EINVAL;
+        return 0;
+}
+
+static struct uart_ops v850e_uart_ops = {
+        .tx_empty       = v850e_uart_tx_empty,
+        .get_mctrl      = v850e_uart_get_mctrl,
+        .set_mctrl      = v850e_uart_set_mctrl,
+        .start_tx       = v850e_uart_start_tx,
+        .stop_tx        = v850e_uart_stop_tx,
+        .stop_rx        = v850e_uart_stop_rx,
+        .enable_ms      = v850e_uart_nop,
+        .break_ctl      = v850e_uart_break_ctl,
+        .startup        = v850e_uart_startup,
+        .shutdown       = v850e_uart_shutdown,
+        .set_termios    = v850e_uart_set_termios,
+        .type           = v850e_uart_type,
+        .release_port   = v850e_uart_nop,
+        .request_port   = v850e_uart_success,
+        .config_port    = v850e_uart_config_port,
+        .verify_port    = v850e_uart_verify_port,
+};
+
+/* Initialization and cleanup.  */
+
+static struct uart_driver v850e_uart_driver = {
+        .owner                  = THIS_MODULE,
+        .driver_name            = "v850e_uart",
+        .devfs_name             = "tts/",
+        .dev_name               = "ttyS",
+        .major                  = TTY_MAJOR,
+        .minor                  = V850E_UART_MINOR_BASE,
+        .nr                     = V850E_UART_NUM_CHANNELS,
+        .cons                   = V850E_UART_CONSOLE,
+};
+
+
+static struct uart_port v850e_uart_ports[V850E_UART_NUM_CHANNELS];
+
+static int __init v850e_uart_init (void)
+{
+        int rval;
+
+        printk (KERN_INFO "%s on-chip UART\n", V850E_UART_CHIP_NAME);
+
+        rval = uart_register_driver (&v850e_uart_driver);
+        if (rval == 0) {
+                unsigned chan;
+
+                for (chan = 0; chan < V850E_UART_NUM_CHANNELS; chan++) {
+                        struct uart_port *port = &v850e_uart_ports[chan];
+                        
+                        memset (port, 0, sizeof *port);
+
+                        port->ops = &v850e_uart_ops;
+                        port->line = chan;
+                        port->iotype = SERIAL_IO_MEM;
+                        port->flags = UPF_BOOT_AUTOCONF;
+
+                        /* We actually use multiple IRQs, but the serial
+                           framework seems to mainly use this for
+                           informational purposes anyway.  Here we use the TX
+                           irq.  */
+                        port->irq = V850E_UART_TX_IRQ (chan);
+
+                        /* The serial framework doesn't really use these
+                           membase/mapbase fields for anything useful, but
+                           it requires that they be something non-zero to
+                           consider the port `valid', and also uses them
+                           for informational purposes.  */
+                        port->membase = (void *)V850E_UART_BASE_ADDR (chan);
+                        port->mapbase = V850E_UART_BASE_ADDR (chan);
+
+                        /* The framework insists on knowing the uart's master
+                           clock freq, though it doesn't seem to do anything
+                           useful for us with it.  We must make it at least
+                           higher than (the maximum baud rate * 16), otherwise
+                           the framework will puke during its internal
+                           calculations, and force the baud rate to be 9600.
+                           To be accurate though, just repeat the calculation
+                           we use when actually setting the speed.  */
+                        port->uartclk = v850e_uart_max_clock() * 16;
+
+                        uart_add_one_port (&v850e_uart_driver, port);
+                }
+        }
+
+        return rval;
+}
+
+static void __exit v850e_uart_exit (void)
+{
+        unsigned chan;
+
+        for (chan = 0; chan < V850E_UART_NUM_CHANNELS; chan++)
+                uart_remove_one_port (&v850e_uart_driver,
+                                      &v850e_uart_ports[chan]);
+
+        uart_unregister_driver (&v850e_uart_driver);
+}
+
+module_init (v850e_uart_init);
+module_exit (v850e_uart_exit);
+
+MODULE_AUTHOR ("Miles Bader");
+MODULE_DESCRIPTION ("NEC " V850E_UART_CHIP_NAME " on-chip UART");
+MODULE_LICENSE ("GPL");
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
new file mode 100644
index 000000000000..ebc59c27a85c
--- /dev/null
+++ b/drivers/serial/vr41xx_siu.c
@@ -0,0 +1,1100 @@
+/*
+ *  Driver for NEC VR4100 series Serial Interface Unit.
+ *
+ *  Copyright (C) 2004-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *
+ *  Based on drivers/serial/8250.c, by Russell King.
+ *
+ *  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.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
+#include <linux/console.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/serial_reg.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+
+#include <asm/io.h>
+#include <asm/vr41xx/siu.h>
+#include <asm/vr41xx/vr41xx.h>
+
+#define SIU_PORTS_MAX   2
+#define SIU_BAUD_BASE   1152000
+#define SIU_MAJOR       204
+#define SIU_MINOR_BASE  82
+
+#define RX_MAX_COUNT    256
+#define TX_MAX_COUNT    15
+
+#define SIUIRSEL        0x08
+ #define TMICMODE       0x20
+ #define TMICTX         0x10
+ #define IRMSEL         0x0c
+ #define IRMSEL_HP      0x08
+ #define IRMSEL_TEMIC   0x04
+ #define IRMSEL_SHARP   0x00
+ #define IRUSESEL       0x02
+ #define SIRSEL         0x01
+
+struct siu_port {
+        unsigned int type;
+        unsigned int irq;
+        unsigned long start;
+};
+
+static const struct siu_port siu_type1_ports[] = {
+        {       .type           = PORT_VR41XX_SIU,
+                .irq            = SIU_IRQ,
+                .start          = 0x0c000000UL,         },
+};
+
+#define SIU_TYPE1_NR_PORTS      (sizeof(siu_type1_ports) / sizeof(struct siu_port))
+
+static const struct siu_port siu_type2_ports[] = {
+        {       .type           = PORT_VR41XX_SIU,
+                .irq            = SIU_IRQ,
+                .start          = 0x0f000800UL,         },
+        {       .type           = PORT_VR41XX_DSIU,
+                .irq            = DSIU_IRQ,
+                .start          = 0x0f000820UL,         },
+};
+
+#define SIU_TYPE2_NR_PORTS      (sizeof(siu_type2_ports) / sizeof(struct siu_port))
+
+static struct uart_port siu_uart_ports[SIU_PORTS_MAX];
+static uint8_t lsr_break_flag[SIU_PORTS_MAX];
+
+#define siu_read(port, offset)          readb((port)->membase + (offset))
+#define siu_write(port, offset, value)  writeb((value), (port)->membase + (offset))
+
+void vr41xx_select_siu_interface(siu_interface_t interface)
+{
+        struct uart_port *port;
+        unsigned long flags;
+        uint8_t irsel;
+
+        port = &siu_uart_ports[0];
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        irsel = siu_read(port, SIUIRSEL);
+        if (interface == SIU_INTERFACE_IRDA)
+                irsel |= SIRSEL;
+        else
+                irsel &= ~SIRSEL;
+        siu_write(port, SIUIRSEL, irsel);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_select_siu_interface);
+
+void vr41xx_use_irda(irda_use_t use)
+{
+        struct uart_port *port;
+        unsigned long flags;
+        uint8_t irsel;
+
+        port = &siu_uart_ports[0];
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        irsel = siu_read(port, SIUIRSEL);
+        if (use == FIR_USE_IRDA)
+                irsel |= IRUSESEL;
+        else
+                irsel &= ~IRUSESEL;
+        siu_write(port, SIUIRSEL, irsel);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_use_irda);
+
+void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed)
+{
+        struct uart_port *port;
+        unsigned long flags;
+        uint8_t irsel;
+
+        port = &siu_uart_ports[0];
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        irsel = siu_read(port, SIUIRSEL);
+        irsel &= ~(IRMSEL | TMICTX | TMICMODE);
+        switch (module) {
+        case SHARP_IRDA:
+                irsel |= IRMSEL_SHARP;
+                break;
+        case TEMIC_IRDA:
+                irsel |= IRMSEL_TEMIC | TMICMODE;
+                if (speed == IRDA_TX_4MBPS)
+                        irsel |= TMICTX;
+                break;
+        case HP_IRDA:
+                irsel |= IRMSEL_HP;
+                break;
+        default:
+                break;
+        }
+        siu_write(port, SIUIRSEL, irsel);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_select_irda_module);
+
+static inline void siu_clear_fifo(struct uart_port *port)
+{
+        siu_write(port, UART_FCR, UART_FCR_ENABLE_FIFO);
+        siu_write(port, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR |
+                                  UART_FCR_CLEAR_XMIT);
+        siu_write(port, UART_FCR, 0);
+}
+
+static inline int siu_probe_ports(void)
+{
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                return SIU_TYPE1_NR_PORTS;
+        case CPU_VR4122:
+        case CPU_VR4131:
+        case CPU_VR4133:
+                return SIU_TYPE2_NR_PORTS;
+        }
+
+        return 0;
+}
+
+static inline unsigned long siu_port_size(struct uart_port *port)
+{
+        switch (port->type) {
+        case PORT_VR41XX_SIU:
+                return 11UL;
+        case PORT_VR41XX_DSIU:
+                return 8UL;
+        }
+
+        return 0;
+}
+
+static inline unsigned int siu_check_type(struct uart_port *port)
+{
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                if (port->line == 0)
+                        return PORT_VR41XX_SIU;
+                break;
+        case CPU_VR4122:
+        case CPU_VR4131:
+        case CPU_VR4133:
+                if (port->line == 0)
+                        return PORT_VR41XX_SIU;
+                else if (port->line == 1)
+                        return PORT_VR41XX_DSIU;
+                break;
+        }
+
+        return PORT_UNKNOWN;
+}
+
+static inline const char *siu_type_name(struct uart_port *port)
+{
+        switch (port->type) {
+        case PORT_VR41XX_SIU:
+                return "SIU";
+        case PORT_VR41XX_DSIU:
+                return "DSIU";
+        }
+
+        return "unknown";
+}
+
+static unsigned int siu_tx_empty(struct uart_port *port)
+{
+        uint8_t lsr;
+
+        lsr = siu_read(port, UART_LSR);
+        if (lsr & UART_LSR_TEMT)
+                return TIOCSER_TEMT;
+
+        return 0;
+}
+
+static void siu_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        uint8_t mcr = 0;
+
+        if (mctrl & TIOCM_DTR)
+                mcr |= UART_MCR_DTR;
+        if (mctrl & TIOCM_RTS)
+                mcr |= UART_MCR_RTS;
+        if (mctrl & TIOCM_OUT1)
+                mcr |= UART_MCR_OUT1;
+        if (mctrl & TIOCM_OUT2)
+                mcr |= UART_MCR_OUT2;
+        if (mctrl & TIOCM_LOOP)
+                mcr |= UART_MCR_LOOP;
+
+        siu_write(port, UART_MCR, mcr);
+}
+
+static unsigned int siu_get_mctrl(struct uart_port *port)
+{
+        uint8_t msr;
+        unsigned int mctrl = 0;
+
+        msr = siu_read(port, UART_MSR);
+        if (msr & UART_MSR_DCD)
+                mctrl |= TIOCM_CAR;
+        if (msr & UART_MSR_RI)
+                mctrl |= TIOCM_RNG;
+        if (msr & UART_MSR_DSR)
+                mctrl |= TIOCM_DSR;
+        if (msr & UART_MSR_CTS)
+                mctrl |= TIOCM_CTS;
+
+        return mctrl;
+}
+
+static void siu_stop_tx(struct uart_port *port, unsigned int tty_stop)
+{
+        unsigned long flags;
+        uint8_t ier;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ier = siu_read(port, UART_IER);
+        ier &= ~UART_IER_THRI;
+        siu_write(port, UART_IER, ier);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void siu_start_tx(struct uart_port *port, unsigned int tty_start)
+{
+        unsigned long flags;
+        uint8_t ier;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ier = siu_read(port, UART_IER);
+        ier |= UART_IER_THRI;
+        siu_write(port, UART_IER, ier);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void siu_stop_rx(struct uart_port *port)
+{
+        unsigned long flags;
+        uint8_t ier;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ier = siu_read(port, UART_IER);
+        ier &= ~UART_IER_RLSI;
+        siu_write(port, UART_IER, ier);
+
+        port->read_status_mask &= ~UART_LSR_DR;
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void siu_enable_ms(struct uart_port *port)
+{
+        unsigned long flags;
+        uint8_t ier;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        ier = siu_read(port, UART_IER);
+        ier |= UART_IER_MSI;
+        siu_write(port, UART_IER, ier);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void siu_break_ctl(struct uart_port *port, int ctl)
+{
+        unsigned long flags;
+        uint8_t lcr;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        lcr = siu_read(port, UART_LCR);
+        if (ctl == -1)
+                lcr |= UART_LCR_SBC;
+        else
+                lcr &= ~UART_LCR_SBC;
+        siu_write(port, UART_LCR, lcr);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static inline void receive_chars(struct uart_port *port, uint8_t *status,
+                                 struct pt_regs *regs)
+{
+        struct tty_struct *tty;
+        uint8_t lsr, ch;
+        char flag;
+        int max_count = RX_MAX_COUNT;
+
+        tty = port->info->tty;
+        lsr = *status;
+
+        do {
+                if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+                        if (tty->low_latency)
+                                tty_flip_buffer_push(tty);
+                }
+
+                ch = siu_read(port, UART_RX);
+                port->icount.rx++;
+                flag = TTY_NORMAL;
+
+#ifdef CONFIG_SERIAL_VR41XX_CONSOLE
+                lsr |= lsr_break_flag[port->line];
+                lsr_break_flag[port->line] = 0;
+#endif
+                if (unlikely(lsr & (UART_LSR_BI | UART_LSR_FE |
+                                    UART_LSR_PE | UART_LSR_OE))) {
+                        if (lsr & UART_LSR_BI) {
+                                lsr &= ~(UART_LSR_FE | UART_LSR_PE);
+                                port->icount.brk++;
+
+                                if (uart_handle_break(port))
+                                        goto ignore_char;
+                        }
+
+                        if (lsr & UART_LSR_FE)
+                                port->icount.frame++;
+                        if (lsr & UART_LSR_PE)
+                                port->icount.parity++;
+                        if (lsr & UART_LSR_OE)
+                                port->icount.overrun++;
+
+                        lsr &= port->read_status_mask;
+                        if (lsr & UART_LSR_BI)
+                                flag = TTY_BREAK;
+                        if (lsr & UART_LSR_FE)
+                                flag = TTY_FRAME;
+                        if (lsr & UART_LSR_PE)
+                                flag = TTY_PARITY;
+                }
+
+                if (uart_handle_sysrq_char(port, ch, regs))
+                        goto ignore_char;
+                if ((lsr & port->ignore_status_mask) == 0)
+                        tty_insert_flip_char(tty, ch, flag);
+                if ((lsr & UART_LSR_OE) && (tty->flip.count < TTY_FLIPBUF_SIZE))
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+
+        ignore_char:
+                lsr = siu_read(port, UART_LSR);
+        } while ((lsr & UART_LSR_DR) && (max_count-- > 0));
+
+        tty_flip_buffer_push(tty);
+
+        *status = lsr;
+}
+
+static inline void check_modem_status(struct uart_port *port)
+{
+        uint8_t msr;
+
+        msr = siu_read(port, UART_MSR);
+        if ((msr & UART_MSR_ANY_DELTA) == 0)
+                return;
+        if (msr & UART_MSR_DDCD)
+                uart_handle_dcd_change(port, msr & UART_MSR_DCD);
+        if (msr & UART_MSR_TERI)
+                port->icount.rng++;
+        if (msr & UART_MSR_DDSR)
+                port->icount.dsr++;
+        if (msr & UART_MSR_DCTS)
+                uart_handle_cts_change(port, msr & UART_MSR_CTS);
+
+        wake_up_interruptible(&port->info->delta_msr_wait);
+}
+
+static inline void transmit_chars(struct uart_port *port)
+{
+        struct circ_buf *xmit;
+        int max_count = TX_MAX_COUNT;
+
+        xmit = &port->info->xmit;
+
+        if (port->x_char) {
+                siu_write(port, UART_TX, port->x_char);
+                port->icount.tx++;
+                port->x_char = 0;
+                return;
+        }
+
+        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                siu_stop_tx(port, 0);
+                return;
+        }
+
+        do {
+                siu_write(port, UART_TX, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                if (uart_circ_empty(xmit))
+                        break;
+        } while (max_count-- > 0);
+
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+
+        if (uart_circ_empty(xmit))
+                siu_stop_tx(port, 0);
+}
+
+static irqreturn_t siu_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct uart_port *port;
+        uint8_t iir, lsr;
+
+        if (dev_id == NULL)
+                return IRQ_NONE;
+
+        port = (struct uart_port *)dev_id;
+
+        iir = siu_read(port, UART_IIR);
+        if (iir & UART_IIR_NO_INT)
+                return IRQ_NONE;
+
+        lsr = siu_read(port, UART_LSR);
+        if (lsr & UART_LSR_DR)
+                receive_chars(port, &lsr, regs);
+
+        check_modem_status(port);
+
+        if (lsr & UART_LSR_THRE)
+                transmit_chars(port);
+
+        return IRQ_HANDLED;
+}
+
+static int siu_startup(struct uart_port *port)
+{
+        int retval;
+
+        siu_clear_fifo(port);
+
+        (void)siu_read(port, UART_LSR);
+        (void)siu_read(port, UART_RX);
+        (void)siu_read(port, UART_IIR);
+        (void)siu_read(port, UART_MSR);
+
+        if (siu_read(port, UART_LSR) == 0xff)
+                return -ENODEV;
+
+        retval = request_irq(port->irq, siu_interrupt, 0, siu_type_name(port), port);
+        if (retval)
+                return retval;
+
+        if (port->type == PORT_VR41XX_DSIU)
+                vr41xx_enable_dsiuint(DSIUINT_ALL);
+
+        siu_write(port, UART_LCR, UART_LCR_WLEN8);
+
+        spin_lock_irq(&port->lock);
+        siu_set_mctrl(port, port->mctrl);
+        spin_unlock_irq(&port->lock);
+
+        siu_write(port, UART_IER, UART_IER_RLSI | UART_IER_RDI);
+
+        (void)siu_read(port, UART_LSR);
+        (void)siu_read(port, UART_RX);
+        (void)siu_read(port, UART_IIR);
+        (void)siu_read(port, UART_MSR);
+
+        return 0;
+}
+
+static void siu_shutdown(struct uart_port *port)
+{
+        unsigned long flags;
+        uint8_t lcr;
+
+        if (port->membase == NULL)
+                return;
+
+        siu_write(port, UART_IER, 0);
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        port->mctrl &= ~TIOCM_OUT2;
+        siu_set_mctrl(port, port->mctrl);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        lcr = siu_read(port, UART_LCR);
+        lcr &= ~UART_LCR_SBC;
+        siu_write(port, UART_LCR, lcr);
+
+        siu_clear_fifo(port);
+
+        (void)siu_read(port, UART_RX);
+
+        if (port->type == PORT_VR41XX_DSIU)
+                vr41xx_disable_dsiuint(DSIUINT_ALL);
+
+        free_irq(port->irq, port);
+}
+
+static void siu_set_termios(struct uart_port *port, struct termios *new,
+                            struct termios *old)
+{
+        tcflag_t c_cflag, c_iflag;
+        uint8_t lcr, fcr, ier;
+        unsigned int baud, quot;
+        unsigned long flags;
+
+        c_cflag = new->c_cflag;
+        switch (c_cflag & CSIZE) {
+        case CS5:
+                lcr = UART_LCR_WLEN5;
+                break;
+        case CS6:
+                lcr = UART_LCR_WLEN6;
+                break;
+        case CS7:
+                lcr = UART_LCR_WLEN7;
+                break;
+        default:
+                lcr = UART_LCR_WLEN8;
+                break;
+        }
+
+        if (c_cflag & CSTOPB)
+                lcr |= UART_LCR_STOP;
+        if (c_cflag & PARENB)
+                lcr |= UART_LCR_PARITY;
+        if ((c_cflag & PARODD) != PARODD)
+                lcr |= UART_LCR_EPAR;
+        if (c_cflag & CMSPAR)
+                lcr |= UART_LCR_SPAR;
+
+        baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+
+        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10;
+
+        spin_lock_irqsave(&port->lock, flags);
+
+        uart_update_timeout(port, c_cflag, baud);
+
+        c_iflag = new->c_iflag;
+
+        port->read_status_mask = UART_LSR_THRE | UART_LSR_OE | UART_LSR_DR;
+        if (c_iflag & INPCK)
+                port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= UART_LSR_BI;
+
+        port->ignore_status_mask = 0;
+        if (c_iflag & IGNPAR)
+                port->ignore_status_mask |= UART_LSR_FE | UART_LSR_PE;
+        if (c_iflag & IGNBRK) {
+                port->ignore_status_mask |= UART_LSR_BI;
+                if (c_iflag & IGNPAR)
+                        port->ignore_status_mask |= UART_LSR_OE;
+        }
+
+        if ((c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= UART_LSR_DR;
+
+        ier = siu_read(port, UART_IER);
+        ier &= ~UART_IER_MSI;
+        if (UART_ENABLE_MS(port, c_cflag))
+                ier |= UART_IER_MSI;
+        siu_write(port, UART_IER, ier);
+
+        siu_write(port, UART_LCR, lcr | UART_LCR_DLAB);
+
+        siu_write(port, UART_DLL, (uint8_t)quot);
+        siu_write(port, UART_DLM, (uint8_t)(quot >> 8));
+
+        siu_write(port, UART_LCR, lcr);
+
+        siu_write(port, UART_FCR, fcr);
+
+        siu_set_mctrl(port, port->mctrl);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void siu_pm(struct uart_port *port, unsigned int state, unsigned int oldstate)
+{
+        switch (state) {
+        case 0:
+                switch (port->type) {
+                case PORT_VR41XX_SIU:
+                        vr41xx_supply_clock(SIU_CLOCK);
+                        break;
+                case PORT_VR41XX_DSIU:
+                        vr41xx_supply_clock(DSIU_CLOCK);
+                        break;
+                }
+                break;
+        case 3:
+                switch (port->type) {
+                case PORT_VR41XX_SIU:
+                        vr41xx_mask_clock(SIU_CLOCK);
+                        break;
+                case PORT_VR41XX_DSIU:
+                        vr41xx_mask_clock(DSIU_CLOCK);
+                        break;
+                }
+                break;
+        }
+}
+
+static const char *siu_type(struct uart_port *port)
+{
+        return siu_type_name(port);
+}
+
+static void siu_release_port(struct uart_port *port)
+{
+        unsigned long size;
+
+        if (port->flags & UPF_IOREMAP) {
+                iounmap(port->membase);
+                port->membase = NULL;
+        }
+
+        size = siu_port_size(port);
+        release_mem_region(port->mapbase, size);
+}
+
+static int siu_request_port(struct uart_port *port)
+{
+        unsigned long size;
+        struct resource *res;
+
+        size = siu_port_size(port);
+        res = request_mem_region(port->mapbase, size, siu_type_name(port));
+        if (res == NULL)
+                return -EBUSY;
+
+        if (port->flags & UPF_IOREMAP) {
+                port->membase = ioremap(port->mapbase, size);
+                if (port->membase == NULL) {
+                        release_resource(res);
+                        return -ENOMEM;
+                }
+        }
+
+        return 0;
+}
+
+static void siu_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = siu_check_type(port);
+                (void)siu_request_port(port);
+        }
+}
+
+static int siu_verify_port(struct uart_port *port, struct serial_struct *serial)
+{
+        if (port->type != PORT_VR41XX_SIU && port->type != PORT_VR41XX_DSIU)
+                return -EINVAL;
+        if (port->irq != serial->irq)
+                return -EINVAL;
+        if (port->iotype != serial->io_type)
+                return -EINVAL;
+        if (port->mapbase != (unsigned long)serial->iomem_base)
+                return -EINVAL;
+
+        return 0;
+}
+
+static struct uart_ops siu_uart_ops = {
+        .tx_empty       = siu_tx_empty,
+        .set_mctrl      = siu_set_mctrl,
+        .get_mctrl      = siu_get_mctrl,
+        .stop_tx        = siu_stop_tx,
+        .start_tx       = siu_start_tx,
+        .stop_rx        = siu_stop_rx,
+        .enable_ms      = siu_enable_ms,
+        .break_ctl      = siu_break_ctl,
+        .startup        = siu_startup,
+        .shutdown       = siu_shutdown,
+        .set_termios    = siu_set_termios,
+        .pm             = siu_pm,
+        .type           = siu_type,
+        .release_port   = siu_release_port,
+        .request_port   = siu_request_port,
+        .config_port    = siu_config_port,
+        .verify_port    = siu_verify_port,
+};
+
+static int siu_init_ports(void)
+{
+        const struct siu_port *siu;
+        struct uart_port *port;
+        int i, num;
+
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                siu = siu_type1_ports;
+                break;
+        case CPU_VR4122:
+        case CPU_VR4131:
+        case CPU_VR4133:
+                siu = siu_type2_ports;
+                break;
+        default:
+                return 0;
+        }
+
+        port = siu_uart_ports;
+        num = siu_probe_ports();
+        for (i = 0; i < num; i++) {
+                spin_lock_init(&port->lock);
+                port->irq = siu->irq;
+                port->uartclk = SIU_BAUD_BASE * 16;
+                port->fifosize = 16;
+                port->regshift = 0;
+                port->iotype = UPIO_MEM;
+                port->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
+                port->type = siu->type;
+                port->line = i;
+                port->mapbase = siu->start;
+                siu++;
+                port++;
+        }
+
+        return num;
+}
+
+#ifdef CONFIG_SERIAL_VR41XX_CONSOLE
+
+static void early_set_termios(struct uart_port *port, struct termios *new,
+                              struct termios *old)
+{
+        tcflag_t c_cflag;
+        uint8_t lcr;
+        unsigned int baud, quot;
+
+        c_cflag = new->c_cflag;
+        switch (c_cflag & CSIZE) {
+        case CS5:
+                lcr = UART_LCR_WLEN5;
+                break;
+        case CS6:
+                lcr = UART_LCR_WLEN6;
+                break;
+        case CS7:
+                lcr = UART_LCR_WLEN7;
+                break;
+        default:
+                lcr = UART_LCR_WLEN8;
+                break;
+        }
+
+        if (c_cflag & CSTOPB)
+                lcr |= UART_LCR_STOP;
+        if (c_cflag & PARENB)
+                lcr |= UART_LCR_PARITY;
+        if ((c_cflag & PARODD) != PARODD)
+                lcr |= UART_LCR_EPAR;
+        if (c_cflag & CMSPAR)
+                lcr |= UART_LCR_SPAR;
+
+        baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
+        quot = uart_get_divisor(port, baud);
+
+        siu_write(port, UART_LCR, lcr | UART_LCR_DLAB);
+
+        siu_write(port, UART_DLL, (uint8_t)quot);
+        siu_write(port, UART_DLM, (uint8_t)(quot >> 8));
+
+        siu_write(port, UART_LCR, lcr);
+}
+
+static struct uart_ops early_uart_ops = {
+        .set_termios    = early_set_termios,
+};
+
+#define BOTH_EMPTY      (UART_LSR_TEMT | UART_LSR_THRE)
+
+static void wait_for_xmitr(struct uart_port *port)
+{
+        int timeout = 10000;
+        uint8_t lsr, msr;
+
+        do {
+                lsr = siu_read(port, UART_LSR);
+                if (lsr & UART_LSR_BI)
+                        lsr_break_flag[port->line] = UART_LSR_BI;
+
+                if ((lsr & BOTH_EMPTY) == BOTH_EMPTY)
+                        break;
+        } while (timeout-- > 0);
+
+        if (port->flags & UPF_CONS_FLOW) {
+                timeout = 1000000;
+
+                do {
+                        msr = siu_read(port, UART_MSR);
+                        if ((msr & UART_MSR_CTS) != 0)
+                                break;
+                } while (timeout-- > 0);
+        }
+}
+
+static void siu_console_write(struct console *con, const char *s, unsigned count)
+{
+        struct uart_port *port;
+        uint8_t ier;
+        unsigned i;
+
+        port = &siu_uart_ports[con->index];
+
+        ier = siu_read(port, UART_IER);
+        siu_write(port, UART_IER, 0);
+
+        for (i = 0; i < count && *s != '\0'; i++, s++) {
+                wait_for_xmitr(port);
+                siu_write(port, UART_TX, *s);
+                if (*s == '\n') {
+                        wait_for_xmitr(port);
+                        siu_write(port, UART_TX, '\r');
+                }
+        }
+
+        wait_for_xmitr(port);
+        siu_write(port, UART_IER, ier);
+}
+
+static int siu_console_setup(struct console *con, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int parity = 'n';
+        int bits = 8;
+        int flow = 'n';
+
+        if (con->index >= SIU_PORTS_MAX)
+                con->index = 0;
+
+        port = &siu_uart_ports[con->index];
+        if (port->membase == NULL) {
+                if (port->mapbase == 0)
+                        return -ENODEV;
+                port->membase = (unsigned char __iomem *)KSEG1ADDR(port->mapbase);
+        }
+
+        vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
+
+        if (options != NULL)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, con, baud, parity, bits, flow);
+}
+
+static struct uart_driver siu_uart_driver;
+
+static struct console siu_console = {
+        .name   = "ttyVR",
+        .write  = siu_console_write,
+        .device = uart_console_device,
+        .setup  = siu_console_setup,
+        .flags  = CON_PRINTBUFFER,
+        .index  = -1,
+        .data   = &siu_uart_driver,
+};
+
+static int __devinit siu_console_init(void)
+{
+        struct uart_port *port;
+        int num, i;
+
+        num = siu_init_ports();
+        if (num <= 0)
+                return -ENODEV;
+
+        for (i = 0; i < num; i++) {
+                port = &siu_uart_ports[i];
+                port->ops = &early_uart_ops;
+        }
+
+        register_console(&siu_console);
+
+        return 0;
+}
+
+console_initcall(siu_console_init);
+
+#define SERIAL_VR41XX_CONSOLE   &siu_console
+#else
+#define SERIAL_VR41XX_CONSOLE   NULL
+#endif
+
+static struct uart_driver siu_uart_driver = {
+        .owner          = THIS_MODULE,
+        .driver_name    = "SIU",
+        .dev_name       = "ttyVR",
+        .devfs_name     = "ttvr/",
+        .major          = SIU_MAJOR,
+        .minor          = SIU_MINOR_BASE,
+        .cons           = SERIAL_VR41XX_CONSOLE,
+};
+
+static int siu_probe(struct device *dev)
+{
+        struct uart_port *port;
+        int num, i, retval;
+
+        num = siu_init_ports();
+        if (num <= 0)
+                return -ENODEV;
+
+        siu_uart_driver.nr = num;
+        retval = uart_register_driver(&siu_uart_driver);
+        if (retval)
+                return retval;
+
+        for (i = 0; i < num; i++) {
+                port = &siu_uart_ports[i];
+                port->ops = &siu_uart_ops;
+                port->dev = dev;
+
+                retval = uart_add_one_port(&siu_uart_driver, port);
+                if (retval)
+                        break;
+        }
+
+        if (i == 0 && retval < 0) {
+                uart_unregister_driver(&siu_uart_driver);
+                return retval;
+        }
+
+        return 0;
+}
+
+static int siu_remove(struct device *dev)
+{
+        struct uart_port *port;
+        int i;
+
+        for (i = 0; i < siu_uart_driver.nr; i++) {
+                port = &siu_uart_ports[i];
+                if (port->dev == dev) {
+                        uart_remove_one_port(&siu_uart_driver, port);
+                        port->dev = NULL;
+                }
+        }
+
+        uart_unregister_driver(&siu_uart_driver);
+
+        return 0;
+}
+
+static int siu_suspend(struct device *dev, u32 state, u32 level)
+{
+        struct uart_port *port;
+        int i;
+
+        if (level != SUSPEND_DISABLE)
+                return 0;
+
+        for (i = 0; i < siu_uart_driver.nr; i++) {
+                port = &siu_uart_ports[i];
+                if ((port->type == PORT_VR41XX_SIU ||
+                     port->type == PORT_VR41XX_DSIU) && port->dev == dev)
+                        uart_suspend_port(&siu_uart_driver, port);
+
+        }
+
+        return 0;
+}
+
+static int siu_resume(struct device *dev, u32 level)
+{
+        struct uart_port *port;
+        int i;
+
+        if (level != RESUME_ENABLE)
+                return 0;
+
+        for (i = 0; i < siu_uart_driver.nr; i++) {
+                port = &siu_uart_ports[i];
+                if ((port->type == PORT_VR41XX_SIU ||
+                     port->type == PORT_VR41XX_DSIU) && port->dev == dev)
+                        uart_resume_port(&siu_uart_driver, port);
+        }
+
+        return 0;
+}
+
+static struct platform_device *siu_platform_device;
+
+static struct device_driver siu_device_driver = {
+        .name           = "SIU",
+        .bus            = &platform_bus_type,
+        .probe          = siu_probe,
+        .remove         = siu_remove,
+        .suspend        = siu_suspend,
+        .resume         = siu_resume,
+};
+
+static int __devinit vr41xx_siu_init(void)
+{
+        int retval;
+
+        siu_platform_device = platform_device_register_simple("SIU", -1, NULL, 0);
+        if (IS_ERR(siu_platform_device))
+                return PTR_ERR(siu_platform_device);
+
+        retval = driver_register(&siu_device_driver);
+        if (retval < 0)
+                platform_device_unregister(siu_platform_device);
+
+        return retval;
+}
+
+static void __devexit vr41xx_siu_exit(void)
+{
+        driver_unregister(&siu_device_driver);
+
+        platform_device_unregister(siu_platform_device);
+}
+
+module_init(vr41xx_siu_init);
+module_exit(vr41xx_siu_exit);