Patched in Tegra support.

152 files changed, 7077 insertions, 31304 deletions

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 0ecf22b6a38..bd7cc052799 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -1,6 +1,6 @@
 config VT
         bool "Virtual terminal" if EXPERT
-        depends on !S390 && !UML
+        depends on !S390
         select INPUT
         default y
         ---help---
@@ -60,13 +60,9 @@ config VT_CONSOLE
 
           If unsure, say Y.
 
-config VT_CONSOLE_SLEEP
-        def_bool y
-        depends on VT_CONSOLE && PM_SLEEP
-
 config HW_CONSOLE
         bool
-        depends on VT && !UML
+        depends on VT && !S390 && !UML
         default y
 
 config VT_HW_CONSOLE_BINDING
@@ -214,8 +210,8 @@ config CYCLADES
           If you haven't heard about it, it's safe to say N.
 
 config CYZ_INTR
-        bool "Cyclades-Z interrupt mode operation"
-        depends on CYCLADES
+        bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && CYCLADES
         help
           The Cyclades-Z family of multiport cards allows 2 (two) driver op
           modes: polling and interrupt. In polling mode, the driver will check
@@ -285,7 +281,7 @@ config SYNCLINK_GT
 
 config NOZOMI
         tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
-        depends on PCI
+        depends on PCI && EXPERIMENTAL
         help
           If you have a HSDPA driver Broadband Wireless Data Card -
           Globe Trotter PCMCIA card, say Y here.
@@ -294,7 +290,7 @@ config NOZOMI
           will be called nozomi.
 
 config ISI
-        tristate "Multi-Tech multiport card support"
+        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
         depends on SERIAL_NONSTANDARD && PCI
         select FW_LOADER
         help
@@ -317,6 +313,7 @@ config N_HDLC
 
 config N_GSM
         tristate "GSM MUX line discipline support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
         depends on NET
         help
           This line discipline provides support for the GSM MUX protocol and
@@ -353,38 +350,3 @@ config TRACE_SINK
 
           If you select this option, you need to select
           "Trace data router for MIPI P1149.7 cJTAG standard".
-
-config PPC_EPAPR_HV_BYTECHAN
-        tristate "ePAPR hypervisor byte channel driver"
-        depends on PPC
-        select EPAPR_PARAVIRT
-        help
-          This driver creates /dev entries for each ePAPR hypervisor byte
-          channel, thereby allowing applications to communicate with byte
-          channels as if they were serial ports.
-
-config PPC_EARLY_DEBUG_EHV_BC
-        bool "Early console (udbg) support for ePAPR hypervisors"
-        depends on PPC_EPAPR_HV_BYTECHAN=y
-        help
-          Select this option to enable early console (a.k.a. "udbg") support
-          via an ePAPR byte channel.  You also need to choose the byte channel
-          handle below.
-
-config PPC_EARLY_DEBUG_EHV_BC_HANDLE
-        int "Byte channel handle for early console (udbg)"
-        depends on PPC_EARLY_DEBUG_EHV_BC
-        default 0
-        help
-          If you want early console (udbg) output through a byte channel,
-          specify the handle of the byte channel to use.
-
-          For this to work, the byte channel driver must be compiled
-          in-kernel, not as a module.
-
-          Note that only one early console driver can be enabled, so don't
-          enable any others if you enable this one.
-
-          If the number you specify is not a valid byte channel handle, then
-          there simply will be no early console output.  This is true also
-          if you don't boot under a hypervisor at all.
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 2953059530e..ea89b0bd15f 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -26,6 +26,5 @@ obj-$(CONFIG_ROCKETPORT)	+= rocket.o
 obj-$(CONFIG_SYNCLINK_GT)       += synclink_gt.o
 obj-$(CONFIG_SYNCLINKMP)        += synclinkmp.o
 obj-$(CONFIG_SYNCLINK)          += synclink.o
-obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o
 
 obj-y += ipwireless/
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 9d7d00cdfec..220579592c2 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -45,7 +45,7 @@
 
 #if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT)
 #define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \
- tty->name, (info->tport.flags), serial_driver->refcount,info->count,tty->count,s)
+ tty->name, (info->flags), serial_driver->refcount,info->count,tty->count,s)
 #else
 #define DBG_CNT(s)
 #endif
@@ -58,6 +58,7 @@
 
 #include <linux/types.h>
 #include <linux/serial.h>
+#include <linux/serialP.h>
 #include <linux/serial_reg.h>
 static char *serial_version = "4.30";
 
@@ -69,7 +70,6 @@ static char *serial_version = "4.30";
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
-#include <linux/circ_buf.h>
 #include <linux/console.h>
 #include <linux/major.h>
 #include <linux/string.h>
@@ -85,30 +85,13 @@ static char *serial_version = "4.30";
 
 #include <asm/setup.h>
 
+#include <asm/system.h>
 
 #include <asm/irq.h>
 
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
 
-struct serial_state {
-        struct tty_port         tport;
-        struct circ_buf         xmit;
-        struct async_icount     icount;
-
-        unsigned long           port;
-        int                     baud_base;
-        int                     xmit_fifo_size;
-        int                     custom_divisor;
-        int                     read_status_mask;
-        int                     ignore_status_mask;
-        int                     timeout;
-        int                     quot;
-        int                     IER;    /* Interrupt Enable Register */
-        int                     MCR;    /* Modem control register */
-        int                     x_char; /* xon/xoff character */
-};
-
 #define custom amiga_custom
 static char *serial_name = "Amiga-builtin serial driver";
 
@@ -117,10 +100,11 @@ static struct tty_driver *serial_driver;
 /* number of characters left in xmit buffer before we ask for more */
 #define WAKEUP_CHARS 256
 
+static struct async_struct *IRQ_ports;
+
 static unsigned char current_ctl_bits;
 
-static void change_speed(struct tty_struct *tty, struct serial_state *info,
-                struct ktermios *old);
+static void change_speed(struct async_struct *info, struct ktermios *old);
 static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
 
 
@@ -133,7 +117,7 @@ static struct serial_state rs_table[1];
 #define serial_isroot() (capable(CAP_SYS_ADMIN))
 
 
-static inline int serial_paranoia_check(struct serial_state *info,
+static inline int serial_paranoia_check(struct async_struct *info,
                                         char *name, const char *routine)
 {
 #ifdef SERIAL_PARANOIA_CHECK
@@ -186,7 +170,7 @@ static __inline__ void rtsdtr_ctrl(int bits)
  */
 static void rs_stop(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_stop"))
@@ -206,7 +190,7 @@ static void rs_stop(struct tty_struct *tty)
 
 static void rs_start(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_start"))
@@ -247,16 +231,27 @@ static void rs_start(struct tty_struct *tty)
  * -----------------------------------------------------------------------
  */
 
-static void receive_chars(struct serial_state *info)
+/*
+ * This routine is used by the interrupt handler to schedule
+ * processing in the software interrupt portion of the driver.
+ */
+static void rs_sched_event(struct async_struct *info,
+                           int event)
+{
+        info->event |= 1 << event;
+        tasklet_schedule(&info->tlet);
+}
+
+static void receive_chars(struct async_struct *info)
 {
         int status;
         int serdatr;
-        struct tty_struct *tty = info->tport.tty;
+        struct tty_struct *tty = info->tty;
         unsigned char ch, flag;
         struct  async_icount *icount;
         int oe = 0;
 
-        icount = &info->icount;
+        icount = &info->state->icount;
 
         status = UART_LSR_DR; /* We obviously have a character! */
         serdatr = custom.serdatr;
@@ -313,7 +308,7 @@ static void receive_chars(struct serial_state *info)
             printk("handling break....");
 #endif
             flag = TTY_BREAK;
-            if (info->tport.flags & ASYNC_SAK)
+            if (info->flags & ASYNC_SAK)
               do_SAK(tty);
           } else if (status & UART_LSR_PE)
             flag = TTY_PARITY;
@@ -336,20 +331,20 @@ out:
         return;
 }
 
-static void transmit_chars(struct serial_state *info)
+static void transmit_chars(struct async_struct *info)
 {
         custom.intreq = IF_TBE;
         mb();
         if (info->x_char) {
                 custom.serdat = info->x_char | 0x100;
                 mb();
-                info->icount.tx++;
+                info->state->icount.tx++;
                 info->x_char = 0;
                 return;
         }
         if (info->xmit.head == info->xmit.tail
-            || info->tport.tty->stopped
-            || info->tport.tty->hw_stopped) {
+            || info->tty->stopped
+            || info->tty->hw_stopped) {
                 info->IER &= ~UART_IER_THRI;
                 custom.intena = IF_TBE;
                 mb();
@@ -359,12 +354,12 @@ static void transmit_chars(struct serial_state *info)
         custom.serdat = info->xmit.buf[info->xmit.tail++] | 0x100;
         mb();
         info->xmit.tail = info->xmit.tail & (SERIAL_XMIT_SIZE-1);
-        info->icount.tx++;
+        info->state->icount.tx++;
 
         if (CIRC_CNT(info->xmit.head,
                      info->xmit.tail,
                      SERIAL_XMIT_SIZE) < WAKEUP_CHARS)
-                tty_wakeup(info->tport.tty);
+                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
 
 #ifdef SERIAL_DEBUG_INTR
         printk("THRE...");
@@ -376,9 +371,8 @@ static void transmit_chars(struct serial_state *info)
         }
 }
 
-static void check_modem_status(struct serial_state *info)
+static void check_modem_status(struct async_struct *info)
 {
-        struct tty_port *port = &info->tport;
         unsigned char status = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
         unsigned char dstatus;
         struct  async_icount *icount;
@@ -388,52 +382,52 @@ static void check_modem_status(struct serial_state *info)
         current_ctl_bits = status;
 
         if (dstatus) {
-                icount = &info->icount;
+                icount = &info->state->icount;
                 /* update input line counters */
                 if (dstatus & SER_DSR)
                         icount->dsr++;
                 if (dstatus & SER_DCD) {
                         icount->dcd++;
 #ifdef CONFIG_HARD_PPS
-                        if ((port->flags & ASYNC_HARDPPS_CD) &&
+                        if ((info->flags & ASYNC_HARDPPS_CD) &&
                             !(status & SER_DCD))
                                 hardpps();
 #endif
                 }
                 if (dstatus & SER_CTS)
                         icount->cts++;
-                wake_up_interruptible(&port->delta_msr_wait);
+                wake_up_interruptible(&info->delta_msr_wait);
         }
 
-        if ((port->flags & ASYNC_CHECK_CD) && (dstatus & SER_DCD)) {
+        if ((info->flags & ASYNC_CHECK_CD) && (dstatus & SER_DCD)) {
 #if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
                 printk("ttyS%d CD now %s...", info->line,
                        (!(status & SER_DCD)) ? "on" : "off");
 #endif
                 if (!(status & SER_DCD))
-                        wake_up_interruptible(&port->open_wait);
+                        wake_up_interruptible(&info->open_wait);
                 else {
 #ifdef SERIAL_DEBUG_OPEN
                         printk("doing serial hangup...");
 #endif
-                        if (port->tty)
-                                tty_hangup(port->tty);
+                        if (info->tty)
+                                tty_hangup(info->tty);
                 }
         }
-        if (tty_port_cts_enabled(port)) {
-                if (port->tty->hw_stopped) {
+        if (info->flags & ASYNC_CTS_FLOW) {
+                if (info->tty->hw_stopped) {
                         if (!(status & SER_CTS)) {
 #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
                                 printk("CTS tx start...");
 #endif
-                                port->tty->hw_stopped = 0;
+                                info->tty->hw_stopped = 0;
                                 info->IER |= UART_IER_THRI;
                                 custom.intena = IF_SETCLR | IF_TBE;
                                 mb();
                                 /* set a pending Tx Interrupt, transmitter should restart now */
                                 custom.intreq = IF_SETCLR | IF_TBE;
                                 mb();
-                                tty_wakeup(port->tty);
+                                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
                                 return;
                         }
                 } else {
@@ -441,7 +435,7 @@ static void check_modem_status(struct serial_state *info)
 #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
                                 printk("CTS tx stop...");
 #endif
-                                port->tty->hw_stopped = 1;
+                                info->tty->hw_stopped = 1;
                                 info->IER &= ~UART_IER_THRI;
                                 /* disable Tx interrupt and remove any pending interrupts */
                                 custom.intena = IF_TBE;
@@ -456,7 +450,7 @@ static void check_modem_status(struct serial_state *info)
 static irqreturn_t ser_vbl_int( int irq, void *data)
 {
         /* vbl is just a periodic interrupt we tie into to update modem status */
-        struct serial_state *info = data;
+        struct async_struct * info = IRQ_ports;
         /*
          * TBD - is it better to unregister from this interrupt or to
          * ignore it if MSI is clear ?
@@ -468,16 +462,18 @@ static irqreturn_t ser_vbl_int( int irq, void *data)
 
 static irqreturn_t ser_rx_int(int irq, void *dev_id)
 {
-        struct serial_state *info = dev_id;
+        struct async_struct * info;
 
 #ifdef SERIAL_DEBUG_INTR
         printk("ser_rx_int...");
 #endif
 
-        if (!info->tport.tty)
+        info = IRQ_ports;
+        if (!info || !info->tty)
                 return IRQ_NONE;
 
         receive_chars(info);
+        info->last_active = jiffies;
 #ifdef SERIAL_DEBUG_INTR
         printk("end.\n");
 #endif
@@ -486,17 +482,19 @@ static irqreturn_t ser_rx_int(int irq, void *dev_id)
 
 static irqreturn_t ser_tx_int(int irq, void *dev_id)
 {
-        struct serial_state *info = dev_id;
+        struct async_struct * info;
 
         if (custom.serdatr & SDR_TBE) {
 #ifdef SERIAL_DEBUG_INTR
           printk("ser_tx_int...");
 #endif
 
-          if (!info->tport.tty)
+          info = IRQ_ports;
+          if (!info || !info->tty)
                 return IRQ_NONE;
 
           transmit_chars(info);
+          info->last_active = jiffies;
 #ifdef SERIAL_DEBUG_INTR
           printk("end.\n");
 #endif
@@ -511,6 +509,29 @@ static irqreturn_t ser_tx_int(int irq, void *dev_id)
  */
 
 /*
+ * 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(unsigned long private_)
+{
+        struct async_struct     *info = (struct async_struct *) 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);
+}
+
+/*
  * ---------------------------------------------------------------
  * Low level utility subroutines for the serial driver:  routines to
  * figure out the appropriate timeout for an interrupt chain, routines
@@ -519,9 +540,8 @@ static irqreturn_t ser_tx_int(int irq, void *dev_id)
  * ---------------------------------------------------------------
  */
 
-static int startup(struct tty_struct *tty, struct serial_state *info)
+static int startup(struct async_struct * info)
 {
-        struct tty_port *port = &info->tport;
         unsigned long flags;
         int     retval=0;
         unsigned long page;
@@ -532,7 +552,7 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
 
         local_irq_save(flags);
 
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (info->flags & ASYNC_INITIALIZED) {
                 free_page(page);
                 goto errout;
         }
@@ -554,7 +574,9 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
         retval = request_irq(IRQ_AMIGA_VERTB, ser_vbl_int, 0, "serial status", info);
         if (retval) {
           if (serial_isroot()) {
-              set_bit(TTY_IO_ERROR, &tty->flags);
+            if (info->tty)
+              set_bit(TTY_IO_ERROR,
+                      &info->tty->flags);
             retval = 0;
           }
           goto errout;
@@ -568,32 +590,37 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
         /* remember current state of the DCD and CTS bits */
         current_ctl_bits = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
 
+        IRQ_ports = info;
+
         info->MCR = 0;
-        if (C_BAUD(tty))
+        if (info->tty->termios->c_cflag & CBAUD)
           info->MCR = SER_DTR | SER_RTS;
         rtsdtr_ctrl(info->MCR);
 
-        clear_bit(TTY_IO_ERROR, &tty->flags);
+        if (info->tty)
+                clear_bit(TTY_IO_ERROR, &info->tty->flags);
         info->xmit.head = info->xmit.tail = 0;
 
         /*
          * Set up the tty->alt_speed kludge
          */
-        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                tty->alt_speed = 57600;
-        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                tty->alt_speed = 115200;
-        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                tty->alt_speed = 230400;
-        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                tty->alt_speed = 460800;
+        if (info->tty) {
+                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;
+        }
 
         /*
          * and set the speed of the serial port
          */
-        change_speed(tty, info, NULL);
+        change_speed(info, NULL);
 
-        port->flags |= ASYNC_INITIALIZED;
+        info->flags |= ASYNC_INITIALIZED;
         local_irq_restore(flags);
         return 0;
 
@@ -606,15 +633,15 @@ errout:
  * 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 tty_struct *tty, struct serial_state *info)
+static void shutdown(struct async_struct * info)
 {
         unsigned long   flags;
         struct serial_state *state;
 
-        if (!(info->tport.flags & ASYNC_INITIALIZED))
+        if (!(info->flags & ASYNC_INITIALIZED))
                 return;
 
-        state = info;
+        state = info->state;
 
 #ifdef SERIAL_DEBUG_OPEN
         printk("Shutting down serial port %d ....\n", info->line);
@@ -626,7 +653,9 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info)
          * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
          * here so the queue might never be waken up
          */
-        wake_up_interruptible(&info->tport.delta_msr_wait);
+        wake_up_interruptible(&info->delta_msr_wait);
+
+        IRQ_ports = NULL;
 
         /*
          * Free the IRQ, if necessary
@@ -646,13 +675,14 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info)
         custom.adkcon = AC_UARTBRK;
         mb();
 
-        if (tty->termios.c_cflag & HUPCL)
+        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
                 info->MCR &= ~(SER_DTR|SER_RTS);
         rtsdtr_ctrl(info->MCR);
 
-        set_bit(TTY_IO_ERROR, &tty->flags);
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
 
-        info->tport.flags &= ~ASYNC_INITIALIZED;
+        info->flags &= ~ASYNC_INITIALIZED;
         local_irq_restore(flags);
 }
 
@@ -661,16 +691,17 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info)
  * 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 tty_struct *tty, struct serial_state *info,
+static void change_speed(struct async_struct *info,
                          struct ktermios *old_termios)
 {
-        struct tty_port *port = &info->tport;
         int     quot = 0, baud_base, baud;
         unsigned cflag, cval = 0;
         int     bits;
         unsigned long   flags;
 
-        cflag = tty->termios.c_cflag;
+        if (!info->tty || !info->tty->termios)
+                return;
+        cflag = info->tty->termios->c_cflag;
 
         /* Byte size is always 8 bits plus parity bit if requested */
 
@@ -691,12 +722,13 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
 #endif
 
         /* Determine divisor based on baud rate */
-        baud = tty_get_baud_rate(tty);
+        baud = tty_get_baud_rate(info->tty);
         if (!baud)
                 baud = 9600;    /* B0 transition handled in rs_set_termios */
-        baud_base = info->baud_base;
-        if (baud == 38400 && (port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                quot = info->custom_divisor;
+        baud_base = info->state->baud_base;
+        if (baud == 38400 &&
+            ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
+                quot = info->state->custom_divisor;
         else {
                 if (baud == 134)
                         /* Special case since 134 is really 134.5 */
@@ -707,14 +739,14 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
         /* If the quotient is zero refuse the change */
         if (!quot && old_termios) {
                 /* FIXME: Will need updating for new tty in the end */
-                tty->termios.c_cflag &= ~CBAUD;
-                tty->termios.c_cflag |= (old_termios->c_cflag & CBAUD);
-                baud = tty_get_baud_rate(tty);
+                info->tty->termios->c_cflag &= ~CBAUD;
+                info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD);
+                baud = tty_get_baud_rate(info->tty);
                 if (!baud)
                         baud = 9600;
                 if (baud == 38400 &&
-                    (port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                        quot = info->custom_divisor;
+                    ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
+                        quot = info->state->custom_divisor;
                 else {
                         if (baud == 134)
                                 /* Special case since 134 is really 134.5 */
@@ -732,17 +764,17 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
 
         /* CTS flow control flag and modem status interrupts */
         info->IER &= ~UART_IER_MSI;
-        if (port->flags & ASYNC_HARDPPS_CD)
+        if (info->flags & ASYNC_HARDPPS_CD)
                 info->IER |= UART_IER_MSI;
         if (cflag & CRTSCTS) {
-                port->flags |= ASYNC_CTS_FLOW;
+                info->flags |= ASYNC_CTS_FLOW;
                 info->IER |= UART_IER_MSI;
         } else
-                port->flags &= ~ASYNC_CTS_FLOW;
+                info->flags &= ~ASYNC_CTS_FLOW;
         if (cflag & CLOCAL)
-                port->flags &= ~ASYNC_CHECK_CD;
+                info->flags &= ~ASYNC_CHECK_CD;
         else {
-                port->flags |= ASYNC_CHECK_CD;
+                info->flags |= ASYNC_CHECK_CD;
                 info->IER |= UART_IER_MSI;
         }
         /* TBD:
@@ -754,24 +786,24 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
          */
 
         info->read_status_mask = UART_LSR_OE | UART_LSR_DR;
-        if (I_INPCK(tty))
+        if (I_INPCK(info->tty))
                 info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(tty) || I_PARMRK(tty))
+        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
                 info->read_status_mask |= UART_LSR_BI;
 
         /*
          * Characters to ignore
          */
         info->ignore_status_mask = 0;
-        if (I_IGNPAR(tty))
+        if (I_IGNPAR(info->tty))
                 info->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
-        if (I_IGNBRK(tty)) {
+        if (I_IGNBRK(info->tty)) {
                 info->ignore_status_mask |= UART_LSR_BI;
                 /*
                  * If we're ignore parity and break indicators, ignore 
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(tty))
+                if (I_IGNPAR(info->tty))
                         info->ignore_status_mask |= UART_LSR_OE;
         }
         /*
@@ -796,12 +828,13 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info,
         mb();
         }
 
+        info->LCR = cval;                               /* Save LCR */
         local_irq_restore(flags);
 }
 
 static int rs_put_char(struct tty_struct *tty, unsigned char ch)
 {
-        struct serial_state *info;
+        struct async_struct *info;
         unsigned long flags;
 
         info = tty->driver_data;
@@ -828,7 +861,7 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch)
 
 static void rs_flush_chars(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))
@@ -853,9 +886,11 @@ static void rs_flush_chars(struct tty_struct *tty)
 static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count)
 {
         int     c, ret = 0;
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info;
         unsigned long flags;
 
+        info = tty->driver_data;
+
         if (serial_paranoia_check(info, tty->name, "rs_write"))
                 return 0;
 
@@ -899,7 +934,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count
 
 static int rs_write_room(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
 
         if (serial_paranoia_check(info, tty->name, "rs_write_room"))
                 return 0;
@@ -908,7 +943,7 @@ static int rs_write_room(struct tty_struct *tty)
 
 static int rs_chars_in_buffer(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
 
         if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
                 return 0;
@@ -917,7 +952,7 @@ static int rs_chars_in_buffer(struct tty_struct *tty)
 
 static void rs_flush_buffer(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
@@ -934,7 +969,7 @@ static void rs_flush_buffer(struct tty_struct *tty)
  */
 static void rs_send_xchar(struct tty_struct *tty, char ch)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_send_char"))
@@ -969,7 +1004,7 @@ static void rs_send_xchar(struct tty_struct *tty, char ch)
  */
 static void rs_throttle(struct tty_struct * tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 #ifdef SERIAL_DEBUG_THROTTLE
         char    buf[64];
@@ -984,7 +1019,7 @@ static void rs_throttle(struct tty_struct * tty)
         if (I_IXOFF(tty))
                 rs_send_xchar(tty, STOP_CHAR(tty));
 
-        if (tty->termios.c_cflag & CRTSCTS)
+        if (tty->termios->c_cflag & CRTSCTS)
                 info->MCR &= ~SER_RTS;
 
         local_irq_save(flags);
@@ -994,7 +1029,7 @@ static void rs_throttle(struct tty_struct * tty)
 
 static void rs_unthrottle(struct tty_struct * tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
 #ifdef SERIAL_DEBUG_THROTTLE
         char    buf[64];
@@ -1012,7 +1047,7 @@ static void rs_unthrottle(struct tty_struct * tty)
                 else
                         rs_send_xchar(tty, START_CHAR(tty));
         }
-        if (tty->termios.c_cflag & CRTSCTS)
+        if (tty->termios->c_cflag & CRTSCTS)
                 info->MCR |= SER_RTS;
         local_irq_save(flags);
         rtsdtr_ctrl(info->MCR);
@@ -1025,66 +1060,71 @@ static void rs_unthrottle(struct tty_struct * tty)
  * ------------------------------------------------------------
  */
 
-static int get_serial_info(struct tty_struct *tty, struct serial_state *state,
+static int get_serial_info(struct async_struct * info,
                            struct serial_struct __user * retinfo)
 {
         struct serial_struct tmp;
+        struct serial_state *state = info->state;
    
         if (!retinfo)
                 return -EFAULT;
         memset(&tmp, 0, sizeof(tmp));
-        tty_lock(tty);
-        tmp.line = tty->index;
+        tty_lock();
+        tmp.type = state->type;
+        tmp.line = state->line;
         tmp.port = state->port;
-        tmp.flags = state->tport.flags;
+        tmp.irq = state->irq;
+        tmp.flags = state->flags;
         tmp.xmit_fifo_size = state->xmit_fifo_size;
         tmp.baud_base = state->baud_base;
-        tmp.close_delay = state->tport.close_delay;
-        tmp.closing_wait = state->tport.closing_wait;
+        tmp.close_delay = state->close_delay;
+        tmp.closing_wait = state->closing_wait;
         tmp.custom_divisor = state->custom_divisor;
-        tty_unlock(tty);
+        tty_unlock();
         if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
                 return -EFAULT;
         return 0;
 }
 
-static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
+static int set_serial_info(struct async_struct * info,
                            struct serial_struct __user * new_info)
 {
-        struct tty_port *port = &state->tport;
         struct serial_struct new_serial;
-        bool change_spd;
+        struct serial_state old_state, *state;
+        unsigned int            change_irq,change_port;
         int                     retval = 0;
 
         if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
                 return -EFAULT;
 
-        tty_lock(tty);
-        change_spd = ((new_serial.flags ^ port->flags) & ASYNC_SPD_MASK) ||
-                new_serial.custom_divisor != state->custom_divisor;
-        if (new_serial.irq || new_serial.port != state->port ||
-                        new_serial.xmit_fifo_size != state->xmit_fifo_size) {
-                tty_unlock(tty);
-                return -EINVAL;
+        tty_lock();
+        state = info->state;
+        old_state = *state;
+  
+        change_irq = new_serial.irq != state->irq;
+        change_port = (new_serial.port != state->port);
+        if(change_irq || change_port || (new_serial.xmit_fifo_size != state->xmit_fifo_size)) {
+          tty_unlock();
+          return -EINVAL;
         }
   
         if (!serial_isroot()) {
                 if ((new_serial.baud_base != state->baud_base) ||
-                    (new_serial.close_delay != port->close_delay) ||
+                    (new_serial.close_delay != state->close_delay) ||
                     (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
                     ((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (port->flags & ~ASYNC_USR_MASK))) {
-                        tty_unlock(tty);
+                     (state->flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
-                }
-                port->flags = ((port->flags & ~ASYNC_USR_MASK) |
+                state->flags = ((state->flags & ~ASYNC_USR_MASK) |
+                               (new_serial.flags & ASYNC_USR_MASK));
+                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
                                (new_serial.flags & ASYNC_USR_MASK));
                 state->custom_divisor = new_serial.custom_divisor;
                 goto check_and_exit;
         }
 
         if (new_serial.baud_base < 9600) {
-                tty_unlock(tty);
+                tty_unlock();
                 return -EINVAL;
         }
 
@@ -1094,29 +1134,33 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
          */
 
         state->baud_base = new_serial.baud_base;
-        port->flags = ((port->flags & ~ASYNC_FLAGS) |
+        state->flags = ((state->flags & ~ASYNC_FLAGS) |
                         (new_serial.flags & ASYNC_FLAGS));
+        info->flags = ((state->flags & ~ASYNC_INTERNAL_FLAGS) |
+                       (info->flags & ASYNC_INTERNAL_FLAGS));
         state->custom_divisor = new_serial.custom_divisor;
-        port->close_delay = new_serial.close_delay * HZ/100;
-        port->closing_wait = new_serial.closing_wait * HZ/100;
-        tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        state->close_delay = new_serial.close_delay * HZ/100;
+        state->closing_wait = new_serial.closing_wait * HZ/100;
+        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
 check_and_exit:
-        if (port->flags & ASYNC_INITIALIZED) {
-                if (change_spd) {
-                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                                tty->alt_speed = 57600;
-                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                                tty->alt_speed = 115200;
-                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                                tty->alt_speed = 230400;
-                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                                tty->alt_speed = 460800;
-                        change_speed(tty, state, NULL);
+        if (info->flags & ASYNC_INITIALIZED) {
+                if (((old_state.flags & ASYNC_SPD_MASK) !=
+                     (state->flags & ASYNC_SPD_MASK)) ||
+                    (old_state.custom_divisor != state->custom_divisor)) {
+                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                                info->tty->alt_speed = 57600;
+                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                                info->tty->alt_speed = 115200;
+                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                                info->tty->alt_speed = 230400;
+                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                                info->tty->alt_speed = 460800;
+                        change_speed(info, NULL);
                 }
         } else
-                retval = startup(tty, state);
-        tty_unlock(tty);
+                retval = startup(info);
+        tty_unlock();
         return retval;
 }
 
@@ -1131,7 +1175,7 @@ check_and_exit:
  *          transmit holding register is empty.  This functionality
  *          allows an RS485 driver to be written in user space. 
  */
-static int get_lsr_info(struct serial_state *info, unsigned int __user *value)
+static int get_lsr_info(struct async_struct * info, unsigned int __user *value)
 {
         unsigned char status;
         unsigned int result;
@@ -1150,7 +1194,7 @@ static int get_lsr_info(struct serial_state *info, unsigned int __user *value)
 
 static int rs_tiocmget(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct * info = tty->driver_data;
         unsigned char control, status;
         unsigned long flags;
 
@@ -1173,7 +1217,7 @@ static int rs_tiocmget(struct tty_struct *tty)
 static int rs_tiocmset(struct tty_struct *tty, unsigned int set,
                                                 unsigned int clear)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct * info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
@@ -1200,7 +1244,7 @@ static int rs_tiocmset(struct tty_struct *tty, unsigned int set,
  */
 static int rs_break(struct tty_struct *tty, int break_state)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct * info = tty->driver_data;
         unsigned long flags;
 
         if (serial_paranoia_check(info, tty->name, "rs_break"))
@@ -1225,12 +1269,12 @@ static int rs_break(struct tty_struct *tty, int break_state)
 static int rs_get_icount(struct tty_struct *tty,
                                 struct serial_icounter_struct *icount)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         struct async_icount cnow;
         unsigned long flags;
 
         local_irq_save(flags);
-        cnow = info->icount;
+        cnow = info->state->icount;
         local_irq_restore(flags);
         icount->cts = cnow.cts;
         icount->dsr = cnow.dsr;
@@ -1250,7 +1294,7 @@ static int rs_get_icount(struct tty_struct *tty,
 static int rs_ioctl(struct tty_struct *tty,
                     unsigned int cmd, unsigned long arg)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct * info = tty->driver_data;
         struct async_icount cprev, cnow;        /* kernel counter temps */
         void __user *argp = (void __user *)arg;
         unsigned long flags;
@@ -1267,9 +1311,9 @@ static int rs_ioctl(struct tty_struct *tty,
 
         switch (cmd) {
                 case TIOCGSERIAL:
-                        return get_serial_info(tty, info, argp);
+                        return get_serial_info(info, argp);
                 case TIOCSSERIAL:
-                        return set_serial_info(tty, info, argp);
+                        return set_serial_info(info, argp);
                 case TIOCSERCONFIG:
                         return 0;
 
@@ -1278,7 +1322,7 @@ static int rs_ioctl(struct tty_struct *tty,
 
                 case TIOCSERGSTRUCT:
                         if (copy_to_user(argp,
-                                         info, sizeof(struct serial_state)))
+                                         info, sizeof(struct async_struct)))
                                 return -EFAULT;
                         return 0;
 
@@ -1291,15 +1335,15 @@ static int rs_ioctl(struct tty_struct *tty,
                 case TIOCMIWAIT:
                         local_irq_save(flags);
                         /* note the counters on entry */
-                        cprev = info->icount;
+                        cprev = info->state->icount;
                         local_irq_restore(flags);
                         while (1) {
-                                interruptible_sleep_on(&info->tport.delta_msr_wait);
+                                interruptible_sleep_on(&info->delta_msr_wait);
                                 /* see if a signal did it */
                                 if (signal_pending(current))
                                         return -ERESTARTSYS;
                                 local_irq_save(flags);
-                                cnow = info->icount; /* atomic copy */
+                                cnow = info->state->icount; /* atomic copy */
                                 local_irq_restore(flags);
                                 if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && 
                                     cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
@@ -1328,11 +1372,11 @@ static int rs_ioctl(struct tty_struct *tty,
 
 static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct *info = tty->driver_data;
         unsigned long flags;
-        unsigned int cflag = tty->termios.c_cflag;
+        unsigned int cflag = tty->termios->c_cflag;
 
-        change_speed(tty, info, old_termios);
+        change_speed(info, old_termios);
 
         /* Handle transition to B0 status */
         if ((old_termios->c_cflag & CBAUD) &&
@@ -1347,7 +1391,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
         if (!(old_termios->c_cflag & CBAUD) &&
             (cflag & CBAUD)) {
                 info->MCR |= SER_DTR;
-                if (!(tty->termios.c_cflag & CRTSCTS) || 
+                if (!(tty->termios->c_cflag & CRTSCTS) || 
                     !test_bit(TTY_THROTTLED, &tty->flags)) {
                         info->MCR |= SER_RTS;
                 }
@@ -1358,7 +1402,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle turning off CRTSCTS */
         if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
+            !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 rs_start(tty);
         }
@@ -1371,7 +1415,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
          * or not.  Hence, this may change.....
          */
         if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios.c_cflag & CLOCAL))
+            (tty->termios->c_cflag & CLOCAL))
                 wake_up_interruptible(&info->open_wait);
 #endif
 }
@@ -1388,23 +1432,64 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
  */
 static void rs_close(struct tty_struct *tty, struct file * filp)
 {
-        struct serial_state *state = tty->driver_data;
-        struct tty_port *port = &state->tport;
+        struct async_struct * info = tty->driver_data;
+        struct serial_state *state;
+        unsigned long flags;
 
-        if (serial_paranoia_check(state, tty->name, "rs_close"))
+        if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
                 return;
 
-        if (tty_port_close_start(port, tty, filp) == 0)
+        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.
          */
-        state->read_status_mask &= ~UART_LSR_DR;
-        if (port->flags & ASYNC_INITIALIZED) {
+        info->read_status_mask &= ~UART_LSR_DR;
+        if (info->flags & ASYNC_INITIALIZED) {
                 /* disable receive interrupts */
                 custom.intena = IF_RBF;
                 mb();
@@ -1417,15 +1502,24 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
                  * has completely drained; this is especially
                  * important if there is a transmit FIFO!
                  */
-                rs_wait_until_sent(tty, state->timeout);
+                rs_wait_until_sent(tty, info->timeout);
         }
-        shutdown(tty, state);
+        shutdown(info);
         rs_flush_buffer(tty);
                 
         tty_ldisc_flush(tty);
-        port->tty = NULL;
-
-        tty_port_close_end(port, tty);
+        tty->closing = 0;
+        info->event = 0;
+        info->tty = NULL;
+        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);
 }
 
 /*
@@ -1433,8 +1527,9 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
  */
 static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct * info = tty->driver_data;
         unsigned long orig_jiffies, char_time;
+        int tty_was_locked = tty_locked();
         int lsr;
 
         if (serial_paranoia_check(info, tty->name, "rs_wait_until_sent"))
@@ -1446,6 +1541,12 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
         orig_jiffies = jiffies;
 
         /*
+         * tty_wait_until_sent is called from lots of places,
+         * with or without the BTM.
+         */
+        if (!tty_was_locked)
+                tty_lock();
+        /*
          * 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.
@@ -1485,7 +1586,8 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
                         break;
         }
         __set_current_state(TASK_RUNNING);
-
+        if (!tty_was_locked)
+                tty_unlock();
 #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
         printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
 #endif
@@ -1496,17 +1598,173 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
  */
 static void rs_hangup(struct tty_struct *tty)
 {
-        struct serial_state *info = tty->driver_data;
+        struct async_struct * info = tty->driver_data;
+        struct serial_state *state = info->state;
 
         if (serial_paranoia_check(info, tty->name, "rs_hangup"))
                 return;
 
+        state = info->state;
+
         rs_flush_buffer(tty);
-        shutdown(tty, info);
-        info->tport.count = 0;
-        info->tport.flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tport.tty = NULL;
-        wake_up_interruptible(&info->tport.open_wait);
+        shutdown(info);
+        info->event = 0;
+        state->count = 0;
+        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->tty = NULL;
+        wake_up_interruptible(&info->open_wait);
+}
+
+/*
+ * ------------------------------------------------------------
+ * rs_open() and friends
+ * ------------------------------------------------------------
+ */
+static int block_til_ready(struct tty_struct *tty, struct file * filp,
+                           struct async_struct *info)
+{
+#ifdef DECLARE_WAITQUEUE
+        DECLARE_WAITQUEUE(wait, current);
+#else
+        struct wait_queue wait = { current, NULL };
+#endif
+        struct serial_state *state = info->state;
+        int             retval;
+        int             do_clocal = 0, extra_count = 0;
+        unsigned long   flags;
+
+        /*
+         * 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
+                return ((info->flags & ASYNC_HUP_NOTIFY) ?
+                        -EAGAIN : -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, 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;
+        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_save(flags);
+        if (!tty_hung_up_p(filp)) {
+                extra_count = 1;
+                state->count--;
+        }
+        local_irq_restore(flags);
+        info->blocked_open++;
+        while (1) {
+                local_irq_save(flags);
+                if (tty->termios->c_cflag & CBAUD)
+                        rtsdtr_ctrl(SER_DTR|SER_RTS);
+                local_irq_restore(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 || (!(ciab.pra & SER_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
+                tty_unlock();
+                schedule();
+                tty_lock();
+        }
+        __set_current_state(TASK_RUNNING);
+        remove_wait_queue(&info->open_wait, &wait);
+        if (extra_count)
+                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
+        if (retval)
+                return retval;
+        info->flags |= ASYNC_NORMAL_ACTIVE;
+        return 0;
+}
+
+static int get_async_struct(int line, struct async_struct **ret_info)
+{
+        struct async_struct *info;
+        struct serial_state *sstate;
+
+        sstate = rs_table + line;
+        sstate->count++;
+        if (sstate->info) {
+                *ret_info = sstate->info;
+                return 0;
+        }
+        info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);
+        if (!info) {
+                sstate->count--;
+                return -ENOMEM;
+        }
+#ifdef DECLARE_WAITQUEUE
+        init_waitqueue_head(&info->open_wait);
+        init_waitqueue_head(&info->close_wait);
+        init_waitqueue_head(&info->delta_msr_wait);
+#endif
+        info->magic = SERIAL_MAGIC;
+        info->port = sstate->port;
+        info->flags = sstate->flags;
+        info->xmit_fifo_size = sstate->xmit_fifo_size;
+        info->line = line;
+        tasklet_init(&info->tlet, do_softint, (unsigned long)info);
+        info->state = sstate;
+        if (sstate->info) {
+                kfree(info);
+                *ret_info = sstate->info;
+                return 0;
+        }
+        *ret_info = sstate->info = info;
+        return 0;
 }
 
 /*
@@ -1517,42 +1775,91 @@ static void rs_hangup(struct tty_struct *tty)
  */
 static int rs_open(struct tty_struct *tty, struct file * filp)
 {
-        struct serial_state *info = rs_table + tty->index;
-        struct tty_port *port = &info->tport;
-        int retval;
+        struct async_struct     *info;
+        int                     retval, line;
 
-        port->count++;
-        port->tty = tty;
+        line = tty->index;
+        if ((line < 0) || (line >= NR_PORTS)) {
+                return -ENODEV;
+        }
+        retval = get_async_struct(line, &info);
+        if (retval) {
+                return retval;
+        }
         tty->driver_data = info;
-        tty->port = port;
+        info->tty = tty;
         if (serial_paranoia_check(info, tty->name, "rs_open"))
                 return -ENODEV;
 
-        tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+#ifdef SERIAL_DEBUG_OPEN
+        printk("rs_open %s, count = %d\n", tty->name, info->state->count);
+#endif
+        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+
+        /*
+         * If the port is 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 serial port
+         */
+        retval = startup(info);
+        if (retval) {
+                return retval;
+        }
 
-        retval = startup(tty, info);
+        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;
         }
 
-        return tty_port_block_til_ready(port, tty, filp);
+#ifdef SERIAL_DEBUG_OPEN
+        printk("rs_open %s successful...", tty->name);
+#endif
+        return 0;
 }
 
 /*
  * /proc fs routines....
  */
 
-static inline void line_info(struct seq_file *m, int line,
-                struct serial_state *state)
+static inline void line_info(struct seq_file *m, struct serial_state *state)
 {
+        struct async_struct *info = state->info, scr_info;
         char    stat_buf[30], control, status;
         unsigned long flags;
 
-        seq_printf(m, "%d: uart:amiga_builtin", line);
+        seq_printf(m, "%d: uart:amiga_builtin",state->line);
+
+        /*
+         * Figure out the current RS-232 lines
+         */
+        if (!info) {
+                info = &scr_info;       /* This is just for serial_{in,out} */
 
+                info->magic = SERIAL_MAGIC;
+                info->flags = state->flags;
+                info->quot = 0;
+                info->tty = NULL;
+        }
         local_irq_save(flags);
         status = ciab.pra;
-        control = (state->tport.flags & ASYNC_INITIALIZED) ? state->MCR : status;
+        control = info ? info->MCR : status;
         local_irq_restore(flags);
 
         stat_buf[0] = 0;
@@ -1568,8 +1875,9 @@ static inline void line_info(struct seq_file *m, int line,
         if(!(status & SER_DCD))
                 strcat(stat_buf, "|CD");
 
-        if (state->quot)
-                seq_printf(m, " baud:%d", state->baud_base / state->quot);
+        if (info->quot) {
+                seq_printf(m, " baud:%d", state->baud_base / info->quot);
+        }
 
         seq_printf(m, " tx:%d rx:%d", state->icount.tx, state->icount.rx);
 
@@ -1594,7 +1902,7 @@ static inline void line_info(struct seq_file *m, int line,
 static int rs_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version);
-        line_info(m, 0, &rs_table[0]);
+        line_info(m, &rs_table[0]);
         return 0;
 }
 
@@ -1655,32 +1963,6 @@ static const struct tty_operations serial_ops = {
         .proc_fops = &rs_proc_fops,
 };
 
-static int amiga_carrier_raised(struct tty_port *port)
-{
-        return !(ciab.pra & SER_DCD);
-}
-
-static void amiga_dtr_rts(struct tty_port *port, int raise)
-{
-        struct serial_state *info = container_of(port, struct serial_state,
-                        tport);
-        unsigned long flags;
-
-        if (raise)
-                info->MCR |= SER_DTR|SER_RTS;
-        else
-                info->MCR &= ~(SER_DTR|SER_RTS);
-
-        local_irq_save(flags);
-        rtsdtr_ctrl(info->MCR);
-        local_irq_restore(flags);
-}
-
-static const struct tty_port_operations amiga_port_ops = {
-        .carrier_raised = amiga_carrier_raised,
-        .dtr_rts = amiga_dtr_rts,
-};
-
 /*
  * The serial driver boot-time initialization code!
  */
@@ -1690,14 +1972,17 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
         struct serial_state * state;
         int error;
 
-        serial_driver = alloc_tty_driver(NR_PORTS);
+        serial_driver = alloc_tty_driver(1);
         if (!serial_driver)
                 return -ENOMEM;
 
+        IRQ_ports = NULL;
+
         show_serial_version();
 
         /* Initialize the tty_driver structure */
 
+        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "amiserial";
         serial_driver->name = "ttyS";
         serial_driver->major = TTY_MAJOR;
@@ -1710,23 +1995,25 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
         serial_driver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(serial_driver, &serial_ops);
 
+        error = tty_register_driver(serial_driver);
+        if (error)
+                goto fail_put_tty_driver;
+
         state = rs_table;
+        state->magic = SSTATE_MAGIC;
         state->port = (int)&custom.serdatr; /* Just to give it a value */
+        state->line = 0;
         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;
-        tty_port_init(&state->tport);
-        state->tport.ops = &amiga_port_ops;
-        tty_port_link_device(&state->tport, serial_driver, 0);
-
-        error = tty_register_driver(serial_driver);
-        if (error)
-                goto fail_put_tty_driver;
 
-        printk(KERN_INFO "ttyS0 is the amiga builtin serial port\n");
+        printk(KERN_INFO "ttyS%d is the amiga builtin serial port\n",
+                       state->line);
 
         /* Hardware set up */
 
@@ -1738,7 +2025,7 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
         if (error)
                 goto fail_unregister;
 
-        error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, 0,
+        error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, IRQF_DISABLED,
                             "serial RX", state);
         if (error)
                 goto fail_free_irq;
@@ -1771,7 +2058,6 @@ fail_free_irq:
 fail_unregister:
         tty_unregister_driver(serial_driver);
 fail_put_tty_driver:
-        tty_port_destroy(&state->tport);
         put_tty_driver(serial_driver);
         return error;
 }
@@ -1780,16 +2066,20 @@ static int __exit amiga_serial_remove(struct platform_device *pdev)
 {
         int error;
         struct serial_state *state = platform_get_drvdata(pdev);
+        struct async_struct *info = state->info;
 
         /* printk("Unloading %s: version %s\n", serial_name, serial_version); */
+        tasklet_kill(&info->tlet);
         if ((error = tty_unregister_driver(serial_driver)))
                 printk("SERIAL: failed to unregister serial driver (%d)\n",
                        error);
         put_tty_driver(serial_driver);
-        tty_port_destroy(&state->tport);
 
-        free_irq(IRQ_AMIGA_TBE, state);
-        free_irq(IRQ_AMIGA_RBF, state);
+        rs_table[0].info = NULL;
+        kfree(info);
+
+        free_irq(IRQ_AMIGA_TBE, rs_table);
+        free_irq(IRQ_AMIGA_RBF, rs_table);
 
         platform_set_drvdata(pdev, NULL);
 
diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 1cfcdbf1d0c..3a997760ec3 100644
--- a/drivers/tty/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
@@ -62,7 +62,9 @@ static inline uint32_t bfin_write_emudat_chars(char a, char b, char c, char d)
 
 static struct tty_driver *bfin_jc_driver;
 static struct task_struct *bfin_jc_kthread;
-static struct tty_port port;
+static struct tty_struct * volatile bfin_jc_tty;
+static unsigned long bfin_jc_count;
+static DEFINE_MUTEX(bfin_jc_tty_mutex);
 static volatile struct circ_buf bfin_jc_write_buf;
 
 static int
@@ -71,21 +73,18 @@ bfin_jc_emudat_manager(void *arg)
         uint32_t inbound_len = 0, outbound_len = 0;
 
         while (!kthread_should_stop()) {
-                struct tty_struct *tty = tty_port_tty_get(&port);
                 /* no one left to give data to, so sleep */
-                if (tty == NULL && circ_empty(&bfin_jc_write_buf)) {
+                if (bfin_jc_tty == NULL && circ_empty(&bfin_jc_write_buf)) {
                         pr_debug("waiting for readers\n");
                         __set_current_state(TASK_UNINTERRUPTIBLE);
                         schedule();
                         __set_current_state(TASK_RUNNING);
-                        continue;
                 }
 
                 /* no data available, so just chill */
                 if (!(bfin_read_DBGSTAT() & EMUDIF) && circ_empty(&bfin_jc_write_buf)) {
                         pr_debug("waiting for data (in_len = %i) (circ: %i %i)\n",
                                 inbound_len, bfin_jc_write_buf.tail, bfin_jc_write_buf.head);
-                        tty_kref_put(tty);
                         if (inbound_len)
                                 schedule();
                         else
@@ -95,6 +94,9 @@ bfin_jc_emudat_manager(void *arg)
 
                 /* if incoming data is ready, eat it */
                 if (bfin_read_DBGSTAT() & EMUDIF) {
+                        struct tty_struct *tty;
+                        mutex_lock(&bfin_jc_tty_mutex);
+                        tty = (struct tty_struct *)bfin_jc_tty;
                         if (tty != NULL) {
                                 uint32_t emudat = bfin_read_emudat();
                                 if (inbound_len == 0) {
@@ -108,6 +110,7 @@ bfin_jc_emudat_manager(void *arg)
                                         tty_flip_buffer_push(tty);
                                 }
                         }
+                        mutex_unlock(&bfin_jc_tty_mutex);
                 }
 
                 /* if outgoing data is ready, post it */
@@ -117,6 +120,7 @@ bfin_jc_emudat_manager(void *arg)
                                 bfin_write_emudat(outbound_len);
                                 pr_debug("outgoing length: 0x%08x\n", outbound_len);
                         } else {
+                                struct tty_struct *tty;
                                 int tail = bfin_jc_write_buf.tail;
                                 size_t ate = (4 <= outbound_len ? 4 : outbound_len);
                                 uint32_t emudat =
@@ -128,12 +132,14 @@ bfin_jc_emudat_manager(void *arg)
                                 );
                                 bfin_jc_write_buf.tail += ate;
                                 outbound_len -= ate;
+                                mutex_lock(&bfin_jc_tty_mutex);
+                                tty = (struct tty_struct *)bfin_jc_tty;
                                 if (tty)
                                         tty_wakeup(tty);
+                                mutex_unlock(&bfin_jc_tty_mutex);
                                 pr_debug("  outgoing data: 0x%08x (pushing %zu)\n", emudat, ate);
                         }
                 }
-                tty_kref_put(tty);
         }
 
         __set_current_state(TASK_RUNNING);
@@ -143,28 +149,24 @@ bfin_jc_emudat_manager(void *arg)
 static int
 bfin_jc_open(struct tty_struct *tty, struct file *filp)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&port.lock, flags);
-        port.count++;
-        spin_unlock_irqrestore(&port.lock, flags);
-        tty_port_tty_set(&port, tty);
+        mutex_lock(&bfin_jc_tty_mutex);
+        pr_debug("open %lu\n", bfin_jc_count);
+        ++bfin_jc_count;
+        bfin_jc_tty = tty;
         wake_up_process(bfin_jc_kthread);
+        mutex_unlock(&bfin_jc_tty_mutex);
         return 0;
 }
 
 static void
 bfin_jc_close(struct tty_struct *tty, struct file *filp)
 {
-        unsigned long flags;
-        bool last;
-
-        spin_lock_irqsave(&port.lock, flags);
-        last = --port.count == 0;
-        spin_unlock_irqrestore(&port.lock, flags);
-        if (last)
-                tty_port_tty_set(&port, NULL);
+        mutex_lock(&bfin_jc_tty_mutex);
+        pr_debug("close %lu\n", bfin_jc_count);
+        if (--bfin_jc_count == 0)
+                bfin_jc_tty = NULL;
         wake_up_process(bfin_jc_kthread);
+        mutex_unlock(&bfin_jc_tty_mutex);
 }
 
 /* XXX: we dont handle the put_char() case where we must handle count = 1 */
@@ -255,15 +257,13 @@ static int __init bfin_jc_init(void)
         if (!bfin_jc_driver)
                 goto err_driver;
 
-        tty_port_init(&port);
-
+        bfin_jc_driver->owner        = THIS_MODULE;
         bfin_jc_driver->driver_name  = DRV_NAME;
         bfin_jc_driver->name         = DEV_NAME;
         bfin_jc_driver->type         = TTY_DRIVER_TYPE_SERIAL;
         bfin_jc_driver->subtype      = SERIAL_TYPE_NORMAL;
         bfin_jc_driver->init_termios = tty_std_termios;
         tty_set_operations(bfin_jc_driver, &bfin_jc_ops);
-        tty_port_link_device(&port, bfin_jc_driver, 0);
 
         ret = tty_register_driver(bfin_jc_driver);
         if (ret)
@@ -274,7 +274,6 @@ static int __init bfin_jc_init(void)
         return 0;
 
  err:
-        tty_port_destroy(&port);
         put_tty_driver(bfin_jc_driver);
  err_driver:
         kfree(bfin_jc_write_buf.buf);
@@ -290,7 +289,6 @@ static void __exit bfin_jc_exit(void)
         kfree(bfin_jc_write_buf.buf);
         tty_unregister_driver(bfin_jc_driver);
         put_tty_driver(bfin_jc_driver);
-        tty_port_destroy(&port);
 }
 module_exit(bfin_jc_exit);
 
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index b09c8d1f9a6..c0e8f2eeb88 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -45,6 +45,7 @@
 #undef  CY_DEBUG_IO
 #undef  CY_DEBUG_COUNT
 #undef  CY_DEBUG_DTR
+#undef  CY_DEBUG_WAIT_UNTIL_SENT
 #undef  CY_DEBUG_INTERRUPTS
 #undef  CY_16Y_HACK
 #undef  CY_ENABLE_MONITORING
@@ -727,7 +728,7 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
                 else
                         tty_hangup(tty);
         }
-        if ((mdm_change & CyCTS) && tty_port_cts_enabled(&info->port)) {
+        if ((mdm_change & CyCTS) && (info->port.flags & ASYNC_CTS_FLOW)) {
                 if (tty->hw_stopped) {
                         if (mdm_status & CyCTS) {
                                 /* cy_start isn't used
@@ -1459,7 +1460,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
                         info->port.xmit_buf = NULL;
                         free_page((unsigned long)temp);
                 }
-                if (tty->termios.c_cflag & HUPCL)
+                if (tty->termios->c_cflag & HUPCL)
                         cyy_change_rts_dtr(info, 0, TIOCM_RTS | TIOCM_DTR);
 
                 cyy_issue_cmd(info, CyCHAN_CTL | CyDIS_RCVR);
@@ -1488,7 +1489,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
                         free_page((unsigned long)temp);
                 }
 
-                if (tty->termios.c_cflag & HUPCL)
+                if (tty->termios->c_cflag & HUPCL)
                         tty_port_lower_dtr_rts(&info->port);
 
                 set_bit(TTY_IO_ERROR, &tty->flags);
@@ -1515,9 +1516,13 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
 static int cy_open(struct tty_struct *tty, struct file *filp)
 {
         struct cyclades_port *info;
-        unsigned int i, line = tty->index;
+        unsigned int i, line;
         int retval;
 
+        line = tty->index;
+        if (tty->index < 0 || NR_PORTS <= line)
+                return -ENODEV;
+
         for (i = 0; i < NR_CARDS; i++)
                 if (line < cy_card[i].first_line + cy_card[i].nports &&
                                 line >= cy_card[i].first_line)
@@ -1599,7 +1604,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
          * If the port is the middle of closing, bail out now
          */
         if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
-                wait_event_interruptible_tty(tty, info->port.close_wait,
+                wait_event_interruptible_tty(info->port.close_wait,
                                 !(info->port.flags & ASYNC_CLOSING));
                 return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
         }
@@ -1673,10 +1678,16 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
          */
         if (!timeout || timeout > 2 * info->timeout)
                 timeout = 2 * info->timeout;
-
+#ifdef CY_DEBUG_WAIT_UNTIL_SENT
+        printk(KERN_DEBUG "In cy_wait_until_sent(%d) check=%d, jiff=%lu...",
+                timeout, char_time, jiffies);
+#endif
         card = info->card;
         if (!cy_is_Z(card)) {
                 while (cyy_readb(info, CySRER) & CyTxRdy) {
+#ifdef CY_DEBUG_WAIT_UNTIL_SENT
+                        printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
+#endif
                         if (msleep_interruptible(jiffies_to_msecs(char_time)))
                                 break;
                         if (timeout && time_after(jiffies, orig_jiffies +
@@ -1686,6 +1697,9 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
         }
         /* Run one more char cycle */
         msleep_interruptible(jiffies_to_msecs(char_time * 5));
+#ifdef CY_DEBUG_WAIT_UNTIL_SENT
+        printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
+#endif
 }
 
 static void cy_flush_buffer(struct tty_struct *tty)
@@ -1999,11 +2013,14 @@ static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty)
         int baud, baud_rate = 0;
         int i;
 
+        if (!tty->termios) /* XXX can this happen at all? */
+                return;
+
         if (info->line == -1)
                 return;
 
-        cflag = tty->termios.c_cflag;
-        iflag = tty->termios.c_iflag;
+        cflag = tty->termios->c_cflag;
+        iflag = tty->termios->c_iflag;
 
         /*
          * Set up the tty->alt_speed kludge
@@ -2406,7 +2423,7 @@ static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
                 /* Not supported yet */
                 return -EINVAL;
         }
-        return put_user(result, value);
+        return put_user(result, (unsigned long __user *)value);
 }
 
 static int cy_tiocmget(struct tty_struct *tty)
@@ -2822,7 +2839,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
         cy_set_line_char(info, tty);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios.c_cflag & CRTSCTS)) {
+                        !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 cy_start(tty);
         }
@@ -2834,7 +2851,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
          * or not.  Hence, this may change.....
          */
         if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios.c_cflag & CLOCAL))
+            (tty->termios->c_cflag & CLOCAL))
                 wake_up_interruptible(&info->port.open_wait);
 #endif
 }                               /* cy_set_termios */
@@ -2896,7 +2913,7 @@ static void cy_throttle(struct tty_struct *tty)
                         info->throttle = 1;
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 if (!cy_is_Z(card)) {
                         spin_lock_irqsave(&card->card_lock, flags);
                         cyy_change_rts_dtr(info, 0, TIOCM_RTS);
@@ -2935,7 +2952,7 @@ static void cy_unthrottle(struct tty_struct *tty)
                         cy_send_xchar(tty, START_CHAR(tty));
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 card = info->card;
                 if (!cy_is_Z(card)) {
                         spin_lock_irqsave(&card->card_lock, flags);
@@ -3099,7 +3116,7 @@ static const struct tty_port_operations cyz_port_ops = {
  * ---------------------------------------------------------------------
  */
 
-static int cy_init_card(struct cyclades_card *cinfo)
+static int __devinit cy_init_card(struct cyclades_card *cinfo)
 {
         struct cyclades_port *info;
         unsigned int channel, port;
@@ -3196,7 +3213,7 @@ static int cy_init_card(struct cyclades_card *cinfo)
 
 /* initialize chips on Cyclom-Y card -- return number of valid
    chips (which is number of ports/4) */
-static unsigned short cyy_init_card(void __iomem *true_base_addr,
+static unsigned short __devinit cyy_init_card(void __iomem *true_base_addr,
                 int index)
 {
         unsigned int chip_number;
@@ -3286,10 +3303,9 @@ static unsigned short cyy_init_card(void __iomem *true_base_addr,
 static int __init cy_detect_isa(void)
 {
 #ifdef CONFIG_ISA
-        struct cyclades_card *card;
         unsigned short cy_isa_irq, nboard;
         void __iomem *cy_isa_address;
-        unsigned short i, j, k, cy_isa_nchan;
+        unsigned short i, j, cy_isa_nchan;
         int isparam = 0;
 
         nboard = 0;
@@ -3347,8 +3363,7 @@ static int __init cy_detect_isa(void)
                 }
                 /* fill the next cy_card structure available */
                 for (j = 0; j < NR_CARDS; j++) {
-                        card = &cy_card[j];
-                        if (card->base_addr == NULL)
+                        if (cy_card[j].base_addr == NULL)
                                 break;
                 }
                 if (j == NR_CARDS) {    /* no more cy_cards available */
@@ -3362,7 +3377,7 @@ static int __init cy_detect_isa(void)
 
                 /* allocate IRQ */
                 if (request_irq(cy_isa_irq, cyy_interrupt,
-                                0, "Cyclom-Y", card)) {
+                                IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) {
                         printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but "
                                 "could not allocate IRQ#%d.\n",
                                 (unsigned long)cy_isa_address, cy_isa_irq);
@@ -3371,16 +3386,16 @@ static int __init cy_detect_isa(void)
                 }
 
                 /* set cy_card */
-                card->base_addr = cy_isa_address;
-                card->ctl_addr.p9050 = NULL;
-                card->irq = (int)cy_isa_irq;
-                card->bus_index = 0;
-                card->first_line = cy_next_channel;
-                card->num_chips = cy_isa_nchan / CyPORTS_PER_CHIP;
-                card->nports = cy_isa_nchan;
-                if (cy_init_card(card)) {
-                        card->base_addr = NULL;
-                        free_irq(cy_isa_irq, card);
+                cy_card[j].base_addr = cy_isa_address;
+                cy_card[j].ctl_addr.p9050 = NULL;
+                cy_card[j].irq = (int)cy_isa_irq;
+                cy_card[j].bus_index = 0;
+                cy_card[j].first_line = cy_next_channel;
+                cy_card[j].num_chips = cy_isa_nchan / CyPORTS_PER_CHIP;
+                cy_card[j].nports = cy_isa_nchan;
+                if (cy_init_card(&cy_card[j])) {
+                        cy_card[j].base_addr = NULL;
+                        free_irq(cy_isa_irq, &cy_card[j]);
                         iounmap(cy_isa_address);
                         continue;
                 }
@@ -3392,10 +3407,9 @@ static int __init cy_detect_isa(void)
                         (unsigned long)(cy_isa_address + (CyISA_Ywin - 1)),
                         cy_isa_irq, cy_isa_nchan, cy_next_channel);
 
-                for (k = 0, j = cy_next_channel;
-                                j < cy_next_channel + cy_isa_nchan; j++, k++)
-                        tty_port_register_device(&card->ports[k].port,
-                                        cy_serial_driver, j, NULL);
+                for (j = cy_next_channel;
+                                j < cy_next_channel + cy_isa_nchan; j++)
+                        tty_register_device(cy_serial_driver, j, NULL);
                 cy_next_channel += cy_isa_nchan;
         }
         return nboard;
@@ -3405,7 +3419,7 @@ static int __init cy_detect_isa(void)
 }                               /* cy_detect_isa */
 
 #ifdef CONFIG_PCI
-static inline int cyc_isfwstr(const char *str, unsigned int size)
+static inline int __devinit cyc_isfwstr(const char *str, unsigned int size)
 {
         unsigned int a;
 
@@ -3420,7 +3434,7 @@ static inline int cyc_isfwstr(const char *str, unsigned int size)
         return 0;
 }
 
-static inline void cyz_fpga_copy(void __iomem *fpga, const u8 *data,
+static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data,
                 unsigned int size)
 {
         for (; size > 0; size--) {
@@ -3429,7 +3443,7 @@ static inline void cyz_fpga_copy(void __iomem *fpga, const u8 *data,
         }
 }
 
-static void plx_init(struct pci_dev *pdev, int irq,
+static void __devinit plx_init(struct pci_dev *pdev, int irq,
                 struct RUNTIME_9060 __iomem *addr)
 {
         /* Reset PLX */
@@ -3449,7 +3463,7 @@ static void plx_init(struct pci_dev *pdev, int irq,
         pci_write_config_byte(pdev, PCI_INTERRUPT_LINE, irq);
 }
 
-static int __cyz_load_fw(const struct firmware *fw,
+static int __devinit __cyz_load_fw(const struct firmware *fw,
                 const char *name, const u32 mailbox, void __iomem *base,
                 void __iomem *fpga)
 {
@@ -3526,7 +3540,7 @@ static int __cyz_load_fw(const struct firmware *fw,
         return 0;
 }
 
-static int cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
+static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
                 struct RUNTIME_9060 __iomem *ctl_addr, int irq)
 {
         const struct firmware *fw;
@@ -3692,14 +3706,13 @@ err:
         return retval;
 }
 
-static int cy_pci_probe(struct pci_dev *pdev,
+static int __devinit cy_pci_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
-        struct cyclades_card *card;
         void __iomem *addr0 = NULL, *addr2 = NULL;
         char *card_name = NULL;
         u32 uninitialized_var(mailbox);
-        unsigned int device_id, nchan = 0, card_no, i, j;
+        unsigned int device_id, nchan = 0, card_no, i;
         unsigned char plx_ver;
         int retval, irq;
 
@@ -3830,8 +3843,7 @@ static int cy_pci_probe(struct pci_dev *pdev,
         }
         /* fill the next cy_card structure available */
         for (card_no = 0; card_no < NR_CARDS; card_no++) {
-                card = &cy_card[card_no];
-                if (card->base_addr == NULL)
+                if (cy_card[card_no].base_addr == NULL)
                         break;
         }
         if (card_no == NR_CARDS) {      /* no more cy_cards available */
@@ -3845,26 +3857,27 @@ static int cy_pci_probe(struct pci_dev *pdev,
                         device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
                 /* allocate IRQ */
                 retval = request_irq(irq, cyy_interrupt,
-                                IRQF_SHARED, "Cyclom-Y", card);
+                                IRQF_SHARED, "Cyclom-Y", &cy_card[card_no]);
                 if (retval) {
                         dev_err(&pdev->dev, "could not allocate IRQ\n");
                         goto err_unmap;
                 }
-                card->num_chips = nchan / CyPORTS_PER_CHIP;
+                cy_card[card_no].num_chips = nchan / CyPORTS_PER_CHIP;
         } else {
                 struct FIRM_ID __iomem *firm_id = addr2 + ID_ADDRESS;
                 struct ZFW_CTRL __iomem *zfw_ctrl;
 
                 zfw_ctrl = addr2 + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
 
-                card->hw_ver = mailbox;
-                card->num_chips = (unsigned int)-1;
-                card->board_ctrl = &zfw_ctrl->board_ctrl;
+                cy_card[card_no].hw_ver = mailbox;
+                cy_card[card_no].num_chips = (unsigned int)-1;
+                cy_card[card_no].board_ctrl = &zfw_ctrl->board_ctrl;
 #ifdef CONFIG_CYZ_INTR
                 /* allocate IRQ only if board has an IRQ */
                 if (irq != 0 && irq != 255) {
                         retval = request_irq(irq, cyz_interrupt,
-                                        IRQF_SHARED, "Cyclades-Z", card);
+                                        IRQF_SHARED, "Cyclades-Z",
+                                        &cy_card[card_no]);
                         if (retval) {
                                 dev_err(&pdev->dev, "could not allocate IRQ\n");
                                 goto err_unmap;
@@ -3874,17 +3887,17 @@ static int cy_pci_probe(struct pci_dev *pdev,
         }
 
         /* set cy_card */
-        card->base_addr = addr2;
-        card->ctl_addr.p9050 = addr0;
-        card->irq = irq;
-        card->bus_index = 1;
-        card->first_line = cy_next_channel;
-        card->nports = nchan;
-        retval = cy_init_card(card);
+        cy_card[card_no].base_addr = addr2;
+        cy_card[card_no].ctl_addr.p9050 = addr0;
+        cy_card[card_no].irq = irq;
+        cy_card[card_no].bus_index = 1;
+        cy_card[card_no].first_line = cy_next_channel;
+        cy_card[card_no].nports = nchan;
+        retval = cy_init_card(&cy_card[card_no]);
         if (retval)
                 goto err_null;
 
-        pci_set_drvdata(pdev, card);
+        pci_set_drvdata(pdev, &cy_card[card_no]);
 
         if (device_id == PCI_DEVICE_ID_CYCLOM_Y_Lo ||
                         device_id == PCI_DEVICE_ID_CYCLOM_Y_Hi) {
@@ -3910,15 +3923,14 @@ static int cy_pci_probe(struct pci_dev *pdev,
 
         dev_info(&pdev->dev, "%s/PCI #%d found: %d channels starting from "
                 "port %d.\n", card_name, card_no + 1, nchan, cy_next_channel);
-        for (j = 0, i = cy_next_channel; i < cy_next_channel + nchan; i++, j++)
-                tty_port_register_device(&card->ports[j].port,
-                                cy_serial_driver, i, &pdev->dev);
+        for (i = cy_next_channel; i < cy_next_channel + nchan; i++)
+                tty_register_device(cy_serial_driver, i, &pdev->dev);
         cy_next_channel += nchan;
 
         return 0;
 err_null:
-        card->base_addr = NULL;
-        free_irq(irq, card);
+        cy_card[card_no].base_addr = NULL;
+        free_irq(irq, &cy_card[card_no]);
 err_unmap:
         iounmap(addr0);
         if (addr2)
@@ -3931,10 +3943,10 @@ err:
         return retval;
 }
 
-static void cy_pci_remove(struct pci_dev *pdev)
+static void __devexit cy_pci_remove(struct pci_dev *pdev)
 {
         struct cyclades_card *cinfo = pci_get_drvdata(pdev);
-        unsigned int i, channel;
+        unsigned int i;
 
         /* non-Z with old PLX */
         if (!cy_is_Z(cinfo) && (readb(cinfo->base_addr + CyPLX_VER) & 0x0f) ==
@@ -3960,11 +3972,9 @@ static void cy_pci_remove(struct pci_dev *pdev)
         pci_release_regions(pdev);
 
         cinfo->base_addr = NULL;
-        for (channel = 0, i = cinfo->first_line; i < cinfo->first_line +
-                        cinfo->nports; i++, channel++) {
+        for (i = cinfo->first_line; i < cinfo->first_line +
+                        cinfo->nports; i++)
                 tty_unregister_device(cy_serial_driver, i);
-                tty_port_destroy(&cinfo->ports[channel].port);
-        }
         cinfo->nports = 0;
         kfree(cinfo->ports);
 }
@@ -3973,7 +3983,7 @@ static struct pci_driver cy_pci_driver = {
         .name = "cyclades",
         .id_table = cy_pci_dev_id,
         .probe = cy_pci_probe,
-        .remove = cy_pci_remove
+        .remove = __devexit_p(cy_pci_remove)
 };
 #endif
 
@@ -4090,6 +4100,7 @@ static int __init cy_init(void)
 
         /* Initialize the tty_driver structure */
 
+        cy_serial_driver->owner = THIS_MODULE;
         cy_serial_driver->driver_name = "cyclades";
         cy_serial_driver->name = "ttyC";
         cy_serial_driver->major = CYCLADES_MAJOR;
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
deleted file mode 100644
index c117d775a22..00000000000
--- a/drivers/tty/ehv_bytechan.c
+++ /dev/null
@@ -1,883 +0,0 @@
-/* ePAPR hypervisor byte channel device driver
- *
- * Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * Author: Timur Tabi <timur@freescale.com>
- *
- * 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.
- *
- * This driver support three distinct interfaces, all of which are related to
- * ePAPR hypervisor byte channels.
- *
- * 1) An early-console (udbg) driver.  This provides early console output
- * through a byte channel.  The byte channel handle must be specified in a
- * Kconfig option.
- *
- * 2) A normal console driver.  Output is sent to the byte channel designated
- * for stdout in the device tree.  The console driver is for handling kernel
- * printk calls.
- *
- * 3) A tty driver, which is used to handle user-space input and output.  The
- * byte channel used for the console is designated as the default tty.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/err.h>
-#include <linux/interrupt.h>
-#include <linux/fs.h>
-#include <linux/poll.h>
-#include <asm/epapr_hcalls.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/cdev.h>
-#include <linux/console.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/circ_buf.h>
-#include <asm/udbg.h>
-
-/* The size of the transmit circular buffer.  This must be a power of two. */
-#define BUF_SIZE        2048
-
-/* Per-byte channel private data */
-struct ehv_bc_data {
-        struct device *dev;
-        struct tty_port port;
-        uint32_t handle;
-        unsigned int rx_irq;
-        unsigned int tx_irq;
-
-        spinlock_t lock;        /* lock for transmit buffer */
-        unsigned char buf[BUF_SIZE];    /* transmit circular buffer */
-        unsigned int head;      /* circular buffer head */
-        unsigned int tail;      /* circular buffer tail */
-
-        int tx_irq_enabled;     /* true == TX interrupt is enabled */
-};
-
-/* Array of byte channel objects */
-static struct ehv_bc_data *bcs;
-
-/* Byte channel handle for stdout (and stdin), taken from device tree */
-static unsigned int stdout_bc;
-
-/* Virtual IRQ for the byte channel handle for stdin, taken from device tree */
-static unsigned int stdout_irq;
-
-/**************************** SUPPORT FUNCTIONS ****************************/
-
-/*
- * Enable the transmit interrupt
- *
- * Unlike a serial device, byte channels have no mechanism for disabling their
- * own receive or transmit interrupts.  To emulate that feature, we toggle
- * the IRQ in the kernel.
- *
- * We cannot just blindly call enable_irq() or disable_irq(), because these
- * calls are reference counted.  This means that we cannot call enable_irq()
- * if interrupts are already enabled.  This can happen in two situations:
- *
- * 1. The tty layer makes two back-to-back calls to ehv_bc_tty_write()
- * 2. A transmit interrupt occurs while executing ehv_bc_tx_dequeue()
- *
- * To work around this, we keep a flag to tell us if the IRQ is enabled or not.
- */
-static void enable_tx_interrupt(struct ehv_bc_data *bc)
-{
-        if (!bc->tx_irq_enabled) {
-                enable_irq(bc->tx_irq);
-                bc->tx_irq_enabled = 1;
-        }
-}
-
-static void disable_tx_interrupt(struct ehv_bc_data *bc)
-{
-        if (bc->tx_irq_enabled) {
-                disable_irq_nosync(bc->tx_irq);
-                bc->tx_irq_enabled = 0;
-        }
-}
-
-/*
- * find the byte channel handle to use for the console
- *
- * The byte channel to be used for the console is specified via a "stdout"
- * property in the /chosen node.
- *
- * For compatible with legacy device trees, we also look for a "stdout" alias.
- */
-static int find_console_handle(void)
-{
-        struct device_node *np, *np2;
-        const char *sprop = NULL;
-        const uint32_t *iprop;
-
-        np = of_find_node_by_path("/chosen");
-        if (np)
-                sprop = of_get_property(np, "stdout-path", NULL);
-
-        if (!np || !sprop) {
-                of_node_put(np);
-                np = of_find_node_by_name(NULL, "aliases");
-                if (np)
-                        sprop = of_get_property(np, "stdout", NULL);
-        }
-
-        if (!sprop) {
-                of_node_put(np);
-                return 0;
-        }
-
-        /* We don't care what the aliased node is actually called.  We only
-         * care if it's compatible with "epapr,hv-byte-channel", because that
-         * indicates that it's a byte channel node.  We use a temporary
-         * variable, 'np2', because we can't release 'np' until we're done with
-         * 'sprop'.
-         */
-        np2 = of_find_node_by_path(sprop);
-        of_node_put(np);
-        np = np2;
-        if (!np) {
-                pr_warning("ehv-bc: stdout node '%s' does not exist\n", sprop);
-                return 0;
-        }
-
-        /* Is it a byte channel? */
-        if (!of_device_is_compatible(np, "epapr,hv-byte-channel")) {
-                of_node_put(np);
-                return 0;
-        }
-
-        stdout_irq = irq_of_parse_and_map(np, 0);
-        if (stdout_irq == NO_IRQ) {
-                pr_err("ehv-bc: no 'interrupts' property in %s node\n", sprop);
-                of_node_put(np);
-                return 0;
-        }
-
-        /*
-         * The 'hv-handle' property contains the handle for this byte channel.
-         */
-        iprop = of_get_property(np, "hv-handle", NULL);
-        if (!iprop) {
-                pr_err("ehv-bc: no 'hv-handle' property in %s node\n",
-                       np->name);
-                of_node_put(np);
-                return 0;
-        }
-        stdout_bc = be32_to_cpu(*iprop);
-
-        of_node_put(np);
-        return 1;
-}
-
-/*************************** EARLY CONSOLE DRIVER ***************************/
-
-#ifdef CONFIG_PPC_EARLY_DEBUG_EHV_BC
-
-/*
- * send a byte to a byte channel, wait if necessary
- *
- * This function sends a byte to a byte channel, and it waits and
- * retries if the byte channel is full.  It returns if the character
- * has been sent, or if some error has occurred.
- *
- */
-static void byte_channel_spin_send(const char data)
-{
-        int ret, count;
-
-        do {
-                count = 1;
-                ret = ev_byte_channel_send(CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE,
-                                           &count, &data);
-        } while (ret == EV_EAGAIN);
-}
-
-/*
- * The udbg subsystem calls this function to display a single character.
- * We convert CR to a CR/LF.
- */
-static void ehv_bc_udbg_putc(char c)
-{
-        if (c == '\n')
-                byte_channel_spin_send('\r');
-
-        byte_channel_spin_send(c);
-}
-
-/*
- * early console initialization
- *
- * PowerPC kernels support an early printk console, also known as udbg.
- * This function must be called via the ppc_md.init_early function pointer.
- * At this point, the device tree has been unflattened, so we can obtain the
- * byte channel handle for stdout.
- *
- * We only support displaying of characters (putc).  We do not support
- * keyboard input.
- */
-void __init udbg_init_ehv_bc(void)
-{
-        unsigned int rx_count, tx_count;
-        unsigned int ret;
-
-        /* Verify the byte channel handle */
-        ret = ev_byte_channel_poll(CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE,
-                                   &rx_count, &tx_count);
-        if (ret)
-                return;
-
-        udbg_putc = ehv_bc_udbg_putc;
-        register_early_udbg_console();
-
-        udbg_printf("ehv-bc: early console using byte channel handle %u\n",
-                    CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE);
-}
-
-#endif
-
-/****************************** CONSOLE DRIVER ******************************/
-
-static struct tty_driver *ehv_bc_driver;
-
-/*
- * Byte channel console sending worker function.
- *
- * For consoles, if the output buffer is full, we should just spin until it
- * clears.
- */
-static int ehv_bc_console_byte_channel_send(unsigned int handle, const char *s,
-                             unsigned int count)
-{
-        unsigned int len;
-        int ret = 0;
-
-        while (count) {
-                len = min_t(unsigned int, count, EV_BYTE_CHANNEL_MAX_BYTES);
-                do {
-                        ret = ev_byte_channel_send(handle, &len, s);
-                } while (ret == EV_EAGAIN);
-                count -= len;
-                s += len;
-        }
-
-        return ret;
-}
-
-/*
- * write a string to the console
- *
- * This function gets called to write a string from the kernel, typically from
- * a printk().  This function spins until all data is written.
- *
- * We copy the data to a temporary buffer because we need to insert a \r in
- * front of every \n.  It's more efficient to copy the data to the buffer than
- * it is to make multiple hcalls for each character or each newline.
- */
-static void ehv_bc_console_write(struct console *co, const char *s,
-                                 unsigned int count)
-{
-        char s2[EV_BYTE_CHANNEL_MAX_BYTES];
-        unsigned int i, j = 0;
-        char c;
-
-        for (i = 0; i < count; i++) {
-                c = *s++;
-
-                if (c == '\n')
-                        s2[j++] = '\r';
-
-                s2[j++] = c;
-                if (j >= (EV_BYTE_CHANNEL_MAX_BYTES - 1)) {
-                        if (ehv_bc_console_byte_channel_send(stdout_bc, s2, j))
-                                return;
-                        j = 0;
-                }
-        }
-
-        if (j)
-                ehv_bc_console_byte_channel_send(stdout_bc, s2, j);
-}
-
-/*
- * When /dev/console is opened, the kernel iterates the console list looking
- * for one with ->device and then calls that method. On success, it expects
- * the passed-in int* to contain the minor number to use.
- */
-static struct tty_driver *ehv_bc_console_device(struct console *co, int *index)
-{
-        *index = co->index;
-
-        return ehv_bc_driver;
-}
-
-static struct console ehv_bc_console = {
-        .name           = "ttyEHV",
-        .write          = ehv_bc_console_write,
-        .device         = ehv_bc_console_device,
-        .flags          = CON_PRINTBUFFER | CON_ENABLED,
-};
-
-/*
- * Console initialization
- *
- * This is the first function that is called after the device tree is
- * available, so here is where we determine the byte channel handle and IRQ for
- * stdout/stdin, even though that information is used by the tty and character
- * drivers.
- */
-static int __init ehv_bc_console_init(void)
-{
-        if (!find_console_handle()) {
-                pr_debug("ehv-bc: stdout is not a byte channel\n");
-                return -ENODEV;
-        }
-
-#ifdef CONFIG_PPC_EARLY_DEBUG_EHV_BC
-        /* Print a friendly warning if the user chose the wrong byte channel
-         * handle for udbg.
-         */
-        if (stdout_bc != CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE)
-                pr_warning("ehv-bc: udbg handle %u is not the stdout handle\n",
-                           CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE);
-#endif
-
-        /* add_preferred_console() must be called before register_console(),
-           otherwise it won't work.  However, we don't want to enumerate all the
-           byte channels here, either, since we only care about one. */
-
-        add_preferred_console(ehv_bc_console.name, ehv_bc_console.index, NULL);
-        register_console(&ehv_bc_console);
-
-        pr_info("ehv-bc: registered console driver for byte channel %u\n",
-                stdout_bc);
-
-        return 0;
-}
-console_initcall(ehv_bc_console_init);
-
-/******************************** TTY DRIVER ********************************/
-
-/*
- * byte channel receive interupt handler
- *
- * This ISR is called whenever data is available on a byte channel.
- */
-static irqreturn_t ehv_bc_tty_rx_isr(int irq, void *data)
-{
-        struct ehv_bc_data *bc = data;
-        struct tty_struct *ttys = tty_port_tty_get(&bc->port);
-        unsigned int rx_count, tx_count, len;
-        int count;
-        char buffer[EV_BYTE_CHANNEL_MAX_BYTES];
-        int ret;
-
-        /* ttys could be NULL during a hangup */
-        if (!ttys)
-                return IRQ_HANDLED;
-
-        /* Find out how much data needs to be read, and then ask the TTY layer
-         * if it can handle that much.  We want to ensure that every byte we
-         * read from the byte channel will be accepted by the TTY layer.
-         */
-        ev_byte_channel_poll(bc->handle, &rx_count, &tx_count);
-        count = tty_buffer_request_room(ttys, rx_count);
-
-        /* 'count' is the maximum amount of data the TTY layer can accept at
-         * this time.  However, during testing, I was never able to get 'count'
-         * to be less than 'rx_count'.  I'm not sure whether I'm calling it
-         * correctly.
-         */
-
-        while (count > 0) {
-                len = min_t(unsigned int, count, sizeof(buffer));
-
-                /* Read some data from the byte channel.  This function will
-                 * never return more than EV_BYTE_CHANNEL_MAX_BYTES bytes.
-                 */
-                ev_byte_channel_receive(bc->handle, &len, buffer);
-
-                /* 'len' is now the amount of data that's been received. 'len'
-                 * can't be zero, and most likely it's equal to one.
-                 */
-
-                /* Pass the received data to the tty layer. */
-                ret = tty_insert_flip_string(ttys, buffer, len);
-
-                /* 'ret' is the number of bytes that the TTY layer accepted.
-                 * If it's not equal to 'len', then it means the buffer is
-                 * full, which should never happen.  If it does happen, we can
-                 * exit gracefully, but we drop the last 'len - ret' characters
-                 * that we read from the byte channel.
-                 */
-                if (ret != len)
-                        break;
-
-                count -= len;
-        }
-
-        /* Tell the tty layer that we're done. */
-        tty_flip_buffer_push(ttys);
-
-        tty_kref_put(ttys);
-
-        return IRQ_HANDLED;
-}
-
-/*
- * dequeue the transmit buffer to the hypervisor
- *
- * This function, which can be called in interrupt context, dequeues as much
- * data as possible from the transmit buffer to the byte channel.
- */
-static void ehv_bc_tx_dequeue(struct ehv_bc_data *bc)
-{
-        unsigned int count;
-        unsigned int len, ret;
-        unsigned long flags;
-
-        do {
-                spin_lock_irqsave(&bc->lock, flags);
-                len = min_t(unsigned int,
-                            CIRC_CNT_TO_END(bc->head, bc->tail, BUF_SIZE),
-                            EV_BYTE_CHANNEL_MAX_BYTES);
-
-                ret = ev_byte_channel_send(bc->handle, &len, bc->buf + bc->tail);
-
-                /* 'len' is valid only if the return code is 0 or EV_EAGAIN */
-                if (!ret || (ret == EV_EAGAIN))
-                        bc->tail = (bc->tail + len) & (BUF_SIZE - 1);
-
-                count = CIRC_CNT(bc->head, bc->tail, BUF_SIZE);
-                spin_unlock_irqrestore(&bc->lock, flags);
-        } while (count && !ret);
-
-        spin_lock_irqsave(&bc->lock, flags);
-        if (CIRC_CNT(bc->head, bc->tail, BUF_SIZE))
-                /*
-                 * If we haven't emptied the buffer, then enable the TX IRQ.
-                 * We'll get an interrupt when there's more room in the
-                 * hypervisor's output buffer.
-                 */
-                enable_tx_interrupt(bc);
-        else
-                disable_tx_interrupt(bc);
-        spin_unlock_irqrestore(&bc->lock, flags);
-}
-
-/*
- * byte channel transmit interupt handler
- *
- * This ISR is called whenever space becomes available for transmitting
- * characters on a byte channel.
- */
-static irqreturn_t ehv_bc_tty_tx_isr(int irq, void *data)
-{
-        struct ehv_bc_data *bc = data;
-        struct tty_struct *ttys = tty_port_tty_get(&bc->port);
-
-        ehv_bc_tx_dequeue(bc);
-        if (ttys) {
-                tty_wakeup(ttys);
-                tty_kref_put(ttys);
-        }
-
-        return IRQ_HANDLED;
-}
-
-/*
- * This function is called when the tty layer has data for us send.  We store
- * the data first in a circular buffer, and then dequeue as much of that data
- * as possible.
- *
- * We don't need to worry about whether there is enough room in the buffer for
- * all the data.  The purpose of ehv_bc_tty_write_room() is to tell the tty
- * layer how much data it can safely send to us.  We guarantee that
- * ehv_bc_tty_write_room() will never lie, so the tty layer will never send us
- * too much data.
- */
-static int ehv_bc_tty_write(struct tty_struct *ttys, const unsigned char *s,
-                            int count)
-{
-        struct ehv_bc_data *bc = ttys->driver_data;
-        unsigned long flags;
-        unsigned int len;
-        unsigned int written = 0;
-
-        while (1) {
-                spin_lock_irqsave(&bc->lock, flags);
-                len = CIRC_SPACE_TO_END(bc->head, bc->tail, BUF_SIZE);
-                if (count < len)
-                        len = count;
-                if (len) {
-                        memcpy(bc->buf + bc->head, s, len);
-                        bc->head = (bc->head + len) & (BUF_SIZE - 1);
-                }
-                spin_unlock_irqrestore(&bc->lock, flags);
-                if (!len)
-                        break;
-
-                s += len;
-                count -= len;
-                written += len;
-        }
-
-        ehv_bc_tx_dequeue(bc);
-
-        return written;
-}
-
-/*
- * This function can be called multiple times for a given tty_struct, which is
- * why we initialize bc->ttys in ehv_bc_tty_port_activate() instead.
- *
- * The tty layer will still call this function even if the device was not
- * registered (i.e. tty_register_device() was not called).  This happens
- * because tty_register_device() is optional and some legacy drivers don't
- * use it.  So we need to check for that.
- */
-static int ehv_bc_tty_open(struct tty_struct *ttys, struct file *filp)
-{
-        struct ehv_bc_data *bc = &bcs[ttys->index];
-
-        if (!bc->dev)
-                return -ENODEV;
-
-        return tty_port_open(&bc->port, ttys, filp);
-}
-
-/*
- * Amazingly, if ehv_bc_tty_open() returns an error code, the tty layer will
- * still call this function to close the tty device.  So we can't assume that
- * the tty port has been initialized.
- */
-static void ehv_bc_tty_close(struct tty_struct *ttys, struct file *filp)
-{
-        struct ehv_bc_data *bc = &bcs[ttys->index];
-
-        if (bc->dev)
-                tty_port_close(&bc->port, ttys, filp);
-}
-
-/*
- * Return the amount of space in the output buffer
- *
- * This is actually a contract between the driver and the tty layer outlining
- * how much write room the driver can guarantee will be sent OR BUFFERED.  This
- * driver MUST honor the return value.
- */
-static int ehv_bc_tty_write_room(struct tty_struct *ttys)
-{
-        struct ehv_bc_data *bc = ttys->driver_data;
-        unsigned long flags;
-        int count;
-
-        spin_lock_irqsave(&bc->lock, flags);
-        count = CIRC_SPACE(bc->head, bc->tail, BUF_SIZE);
-        spin_unlock_irqrestore(&bc->lock, flags);
-
-        return count;
-}
-
-/*
- * Stop sending data to the tty layer
- *
- * This function is called when the tty layer's input buffers are getting full,
- * so the driver should stop sending it data.  The easiest way to do this is to
- * disable the RX IRQ, which will prevent ehv_bc_tty_rx_isr() from being
- * called.
- *
- * The hypervisor will continue to queue up any incoming data.  If there is any
- * data in the queue when the RX interrupt is enabled, we'll immediately get an
- * RX interrupt.
- */
-static void ehv_bc_tty_throttle(struct tty_struct *ttys)
-{
-        struct ehv_bc_data *bc = ttys->driver_data;
-
-        disable_irq(bc->rx_irq);
-}
-
-/*
- * Resume sending data to the tty layer
- *
- * This function is called after previously calling ehv_bc_tty_throttle().  The
- * tty layer's input buffers now have more room, so the driver can resume
- * sending it data.
- */
-static void ehv_bc_tty_unthrottle(struct tty_struct *ttys)
-{
-        struct ehv_bc_data *bc = ttys->driver_data;
-
-        /* If there is any data in the queue when the RX interrupt is enabled,
-         * we'll immediately get an RX interrupt.
-         */
-        enable_irq(bc->rx_irq);
-}
-
-static void ehv_bc_tty_hangup(struct tty_struct *ttys)
-{
-        struct ehv_bc_data *bc = ttys->driver_data;
-
-        ehv_bc_tx_dequeue(bc);
-        tty_port_hangup(&bc->port);
-}
-
-/*
- * TTY driver operations
- *
- * If we could ask the hypervisor how much data is still in the TX buffer, or
- * at least how big the TX buffers are, then we could implement the
- * .wait_until_sent and .chars_in_buffer functions.
- */
-static const struct tty_operations ehv_bc_ops = {
-        .open           = ehv_bc_tty_open,
-        .close          = ehv_bc_tty_close,
-        .write          = ehv_bc_tty_write,
-        .write_room     = ehv_bc_tty_write_room,
-        .throttle       = ehv_bc_tty_throttle,
-        .unthrottle     = ehv_bc_tty_unthrottle,
-        .hangup         = ehv_bc_tty_hangup,
-};
-
-/*
- * initialize the TTY port
- *
- * This function will only be called once, no matter how many times
- * ehv_bc_tty_open() is called.  That's why we register the ISR here, and also
- * why we initialize tty_struct-related variables here.
- */
-static int ehv_bc_tty_port_activate(struct tty_port *port,
-                                    struct tty_struct *ttys)
-{
-        struct ehv_bc_data *bc = container_of(port, struct ehv_bc_data, port);
-        int ret;
-
-        ttys->driver_data = bc;
-
-        ret = request_irq(bc->rx_irq, ehv_bc_tty_rx_isr, 0, "ehv-bc", bc);
-        if (ret < 0) {
-                dev_err(bc->dev, "could not request rx irq %u (ret=%i)\n",
-                       bc->rx_irq, ret);
-                return ret;
-        }
-
-        /* request_irq also enables the IRQ */
-        bc->tx_irq_enabled = 1;
-
-        ret = request_irq(bc->tx_irq, ehv_bc_tty_tx_isr, 0, "ehv-bc", bc);
-        if (ret < 0) {
-                dev_err(bc->dev, "could not request tx irq %u (ret=%i)\n",
-                       bc->tx_irq, ret);
-                free_irq(bc->rx_irq, bc);
-                return ret;
-        }
-
-        /* The TX IRQ is enabled only when we can't write all the data to the
-         * byte channel at once, so by default it's disabled.
-         */
-        disable_tx_interrupt(bc);
-
-        return 0;
-}
-
-static void ehv_bc_tty_port_shutdown(struct tty_port *port)
-{
-        struct ehv_bc_data *bc = container_of(port, struct ehv_bc_data, port);
-
-        free_irq(bc->tx_irq, bc);
-        free_irq(bc->rx_irq, bc);
-}
-
-static const struct tty_port_operations ehv_bc_tty_port_ops = {
-        .activate = ehv_bc_tty_port_activate,
-        .shutdown = ehv_bc_tty_port_shutdown,
-};
-
-static int ehv_bc_tty_probe(struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-        struct ehv_bc_data *bc;
-        const uint32_t *iprop;
-        unsigned int handle;
-        int ret;
-        static unsigned int index = 1;
-        unsigned int i;
-
-        iprop = of_get_property(np, "hv-handle", NULL);
-        if (!iprop) {
-                dev_err(&pdev->dev, "no 'hv-handle' property in %s node\n",
-                        np->name);
-                return -ENODEV;
-        }
-
-        /* We already told the console layer that the index for the console
-         * device is zero, so we need to make sure that we use that index when
-         * we probe the console byte channel node.
-         */
-        handle = be32_to_cpu(*iprop);
-        i = (handle == stdout_bc) ? 0 : index++;
-        bc = &bcs[i];
-
-        bc->handle = handle;
-        bc->head = 0;
-        bc->tail = 0;
-        spin_lock_init(&bc->lock);
-
-        bc->rx_irq = irq_of_parse_and_map(np, 0);
-        bc->tx_irq = irq_of_parse_and_map(np, 1);
-        if ((bc->rx_irq == NO_IRQ) || (bc->tx_irq == NO_IRQ)) {
-                dev_err(&pdev->dev, "no 'interrupts' property in %s node\n",
-                        np->name);
-                ret = -ENODEV;
-                goto error;
-        }
-
-        tty_port_init(&bc->port);
-        bc->port.ops = &ehv_bc_tty_port_ops;
-
-        bc->dev = tty_port_register_device(&bc->port, ehv_bc_driver, i,
-                        &pdev->dev);
-        if (IS_ERR(bc->dev)) {
-                ret = PTR_ERR(bc->dev);
-                dev_err(&pdev->dev, "could not register tty (ret=%i)\n", ret);
-                goto error;
-        }
-
-        dev_set_drvdata(&pdev->dev, bc);
-
-        dev_info(&pdev->dev, "registered /dev/%s%u for byte channel %u\n",
-                ehv_bc_driver->name, i, bc->handle);
-
-        return 0;
-
-error:
-        tty_port_destroy(&bc->port);
-        irq_dispose_mapping(bc->tx_irq);
-        irq_dispose_mapping(bc->rx_irq);
-
-        memset(bc, 0, sizeof(struct ehv_bc_data));
-        return ret;
-}
-
-static int ehv_bc_tty_remove(struct platform_device *pdev)
-{
-        struct ehv_bc_data *bc = dev_get_drvdata(&pdev->dev);
-
-        tty_unregister_device(ehv_bc_driver, bc - bcs);
-
-        tty_port_destroy(&bc->port);
-        irq_dispose_mapping(bc->tx_irq);
-        irq_dispose_mapping(bc->rx_irq);
-
-        return 0;
-}
-
-static const struct of_device_id ehv_bc_tty_of_ids[] = {
-        { .compatible = "epapr,hv-byte-channel" },
-        {}
-};
-
-static struct platform_driver ehv_bc_tty_driver = {
-        .driver = {
-                .owner = THIS_MODULE,
-                .name = "ehv-bc",
-                .of_match_table = ehv_bc_tty_of_ids,
-        },
-        .probe          = ehv_bc_tty_probe,
-        .remove         = ehv_bc_tty_remove,
-};
-
-/**
- * ehv_bc_init - ePAPR hypervisor byte channel driver initialization
- *
- * This function is called when this module is loaded.
- */
-static int __init ehv_bc_init(void)
-{
-        struct device_node *np;
-        unsigned int count = 0; /* Number of elements in bcs[] */
-        int ret;
-
-        pr_info("ePAPR hypervisor byte channel driver\n");
-
-        /* Count the number of byte channels */
-        for_each_compatible_node(np, NULL, "epapr,hv-byte-channel")
-                count++;
-
-        if (!count)
-                return -ENODEV;
-
-        /* The array index of an element in bcs[] is the same as the tty index
-         * for that element.  If you know the address of an element in the
-         * array, then you can use pointer math (e.g. "bc - bcs") to get its
-         * tty index.
-         */
-        bcs = kzalloc(count * sizeof(struct ehv_bc_data), GFP_KERNEL);
-        if (!bcs)
-                return -ENOMEM;
-
-        ehv_bc_driver = alloc_tty_driver(count);
-        if (!ehv_bc_driver) {
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        ehv_bc_driver->driver_name = "ehv-bc";
-        ehv_bc_driver->name = ehv_bc_console.name;
-        ehv_bc_driver->type = TTY_DRIVER_TYPE_CONSOLE;
-        ehv_bc_driver->subtype = SYSTEM_TYPE_CONSOLE;
-        ehv_bc_driver->init_termios = tty_std_termios;
-        ehv_bc_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        tty_set_operations(ehv_bc_driver, &ehv_bc_ops);
-
-        ret = tty_register_driver(ehv_bc_driver);
-        if (ret) {
-                pr_err("ehv-bc: could not register tty driver (ret=%i)\n", ret);
-                goto error;
-        }
-
-        ret = platform_driver_register(&ehv_bc_tty_driver);
-        if (ret) {
-                pr_err("ehv-bc: could not register platform driver (ret=%i)\n",
-                       ret);
-                goto error;
-        }
-
-        return 0;
-
-error:
-        if (ehv_bc_driver) {
-                tty_unregister_driver(ehv_bc_driver);
-                put_tty_driver(ehv_bc_driver);
-        }
-
-        kfree(bcs);
-
-        return ret;
-}
-
-
-/**
- * ehv_bc_exit - ePAPR hypervisor byte channel driver termination
- *
- * This function is called when this driver is unloaded.
- */
-static void __exit ehv_bc_exit(void)
-{
-        tty_unregister_driver(ehv_bc_driver);
-        put_tty_driver(ehv_bc_driver);
-        kfree(bcs);
-}
-
-module_init(ehv_bc_init);
-module_exit(ehv_bc_exit);
-
-MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
-MODULE_DESCRIPTION("ePAPR hypervisor byte channel driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index f47b734c6a7..e371753ba92 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -24,14 +24,15 @@ config HVC_OLD_HVSI
         depends on HVC_CONSOLE
         default n
 
-config HVC_OPAL
-        bool "OPAL Console support"
-        depends on PPC_POWERNV
+config HVC_ISERIES
+        bool "iSeries Hypervisor Virtual Console support"
+        depends on PPC_ISERIES
+        default y
         select HVC_DRIVER
         select HVC_IRQ
-        default y
+        select VIOPATH
         help
-          PowerNV machines running under OPAL need that driver to get a console
+          iSeries machines support a hypervisor virtual console.
 
 config HVC_RTAS
         bool "IBM RTAS Console support"
@@ -66,23 +67,11 @@ config HVC_XEN
         help
           Xen virtual console device driver
 
-config HVC_XEN_FRONTEND
-        bool "Xen Hypervisor Multiple Consoles support"
-        depends on HVC_XEN
-        select XEN_XENBUS_FRONTEND
-        default y
-        help
-          Xen driver for secondary virtual consoles
-
 config HVC_UDBG
        bool "udbg based fake hypervisor console"
-       depends on PPC
+       depends on PPC && EXPERIMENTAL
        select HVC_DRIVER
        default n
-       help
-         This is meant to be used during HW bring up or debugging when
-         no other console mechanism exist but udbg, to get you a quick
-         console for userspace. Do NOT enable in production kernels. 
 
 config HVC_DCC
        bool "ARM JTAG DCC console"
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index 4ca3723b0a3..e2920531637 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi_lib.o
-obj-$(CONFIG_HVC_OPAL)          += hvc_opal.o hvsi_lib.o
 obj-$(CONFIG_HVC_OLD_HVSI)      += hvsi.o
+obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
 obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
 obj-$(CONFIG_HVC_TILE)          += hvc_tile.o
 obj-$(CONFIG_HVC_DCC)           += hvc_dcc.o
diff --git a/drivers/tty/hvc/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
index 1560d235449..5fe4631e2a6 100644
--- a/drivers/tty/hvc/hvc_beat.c
+++ b/drivers/tty/hvc/hvc_beat.c
@@ -113,7 +113,7 @@ static int __init hvc_beat_init(void)
         if (!firmware_has_feature(FW_FEATURE_BEAT))
                 return -ENODEV;
 
-        hp = hvc_alloc(0, 0, &hvc_beat_get_put_ops, 16);
+        hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
         hvc_beat_dev = hp;
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index 13ee53bd0bf..e1aaf4f309b 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -107,7 +107,7 @@ static struct hvc_struct *hvc_get_by_index(int index)
         list_for_each_entry(hp, &hvc_structs, next) {
                 spin_lock_irqsave(&hp->lock, flags);
                 if (hp->index == index) {
-                        tty_port_get(&hp->port);
+                        kref_get(&hp->kref);
                         spin_unlock_irqrestore(&hp->lock, flags);
                         spin_unlock(&hvc_structs_lock);
                         return hp;
@@ -229,9 +229,9 @@ static int __init hvc_console_init(void)
 console_initcall(hvc_console_init);
 
 /* callback when the kboject ref count reaches zero. */
-static void hvc_port_destruct(struct tty_port *port)
+static void destroy_hvc_struct(struct kref *kref)
 {
-        struct hvc_struct *hp = container_of(port, struct hvc_struct, port);
+        struct hvc_struct *hp = container_of(kref, struct hvc_struct, kref);
         unsigned long flags;
 
         spin_lock(&hvc_structs_lock);
@@ -245,20 +245,6 @@ static void hvc_port_destruct(struct tty_port *port)
         kfree(hp);
 }
 
-static void hvc_check_console(int index)
-{
-        /* Already enabled, bail out */
-        if (hvc_console.flags & CON_ENABLED)
-                return;
-
-        /* If this index is what the user requested, then register
-         * now (setup won't fail at this point).  It's ok to just
-         * call register again if previously .setup failed.
-         */
-        if (index == hvc_console.index)
-                register_console(&hvc_console);
-}
-
 /*
  * hvc_instantiate() is an early console discovery method which locates
  * consoles * prior to the vio subsystem discovering them.  Hotplugged
@@ -278,7 +264,7 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
         /* make sure no no tty has been registered in this index */
         hp = hvc_get_by_index(index);
         if (hp) {
-                tty_port_put(&hp->port);
+                kref_put(&hp->kref, destroy_hvc_struct);
                 return -1;
         }
 
@@ -289,8 +275,12 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
         if (last_hvc < index)
                 last_hvc = index;
 
-        /* check if we need to re-register the kernel console */
-        hvc_check_console(index);
+        /* if this index is what the user requested, then register
+         * now (setup won't fail at this point).  It's ok to just
+         * call register again if previously .setup failed.
+         */
+        if (index == hvc_console.index)
+                register_console(&hvc_console);
 
         return 0;
 }
@@ -309,43 +299,34 @@ static void hvc_unthrottle(struct tty_struct *tty)
         hvc_kick();
 }
 
-static int hvc_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct hvc_struct *hp;
-        int rc;
-
-        /* Auto increments kref reference if found. */
-        if (!(hp = hvc_get_by_index(tty->index)))
-                return -ENODEV;
-
-        tty->driver_data = hp;
-
-        rc = tty_port_install(&hp->port, driver, tty);
-        if (rc)
-                tty_port_put(&hp->port);
-        return rc;
-}
-
 /*
  * The TTY interface won't be used until after the vio layer has exposed the vty
  * adapter to the kernel.
  */
 static int hvc_open(struct tty_struct *tty, struct file * filp)
 {
-        struct hvc_struct *hp = tty->driver_data;
+        struct hvc_struct *hp;
         unsigned long flags;
         int rc = 0;
 
-        spin_lock_irqsave(&hp->port.lock, flags);
+        /* Auto increments kref reference if found. */
+        if (!(hp = hvc_get_by_index(tty->index)))
+                return -ENODEV;
+
+        spin_lock_irqsave(&hp->lock, flags);
         /* Check and then increment for fast path open. */
-        if (hp->port.count++ > 0) {
-                spin_unlock_irqrestore(&hp->port.lock, flags);
+        if (hp->count++ > 0) {
+                tty_kref_get(tty);
+                spin_unlock_irqrestore(&hp->lock, flags);
                 hvc_kick();
                 return 0;
         } /* else count == 0 */
-        spin_unlock_irqrestore(&hp->port.lock, flags);
 
-        tty_port_tty_set(&hp->port, tty);
+        tty->driver_data = hp;
+
+        hp->tty = tty_kref_get(tty);
+
+        spin_unlock_irqrestore(&hp->lock, flags);
 
         if (hp->ops->notifier_add)
                 rc = hp->ops->notifier_add(hp, hp->data);
@@ -357,9 +338,12 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
          * tty fields and return the kref reference.
          */
         if (rc) {
-                tty_port_tty_set(&hp->port, NULL);
+                spin_lock_irqsave(&hp->lock, flags);
+                hp->tty = NULL;
+                spin_unlock_irqrestore(&hp->lock, flags);
+                tty_kref_put(tty);
                 tty->driver_data = NULL;
-                tty_port_put(&hp->port);
+                kref_put(&hp->kref, destroy_hvc_struct);
                 printk(KERN_ERR "hvc_open: request_irq failed with rc %d.\n", rc);
         }
         /* Force wakeup of the polling thread */
@@ -386,12 +370,12 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
 
         hp = tty->driver_data;
 
-        spin_lock_irqsave(&hp->port.lock, flags);
+        spin_lock_irqsave(&hp->lock, flags);
 
-        if (--hp->port.count == 0) {
-                spin_unlock_irqrestore(&hp->port.lock, flags);
+        if (--hp->count == 0) {
                 /* We are done with the tty pointer now. */
-                tty_port_tty_set(&hp->port, NULL);
+                hp->tty = NULL;
+                spin_unlock_irqrestore(&hp->lock, flags);
 
                 if (hp->ops->notifier_del)
                         hp->ops->notifier_del(hp, hp->data);
@@ -404,26 +388,23 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
                  * there is no buffered data otherwise sleeps on a wait queue
                  * waking periodically to check chars_in_buffer().
                  */
-                tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
+                tty_wait_until_sent(tty, HVC_CLOSE_WAIT);
         } else {
-                if (hp->port.count < 0)
+                if (hp->count < 0)
                         printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
-                                hp->vtermno, hp->port.count);
-                spin_unlock_irqrestore(&hp->port.lock, flags);
+                                hp->vtermno, hp->count);
+                spin_unlock_irqrestore(&hp->lock, flags);
         }
-}
 
-static void hvc_cleanup(struct tty_struct *tty)
-{
-        struct hvc_struct *hp = tty->driver_data;
-
-        tty_port_put(&hp->port);
+        tty_kref_put(tty);
+        kref_put(&hp->kref, destroy_hvc_struct);
 }
 
 static void hvc_hangup(struct tty_struct *tty)
 {
         struct hvc_struct *hp = tty->driver_data;
         unsigned long flags;
+        int temp_open_count;
 
         if (!hp)
                 return;
@@ -431,26 +412,33 @@ static void hvc_hangup(struct tty_struct *tty)
         /* cancel pending tty resize work */
         cancel_work_sync(&hp->tty_resize);
 
-        spin_lock_irqsave(&hp->port.lock, flags);
+        spin_lock_irqsave(&hp->lock, flags);
 
         /*
          * The N_TTY line discipline has problems such that in a close vs
          * open->hangup case this can be called after the final close so prevent
          * that from happening for now.
          */
-        if (hp->port.count <= 0) {
-                spin_unlock_irqrestore(&hp->port.lock, flags);
+        if (hp->count <= 0) {
+                spin_unlock_irqrestore(&hp->lock, flags);
                 return;
         }
 
-        hp->port.count = 0;
-        spin_unlock_irqrestore(&hp->port.lock, flags);
-        tty_port_tty_set(&hp->port, NULL);
-
+        temp_open_count = hp->count;
+        hp->count = 0;
         hp->n_outbuf = 0;
+        hp->tty = NULL;
+
+        spin_unlock_irqrestore(&hp->lock, flags);
 
         if (hp->ops->notifier_hangup)
                 hp->ops->notifier_hangup(hp, hp->data);
+
+        while(temp_open_count) {
+                --temp_open_count;
+                tty_kref_put(tty);
+                kref_put(&hp->kref, destroy_hvc_struct);
+        }
 }
 
 /*
@@ -490,8 +478,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
         if (!hp)
                 return -EPIPE;
 
-        /* FIXME what's this (unprotected) check for? */
-        if (hp->port.count <= 0)
+        if (hp->count <= 0)
                 return -EIO;
 
         spin_lock_irqsave(&hp->lock, flags);
@@ -539,12 +526,13 @@ static void hvc_set_winsz(struct work_struct *work)
 
         hp = container_of(work, struct hvc_struct, tty_resize);
 
-        tty = tty_port_tty_get(&hp->port);
-        if (!tty)
-                return;
-
         spin_lock_irqsave(&hp->lock, hvc_flags);
-        ws = hp->ws;
+        if (!hp->tty) {
+                spin_unlock_irqrestore(&hp->lock, hvc_flags);
+                return;
+        }
+        ws  = hp->ws;
+        tty = tty_kref_get(hp->tty);
         spin_unlock_irqrestore(&hp->lock, hvc_flags);
 
         tty_do_resize(tty, &ws);
@@ -561,7 +549,7 @@ static int hvc_write_room(struct tty_struct *tty)
         struct hvc_struct *hp = tty->driver_data;
 
         if (!hp)
-                return 0;
+                return -1;
 
         return hp->outbuf_size - hp->n_outbuf;
 }
@@ -613,7 +601,7 @@ int hvc_poll(struct hvc_struct *hp)
         }
 
         /* No tty attached, just skip */
-        tty = tty_port_tty_get(&hp->port);
+        tty = tty_kref_get(hp->tty);
         if (tty == NULL)
                 goto bail;
 
@@ -693,7 +681,8 @@ int hvc_poll(struct hvc_struct *hp)
 
                 tty_flip_buffer_push(tty);
         }
-        tty_kref_put(tty);
+        if (tty)
+                tty_kref_put(tty);
 
         return poll_mask;
 }
@@ -812,10 +801,8 @@ static void hvc_poll_put_char(struct tty_driver *driver, int line, char ch)
 #endif
 
 static const struct tty_operations hvc_ops = {
-        .install = hvc_install,
         .open = hvc_open,
         .close = hvc_close,
-        .cleanup = hvc_cleanup,
         .write = hvc_write,
         .hangup = hvc_hangup,
         .unthrottle = hvc_unthrottle,
@@ -830,10 +817,6 @@ static const struct tty_operations hvc_ops = {
 #endif
 };
 
-static const struct tty_port_operations hvc_port_ops = {
-        .destruct = hvc_port_destruct,
-};
-
 struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
                              const struct hv_ops *ops,
                              int outbuf_size)
@@ -859,8 +842,7 @@ struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
         hp->outbuf_size = outbuf_size;
         hp->outbuf = &((char *)hp)[ALIGN(sizeof(*hp), sizeof(long))];
 
-        tty_port_init(&hp->port);
-        hp->port.ops = &hvc_port_ops;
+        kref_init(&hp->kref);
 
         INIT_WORK(&hp->tty_resize, hvc_set_winsz);
         spin_lock_init(&hp->lock);
@@ -880,15 +862,10 @@ struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
                 i = ++last_hvc;
 
         hp->index = i;
-        cons_ops[i] = ops;
-        vtermnos[i] = vtermno;
 
         list_add_tail(&(hp->next), &hvc_structs);
         spin_unlock(&hvc_structs_lock);
 
-        /* check if we need to re-register the kernel console */
-        hvc_check_console(i);
-
         return hp;
 }
 EXPORT_SYMBOL_GPL(hvc_alloc);
@@ -898,15 +875,11 @@ int hvc_remove(struct hvc_struct *hp)
         unsigned long flags;
         struct tty_struct *tty;
 
-        tty = tty_port_tty_get(&hp->port);
-
         spin_lock_irqsave(&hp->lock, flags);
-        if (hp->index < MAX_NR_HVC_CONSOLES) {
-                console_lock();
+        tty = tty_kref_get(hp->tty);
+
+        if (hp->index < MAX_NR_HVC_CONSOLES)
                 vtermnos[hp->index] = -1;
-                cons_ops[hp->index] = NULL;
-                console_unlock();
-        }
 
         /* Don't whack hp->irq because tty_hangup() will need to free the irq. */
 
@@ -918,7 +891,7 @@ int hvc_remove(struct hvc_struct *hp)
          * kref cause it to be removed, which will probably be the tty_vhangup
          * below.
          */
-        tty_port_put(&hp->port);
+        kref_put(&hp->kref, destroy_hvc_struct);
 
         /*
          * This function call will auto chain call hvc_hangup.
@@ -944,6 +917,7 @@ static int hvc_init(void)
                 goto out;
         }
 
+        drv->owner = THIS_MODULE;
         drv->driver_name = "hvc";
         drv->name = "hvc";
         drv->major = HVC_MAJOR;
diff --git a/drivers/tty/hvc/hvc_console.h b/drivers/tty/hvc/hvc_console.h
index 674d23cb919..c335a1492a5 100644
--- a/drivers/tty/hvc/hvc_console.h
+++ b/drivers/tty/hvc/hvc_console.h
@@ -46,9 +46,10 @@
 #define HVC_ALLOC_TTY_ADAPTERS  8
 
 struct hvc_struct {
-        struct tty_port port;
         spinlock_t lock;
         int index;
+        struct tty_struct *tty;
+        int count;
         int do_wakeup;
         char *outbuf;
         int outbuf_size;
@@ -60,6 +61,7 @@ struct hvc_struct {
         struct winsize ws;
         struct work_struct tty_resize;
         struct list_head next;
+        struct kref kref; /* ref count & hvc_struct lifetime */
 };
 
 /* implemented by a low level driver */
diff --git a/drivers/tty/hvc/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c
index c9adb0559f6..2623e177e8d 100644
--- a/drivers/tty/hvc/hvc_irq.c
+++ b/drivers/tty/hvc/hvc_irq.c
@@ -28,7 +28,7 @@ int notifier_add_irq(struct hvc_struct *hp, int irq)
                 hp->irq_requested = 0;
                 return 0;
         }
-        rc = request_irq(irq, hvc_handle_interrupt, 0,
+        rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED,
                            "hvc_console", hp);
         if (!rc)
                 hp->irq_requested = 1;
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
deleted file mode 100644
index cd69b48f6df..00000000000
--- a/drivers/tty/hvc/hvc_opal.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * opal driver interface to hvc_console.c
- *
- * Copyright 2011 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
- *
- * 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
- *
- */
-
-#undef DEBUG
-
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/console.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/export.h>
-
-#include <asm/hvconsole.h>
-#include <asm/prom.h>
-#include <asm/firmware.h>
-#include <asm/hvsi.h>
-#include <asm/udbg.h>
-#include <asm/opal.h>
-
-#include "hvc_console.h"
-
-static const char hvc_opal_name[] = "hvc_opal";
-
-static struct of_device_id hvc_opal_match[] = {
-        { .name = "serial", .compatible = "ibm,opal-console-raw" },
-        { .name = "serial", .compatible = "ibm,opal-console-hvsi" },
-        { },
-};
-
-typedef enum hv_protocol {
-        HV_PROTOCOL_RAW,
-        HV_PROTOCOL_HVSI
-} hv_protocol_t;
-
-struct hvc_opal_priv {
-        hv_protocol_t           proto;  /* Raw data or HVSI packets */
-        struct hvsi_priv        hvsi;   /* HVSI specific data */
-};
-static struct hvc_opal_priv *hvc_opal_privs[MAX_NR_HVC_CONSOLES];
-
-/* For early boot console */
-static struct hvc_opal_priv hvc_opal_boot_priv;
-static u32 hvc_opal_boot_termno;
-
-static const struct hv_ops hvc_opal_raw_ops = {
-        .get_chars = opal_get_chars,
-        .put_chars = opal_put_chars,
-        .notifier_add = notifier_add_irq,
-        .notifier_del = notifier_del_irq,
-        .notifier_hangup = notifier_hangup_irq,
-};
-
-static int hvc_opal_hvsi_get_chars(uint32_t vtermno, char *buf, int count)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[vtermno];
-
-        if (WARN_ON(!pv))
-                return -ENODEV;
-
-        return hvsilib_get_chars(&pv->hvsi, buf, count);
-}
-
-static int hvc_opal_hvsi_put_chars(uint32_t vtermno, const char *buf, int count)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[vtermno];
-
-        if (WARN_ON(!pv))
-                return -ENODEV;
-
-        return hvsilib_put_chars(&pv->hvsi, buf, count);
-}
-
-static int hvc_opal_hvsi_open(struct hvc_struct *hp, int data)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
-        int rc;
-
-        pr_devel("HVSI@%x: do open !\n", hp->vtermno);
-
-        rc = notifier_add_irq(hp, data);
-        if (rc)
-                return rc;
-
-        return hvsilib_open(&pv->hvsi, hp);
-}
-
-static void hvc_opal_hvsi_close(struct hvc_struct *hp, int data)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
-
-        pr_devel("HVSI@%x: do close !\n", hp->vtermno);
-
-        hvsilib_close(&pv->hvsi, hp);
-
-        notifier_del_irq(hp, data);
-}
-
-void hvc_opal_hvsi_hangup(struct hvc_struct *hp, int data)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
-
-        pr_devel("HVSI@%x: do hangup !\n", hp->vtermno);
-
-        hvsilib_close(&pv->hvsi, hp);
-
-        notifier_hangup_irq(hp, data);
-}
-
-static int hvc_opal_hvsi_tiocmget(struct hvc_struct *hp)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
-
-        if (!pv)
-                return -EINVAL;
-        return pv->hvsi.mctrl;
-}
-
-static int hvc_opal_hvsi_tiocmset(struct hvc_struct *hp, unsigned int set,
-                                unsigned int clear)
-{
-        struct hvc_opal_priv *pv = hvc_opal_privs[hp->vtermno];
-
-        pr_devel("HVSI@%x: Set modem control, set=%x,clr=%x\n",
-                 hp->vtermno, set, clear);
-
-        if (set & TIOCM_DTR)
-                hvsilib_write_mctrl(&pv->hvsi, 1);
-        else if (clear & TIOCM_DTR)
-                hvsilib_write_mctrl(&pv->hvsi, 0);
-
-        return 0;
-}
-
-static const struct hv_ops hvc_opal_hvsi_ops = {
-        .get_chars = hvc_opal_hvsi_get_chars,
-        .put_chars = hvc_opal_hvsi_put_chars,
-        .notifier_add = hvc_opal_hvsi_open,
-        .notifier_del = hvc_opal_hvsi_close,
-        .notifier_hangup = hvc_opal_hvsi_hangup,
-        .tiocmget = hvc_opal_hvsi_tiocmget,
-        .tiocmset = hvc_opal_hvsi_tiocmset,
-};
-
-static int hvc_opal_probe(struct platform_device *dev)
-{
-        const struct hv_ops *ops;
-        struct hvc_struct *hp;
-        struct hvc_opal_priv *pv;
-        hv_protocol_t proto;
-        unsigned int termno, boot = 0;
-        const __be32 *reg;
-
-        if (of_device_is_compatible(dev->dev.of_node, "ibm,opal-console-raw")) {
-                proto = HV_PROTOCOL_RAW;
-                ops = &hvc_opal_raw_ops;
-        } else if (of_device_is_compatible(dev->dev.of_node,
-                                           "ibm,opal-console-hvsi")) {
-                proto = HV_PROTOCOL_HVSI;
-                ops = &hvc_opal_hvsi_ops;
-        } else {
-                pr_err("hvc_opal: Unknown protocol for %s\n",
-                       dev->dev.of_node->full_name);
-                return -ENXIO;
-        }
-
-        reg = of_get_property(dev->dev.of_node, "reg", NULL);
-        termno = reg ? be32_to_cpup(reg) : 0;
-
-        /* Is it our boot one ? */
-        if (hvc_opal_privs[termno] == &hvc_opal_boot_priv) {
-                pv = hvc_opal_privs[termno];
-                boot = 1;
-        } else if (hvc_opal_privs[termno] == NULL) {
-                pv = kzalloc(sizeof(struct hvc_opal_priv), GFP_KERNEL);
-                if (!pv)
-                        return -ENOMEM;
-                pv->proto = proto;
-                hvc_opal_privs[termno] = pv;
-                if (proto == HV_PROTOCOL_HVSI)
-                        hvsilib_init(&pv->hvsi, opal_get_chars, opal_put_chars,
-                                     termno, 0);
-
-                /* Instanciate now to establish a mapping index==vtermno */
-                hvc_instantiate(termno, termno, ops);
-        } else {
-                pr_err("hvc_opal: Device %s has duplicate terminal number #%d\n",
-                       dev->dev.of_node->full_name, termno);
-                return -ENXIO;
-        }
-
-        pr_info("hvc%d: %s protocol on %s%s\n", termno,
-                proto == HV_PROTOCOL_RAW ? "raw" : "hvsi",
-                dev->dev.of_node->full_name,
-                boot ? " (boot console)" : "");
-
-        /* We don't do IRQ yet */
-        hp = hvc_alloc(termno, 0, ops, MAX_VIO_PUT_CHARS);
-        if (IS_ERR(hp))
-                return PTR_ERR(hp);
-        dev_set_drvdata(&dev->dev, hp);
-
-        return 0;
-}
-
-static int hvc_opal_remove(struct platform_device *dev)
-{
-        struct hvc_struct *hp = dev_get_drvdata(&dev->dev);
-        int rc, termno;
-
-        termno = hp->vtermno;
-        rc = hvc_remove(hp);
-        if (rc == 0) {
-                if (hvc_opal_privs[termno] != &hvc_opal_boot_priv)
-                        kfree(hvc_opal_privs[termno]);
-                hvc_opal_privs[termno] = NULL;
-        }
-        return rc;
-}
-
-static struct platform_driver hvc_opal_driver = {
-        .probe          = hvc_opal_probe,
-        .remove         = hvc_opal_remove,
-        .driver         = {
-                .name   = hvc_opal_name,
-                .owner  = THIS_MODULE,
-                .of_match_table = hvc_opal_match,
-        }
-};
-
-static int __init hvc_opal_init(void)
-{
-        if (!firmware_has_feature(FW_FEATURE_OPAL))
-                return -ENODEV;
-
-        /* Register as a vio device to receive callbacks */
-        return platform_driver_register(&hvc_opal_driver);
-}
-module_init(hvc_opal_init);
-
-static void __exit hvc_opal_exit(void)
-{
-        platform_driver_unregister(&hvc_opal_driver);
-}
-module_exit(hvc_opal_exit);
-
-static void udbg_opal_putc(char c)
-{
-        unsigned int termno = hvc_opal_boot_termno;
-        int count = -1;
-
-        if (c == '\n')
-                udbg_opal_putc('\r');
-
-        do {
-                switch(hvc_opal_boot_priv.proto) {
-                case HV_PROTOCOL_RAW:
-                        count = opal_put_chars(termno, &c, 1);
-                        break;
-                case HV_PROTOCOL_HVSI:
-                        count = hvc_opal_hvsi_put_chars(termno, &c, 1);
-                        break;
-                }
-        } while(count == 0 || count == -EAGAIN);
-}
-
-static int udbg_opal_getc_poll(void)
-{
-        unsigned int termno = hvc_opal_boot_termno;
-        int rc = 0;
-        char c;
-
-        switch(hvc_opal_boot_priv.proto) {
-        case HV_PROTOCOL_RAW:
-                rc = opal_get_chars(termno, &c, 1);
-                break;
-        case HV_PROTOCOL_HVSI:
-                rc = hvc_opal_hvsi_get_chars(termno, &c, 1);
-                break;
-        }
-        if (!rc)
-                return -1;
-        return c;
-}
-
-static int udbg_opal_getc(void)
-{
-        int ch;
-        for (;;) {
-                ch = udbg_opal_getc_poll();
-                if (ch == -1) {
-                        /* This shouldn't be needed...but... */
-                        volatile unsigned long delay;
-                        for (delay=0; delay < 2000000; delay++)
-                                ;
-                } else {
-                        return ch;
-                }
-        }
-}
-
-static void udbg_init_opal_common(void)
-{
-        udbg_putc = udbg_opal_putc;
-        udbg_getc = udbg_opal_getc;
-        udbg_getc_poll = udbg_opal_getc_poll;
-        tb_ticks_per_usec = 0x200; /* Make udelay not suck */
-}
-
-void __init hvc_opal_init_early(void)
-{
-        struct device_node *stdout_node = NULL;
-        const u32 *termno;
-        const char *name = NULL;
-        const struct hv_ops *ops;
-        u32 index;
-
-        /* find the boot console from /chosen/stdout */
-        if (of_chosen)
-                name = of_get_property(of_chosen, "linux,stdout-path", NULL);
-        if (name) {
-                stdout_node = of_find_node_by_path(name);
-                if (!stdout_node) {
-                        pr_err("hvc_opal: Failed to locate default console!\n");
-                        return;
-                }
-        } else {
-                struct device_node *opal, *np;
-
-                /* Current OPAL takeover doesn't provide the stdout
-                 * path, so we hard wire it
-                 */
-                opal = of_find_node_by_path("/ibm,opal/consoles");
-                if (opal)
-                        pr_devel("hvc_opal: Found consoles in new location\n");
-                if (!opal) {
-                        opal = of_find_node_by_path("/ibm,opal");
-                        if (opal)
-                                pr_devel("hvc_opal: "
-                                         "Found consoles in old location\n");
-                }
-                if (!opal)
-                        return;
-                for_each_child_of_node(opal, np) {
-                        if (!strcmp(np->name, "serial")) {
-                                stdout_node = np;
-                                break;
-                        }
-                }
-                of_node_put(opal);
-        }
-        if (!stdout_node)
-                return;
-        termno = of_get_property(stdout_node, "reg", NULL);
-        index = termno ? *termno : 0;
-        if (index >= MAX_NR_HVC_CONSOLES)
-                return;
-        hvc_opal_privs[index] = &hvc_opal_boot_priv;
-
-        /* Check the protocol */
-        if (of_device_is_compatible(stdout_node, "ibm,opal-console-raw")) {
-                hvc_opal_boot_priv.proto = HV_PROTOCOL_RAW;
-                ops = &hvc_opal_raw_ops;
-                pr_devel("hvc_opal: Found RAW console\n");
-        }
-        else if (of_device_is_compatible(stdout_node,"ibm,opal-console-hvsi")) {
-                hvc_opal_boot_priv.proto = HV_PROTOCOL_HVSI;
-                ops = &hvc_opal_hvsi_ops;
-                hvsilib_init(&hvc_opal_boot_priv.hvsi, opal_get_chars,
-                             opal_put_chars, index, 1);
-                /* HVSI, perform the handshake now */
-                hvsilib_establish(&hvc_opal_boot_priv.hvsi);
-                pr_devel("hvc_opal: Found HVSI console\n");
-        } else
-                goto out;
-        hvc_opal_boot_termno = index;
-        udbg_init_opal_common();
-        add_preferred_console("hvc", index, NULL);
-        hvc_instantiate(index, index, ops);
-out:
-        of_node_put(stdout_node);
-}
-
-#ifdef CONFIG_PPC_EARLY_DEBUG_OPAL_RAW
-void __init udbg_init_debug_opal_raw(void)
-{
-        u32 index = CONFIG_PPC_EARLY_DEBUG_OPAL_VTERMNO;
-        hvc_opal_privs[index] = &hvc_opal_boot_priv;
-        hvc_opal_boot_priv.proto = HV_PROTOCOL_RAW;
-        hvc_opal_boot_termno = index;
-        udbg_init_opal_common();
-}
-#endif /* CONFIG_PPC_EARLY_DEBUG_OPAL_RAW */
-
-#ifdef CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI
-void __init udbg_init_debug_opal_hvsi(void)
-{
-        u32 index = CONFIG_PPC_EARLY_DEBUG_OPAL_VTERMNO;
-        hvc_opal_privs[index] = &hvc_opal_boot_priv;
-        hvc_opal_boot_termno = index;
-        udbg_init_opal_common();
-        hvsilib_init(&hvc_opal_boot_priv.hvsi, opal_get_chars, opal_put_chars,
-                     index, 1);
-        hvsilib_establish(&hvc_opal_boot_priv.hvsi);
-}
-#endif /* CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI */
diff --git a/drivers/tty/hvc/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
index 0069bb86ba4..61c4a61558d 100644
--- a/drivers/tty/hvc/hvc_rtas.c
+++ b/drivers/tty/hvc/hvc_rtas.c
@@ -94,7 +94,7 @@ static int __init hvc_rtas_init(void)
 
         /* Allocate an hvc_struct for the console device we instantiated
          * earlier.  Save off hp so that we can return it on exit */
-        hp = hvc_alloc(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops, 16);
+        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
 
diff --git a/drivers/tty/hvc/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
index 72228276fe3..b0957e61a7b 100644
--- a/drivers/tty/hvc/hvc_udbg.c
+++ b/drivers/tty/hvc/hvc_udbg.c
@@ -36,7 +36,7 @@ static int hvc_udbg_put(uint32_t vtermno, const char *buf, int count)
 {
         int i;
 
-        for (i = 0; i < count && udbg_putc; i++)
+        for (i = 0; i < count; i++)
                 udbg_putc(buf[i]);
 
         return i;
@@ -67,12 +67,9 @@ static int __init hvc_udbg_init(void)
 {
         struct hvc_struct *hp;
 
-        if (!udbg_putc)
-                return -ENODEV;
-
         BUG_ON(hvc_udbg_dev);
 
-        hp = hvc_alloc(0, 0, &hvc_udbg_ops, 16);
+        hp = hvc_alloc(0, NO_IRQ, &hvc_udbg_ops, 16);
         if (IS_ERR(hp))
                 return PTR_ERR(hp);
 
@@ -91,9 +88,6 @@ module_exit(hvc_udbg_exit);
 
 static int __init hvc_udbg_console_init(void)
 {
-        if (!udbg_putc)
-                return -ENODEV;
-
         hvc_instantiate(0, 0, &hvc_udbg_ops);
         add_preferred_console("hvc", 0, NULL);
 
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 0c629807610..130aace67f3 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -41,11 +41,11 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/console.h>
-#include <linux/module.h>
 
 #include <asm/hvconsole.h>
 #include <asm/vio.h>
 #include <asm/prom.h>
+#include <asm/firmware.h>
 #include <asm/hvsi.h>
 #include <asm/udbg.h>
 
@@ -53,7 +53,7 @@
 
 static const char hvc_driver_name[] = "hvc_console";
 
-static struct vio_device_id hvc_driver_table[] = {
+static struct vio_device_id hvc_driver_table[] __devinitdata = {
         {"serial", "hvterm1"},
 #ifndef HVC_OLD_HVSI
         {"serial", "hvterm-protocol"},
@@ -230,70 +230,7 @@ static const struct hv_ops hvterm_hvsi_ops = {
         .tiocmset = hvterm_hvsi_tiocmset,
 };
 
-static void udbg_hvc_putc(char c)
-{
-        int count = -1;
-
-        if (!hvterm_privs[0])
-                return;
-
-        if (c == '\n')
-                udbg_hvc_putc('\r');
-
-        do {
-                switch(hvterm_privs[0]->proto) {
-                case HV_PROTOCOL_RAW:
-                        count = hvterm_raw_put_chars(0, &c, 1);
-                        break;
-                case HV_PROTOCOL_HVSI:
-                        count = hvterm_hvsi_put_chars(0, &c, 1);
-                        break;
-                }
-        } while(count == 0);
-}
-
-static int udbg_hvc_getc_poll(void)
-{
-        int rc = 0;
-        char c;
-
-        if (!hvterm_privs[0])
-                return -1;
-
-        switch(hvterm_privs[0]->proto) {
-        case HV_PROTOCOL_RAW:
-                rc = hvterm_raw_get_chars(0, &c, 1);
-                break;
-        case HV_PROTOCOL_HVSI:
-                rc = hvterm_hvsi_get_chars(0, &c, 1);
-                break;
-        }
-        if (!rc)
-                return -1;
-        return c;
-}
-
-static int udbg_hvc_getc(void)
-{
-        int ch;
-
-        if (!hvterm_privs[0])
-                return -1;
-
-        for (;;) {
-                ch = udbg_hvc_getc_poll();
-                if (ch == -1) {
-                        /* This shouldn't be needed...but... */
-                        volatile unsigned long delay;
-                        for (delay=0; delay < 2000000; delay++)
-                                ;
-                } else {
-                        return ch;
-                }
-        }
-}
-
-static int hvc_vio_probe(struct vio_dev *vdev,
+static int __devinit hvc_vio_probe(struct vio_dev *vdev,
                                    const struct vio_device_id *id)
 {
         const struct hv_ops *ops;
@@ -313,7 +250,7 @@ static int hvc_vio_probe(struct vio_dev *vdev,
                 proto = HV_PROTOCOL_HVSI;
                 ops = &hvterm_hvsi_ops;
         } else {
-                pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name);
+                pr_err("hvc_vio: Unkown protocol for %s\n", vdev->dev.of_node->full_name);
                 return -ENXIO;
         }
 
@@ -352,17 +289,10 @@ static int hvc_vio_probe(struct vio_dev *vdev,
                 return PTR_ERR(hp);
         dev_set_drvdata(&vdev->dev, hp);
 
-        /* register udbg if it's not there already for console 0 */
-        if (hp->index == 0 && !udbg_putc) {
-                udbg_putc = udbg_hvc_putc;
-                udbg_getc = udbg_hvc_getc;
-                udbg_getc_poll = udbg_hvc_getc_poll;
-        }
-
         return 0;
 }
 
-static int hvc_vio_remove(struct vio_dev *vdev)
+static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 {
         struct hvc_struct *hp = dev_get_drvdata(&vdev->dev);
         int rc, termno;
@@ -380,14 +310,20 @@ static int hvc_vio_remove(struct vio_dev *vdev)
 static struct vio_driver hvc_vio_driver = {
         .id_table       = hvc_driver_table,
         .probe          = hvc_vio_probe,
-        .remove         = hvc_vio_remove,
-        .name           = hvc_driver_name,
+        .remove         = __devexit_p(hvc_vio_remove),
+        .driver         = {
+                .name   = hvc_driver_name,
+                .owner  = THIS_MODULE,
+        }
 };
 
 static int __init hvc_vio_init(void)
 {
         int rc;
 
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return -EIO;
+
         /* Register as a vio device to receive callbacks */
         rc = vio_register_driver(&hvc_vio_driver);
 
@@ -401,6 +337,59 @@ static void __exit hvc_vio_exit(void)
 }
 module_exit(hvc_vio_exit);
 
+static void udbg_hvc_putc(char c)
+{
+        int count = -1;
+
+        if (c == '\n')
+                udbg_hvc_putc('\r');
+
+        do {
+                switch(hvterm_priv0.proto) {
+                case HV_PROTOCOL_RAW:
+                        count = hvterm_raw_put_chars(0, &c, 1);
+                        break;
+                case HV_PROTOCOL_HVSI:
+                        count = hvterm_hvsi_put_chars(0, &c, 1);
+                        break;
+                }
+        } while(count == 0);
+}
+
+static int udbg_hvc_getc_poll(void)
+{
+        int rc = 0;
+        char c;
+
+        switch(hvterm_priv0.proto) {
+        case HV_PROTOCOL_RAW:
+                rc = hvterm_raw_get_chars(0, &c, 1);
+                break;
+        case HV_PROTOCOL_HVSI:
+                rc = hvterm_hvsi_get_chars(0, &c, 1);
+                break;
+        }
+        if (!rc)
+                return -1;
+        return c;
+}
+
+static int udbg_hvc_getc(void)
+{
+        int ch;
+        for (;;) {
+                ch = udbg_hvc_getc_poll();
+                if (ch == -1) {
+                        /* This shouldn't be needed...but... */
+                        volatile unsigned long delay;
+                        for (delay=0; delay < 2000000; delay++)
+                                ;
+                } else {
+                        return ch;
+                }
+        }
+}
+
 void __init hvc_vio_init_early(void)
 {
         struct device_node *stdout_node;
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 19843ec3f80..52fdf60bdbe 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -21,78 +21,46 @@
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/irq.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/list.h>
 
-#include <asm/io.h>
 #include <asm/xen/hypervisor.h>
 
 #include <xen/xen.h>
-#include <xen/interface/xen.h>
-#include <xen/hvm.h>
-#include <xen/grant_table.h>
 #include <xen/page.h>
 #include <xen/events.h>
 #include <xen/interface/io/console.h>
-#include <xen/interface/sched.h>
 #include <xen/hvc-console.h>
-#include <xen/xenbus.h>
 
 #include "hvc_console.h"
 
 #define HVC_COOKIE   0x58656e /* "Xen" in hex */
 
-struct xencons_info {
-        struct list_head list;
-        struct xenbus_device *xbdev;
-        struct xencons_interface *intf;
-        unsigned int evtchn;
-        struct hvc_struct *hvc;
-        int irq;
-        int vtermno;
-        grant_ref_t gntref;
-};
-
-static LIST_HEAD(xenconsoles);
-static DEFINE_SPINLOCK(xencons_lock);
+static struct hvc_struct *hvc;
+static int xencons_irq;
 
 /* ------------------------------------------------------------------ */
 
-static struct xencons_info *vtermno_to_xencons(int vtermno)
-{
-        struct xencons_info *entry, *n, *ret = NULL;
-
-        if (list_empty(&xenconsoles))
-                        return NULL;
+static unsigned long console_pfn = ~0ul;
 
-        list_for_each_entry_safe(entry, n, &xenconsoles, list) {
-                if (entry->vtermno == vtermno) {
-                        ret  = entry;
-                        break;
-                }
-        }
-
-        return ret;
-}
-
-static inline int xenbus_devid_to_vtermno(int devid)
+static inline struct xencons_interface *xencons_interface(void)
 {
-        return devid + HVC_COOKIE;
+        if (console_pfn == ~0ul)
+                return mfn_to_virt(xen_start_info->console.domU.mfn);
+        else
+                return __va(console_pfn << PAGE_SHIFT);
 }
 
-static inline void notify_daemon(struct xencons_info *cons)
+static inline void notify_daemon(void)
 {
         /* Use evtchn: this is called early, before irq is set up. */
-        notify_remote_via_evtchn(cons->evtchn);
+        notify_remote_via_evtchn(xen_start_info->console.domU.evtchn);
 }
 
-static int __write_console(struct xencons_info *xencons,
-                const char *data, int len)
+static int __write_console(const char *data, int len)
 {
+        struct xencons_interface *intf = xencons_interface();
         XENCONS_RING_IDX cons, prod;
-        struct xencons_interface *intf = xencons->intf;
         int sent = 0;
 
         cons = intf->out_cons;
@@ -107,16 +75,13 @@ static int __write_console(struct xencons_info *xencons,
         intf->out_prod = prod;
 
         if (sent)
-                notify_daemon(xencons);
+                notify_daemon();
         return sent;
 }
 
 static int domU_write_console(uint32_t vtermno, const char *data, int len)
 {
         int ret = len;
-        struct xencons_info *cons = vtermno_to_xencons(vtermno);
-        if (cons == NULL)
-                return -EINVAL;
 
         /*
          * Make sure the whole buffer is emitted, polling if
@@ -125,7 +90,7 @@ static int domU_write_console(uint32_t vtermno, const char *data, int len)
          * kernel is crippled.
          */
         while (len) {
-                int sent = __write_console(cons, data, len);
+                int sent = __write_console(data, len);
                 
                 data += sent;
                 len -= sent;
@@ -139,13 +104,9 @@ static int domU_write_console(uint32_t vtermno, const char *data, int len)
 
 static int domU_read_console(uint32_t vtermno, char *buf, int len)
 {
-        struct xencons_interface *intf;
+        struct xencons_interface *intf = xencons_interface();
         XENCONS_RING_IDX cons, prod;
         int recv = 0;
-        struct xencons_info *xencons = vtermno_to_xencons(vtermno);
-        if (xencons == NULL)
-                return -EINVAL;
-        intf = xencons->intf;
 
         cons = intf->in_cons;
         prod = intf->in_prod;
@@ -158,7 +119,7 @@ static int domU_read_console(uint32_t vtermno, char *buf, int len)
         mb();                   /* read ring before consuming */
         intf->in_cons = cons;
 
-        notify_daemon(xencons);
+        notify_daemon();
         return recv;
 }
 
@@ -196,410 +157,68 @@ static struct hv_ops dom0_hvc_ops = {
         .notifier_hangup = notifier_hangup_irq,
 };
 
-static int xen_hvm_console_init(void)
-{
-        int r;
-        uint64_t v = 0;
-        unsigned long mfn;
-        struct xencons_info *info;
-
-        if (!xen_hvm_domain())
-                return -ENODEV;
-
-        info = vtermno_to_xencons(HVC_COOKIE);
-        if (!info) {
-                info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
-                if (!info)
-                        return -ENOMEM;
-        } else if (info->intf != NULL) {
-                /* already configured */
-                return 0;
-        }
-        /*
-         * If the toolstack (or the hypervisor) hasn't set these values, the
-         * default value is 0. Even though mfn = 0 and evtchn = 0 are
-         * theoretically correct values, in practice they never are and they
-         * mean that a legacy toolstack hasn't initialized the pv console correctly.
-         */
-        r = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);
-        if (r < 0 || v == 0)
-                goto err;
-        info->evtchn = v;
-        v = 0;
-        r = hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
-        if (r < 0 || v == 0)
-                goto err;
-        mfn = v;
-        info->intf = ioremap(mfn << PAGE_SHIFT, PAGE_SIZE);
-        if (info->intf == NULL)
-                goto err;
-        info->vtermno = HVC_COOKIE;
-
-        spin_lock(&xencons_lock);
-        list_add_tail(&info->list, &xenconsoles);
-        spin_unlock(&xencons_lock);
-
-        return 0;
-err:
-        kfree(info);
-        return -ENODEV;
-}
-
-static int xen_pv_console_init(void)
+static int __init xen_hvc_init(void)
 {
-        struct xencons_info *info;
+        struct hvc_struct *hp;
+        struct hv_ops *ops;
 
         if (!xen_pv_domain())
                 return -ENODEV;
 
-        if (!xen_start_info->console.domU.evtchn)
-                return -ENODEV;
-
-        info = vtermno_to_xencons(HVC_COOKIE);
-        if (!info) {
-                info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
-                if (!info)
-                        return -ENOMEM;
-        } else if (info->intf != NULL) {
-                /* already configured */
-                return 0;
-        }
-        info->evtchn = xen_start_info->console.domU.evtchn;
-        info->intf = mfn_to_virt(xen_start_info->console.domU.mfn);
-        info->vtermno = HVC_COOKIE;
-
-        spin_lock(&xencons_lock);
-        list_add_tail(&info->list, &xenconsoles);
-        spin_unlock(&xencons_lock);
-
-        return 0;
-}
-
-static int xen_initial_domain_console_init(void)
-{
-        struct xencons_info *info;
-
-        if (!xen_initial_domain())
-                return -ENODEV;
-
-        info = vtermno_to_xencons(HVC_COOKIE);
-        if (!info) {
-                info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL | __GFP_ZERO);
-                if (!info)
-                        return -ENOMEM;
-        }
-
-        info->irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
-        info->vtermno = HVC_COOKIE;
-
-        spin_lock(&xencons_lock);
-        list_add_tail(&info->list, &xenconsoles);
-        spin_unlock(&xencons_lock);
-
-        return 0;
-}
-
-void xen_console_resume(void)
-{
-        struct xencons_info *info = vtermno_to_xencons(HVC_COOKIE);
-        if (info != NULL && info->irq)
-                rebind_evtchn_irq(info->evtchn, info->irq);
-}
-
-static void xencons_disconnect_backend(struct xencons_info *info)
-{
-        if (info->irq > 0)
-                unbind_from_irqhandler(info->irq, NULL);
-        info->irq = 0;
-        if (info->evtchn > 0)
-                xenbus_free_evtchn(info->xbdev, info->evtchn);
-        info->evtchn = 0;
-        if (info->gntref > 0)
-                gnttab_free_grant_references(info->gntref);
-        info->gntref = 0;
-        if (info->hvc != NULL)
-                hvc_remove(info->hvc);
-        info->hvc = NULL;
-}
-
-static void xencons_free(struct xencons_info *info)
-{
-        free_page((unsigned long)info->intf);
-        info->intf = NULL;
-        info->vtermno = 0;
-        kfree(info);
-}
+        if (xen_initial_domain()) {
+                ops = &dom0_hvc_ops;
+                xencons_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
+        } else {
+                if (!xen_start_info->console.domU.evtchn)
+                        return -ENODEV;
 
-static int xen_console_remove(struct xencons_info *info)
-{
-        xencons_disconnect_backend(info);
-        spin_lock(&xencons_lock);
-        list_del(&info->list);
-        spin_unlock(&xencons_lock);
-        if (info->xbdev != NULL)
-                xencons_free(info);
-        else {
-                if (xen_hvm_domain())
-                        iounmap(info->intf);
-                kfree(info);
+                ops = &domU_hvc_ops;
+                xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);
         }
-        return 0;
-}
-
-#ifdef CONFIG_HVC_XEN_FRONTEND
-static struct xenbus_driver xencons_driver;
-
-static int xencons_remove(struct xenbus_device *dev)
-{
-        return xen_console_remove(dev_get_drvdata(&dev->dev));
-}
-
-static int xencons_connect_backend(struct xenbus_device *dev,
-                                  struct xencons_info *info)
-{
-        int ret, evtchn, devid, ref, irq;
-        struct xenbus_transaction xbt;
-        grant_ref_t gref_head;
-        unsigned long mfn;
-
-        ret = xenbus_alloc_evtchn(dev, &evtchn);
-        if (ret)
-                return ret;
-        info->evtchn = evtchn;
-        irq = bind_evtchn_to_irq(evtchn);
-        if (irq < 0)
-                return irq;
-        info->irq = irq;
-        devid = dev->nodename[strlen(dev->nodename) - 1] - '0';
-        info->hvc = hvc_alloc(xenbus_devid_to_vtermno(devid),
-                        irq, &domU_hvc_ops, 256);
-        if (IS_ERR(info->hvc))
-                return PTR_ERR(info->hvc);
-        if (xen_pv_domain())
-                mfn = virt_to_mfn(info->intf);
+        if (xencons_irq < 0)
+                xencons_irq = 0; /* NO_IRQ */
         else
-                mfn = __pa(info->intf) >> PAGE_SHIFT;
-        ret = gnttab_alloc_grant_references(1, &gref_head);
-        if (ret < 0)
-                return ret;
-        info->gntref = gref_head;
-        ref = gnttab_claim_grant_reference(&gref_head);
-        if (ref < 0)
-                return ref;
-        gnttab_grant_foreign_access_ref(ref, info->xbdev->otherend_id,
-                        mfn, 0);
-
- again:
-        ret = xenbus_transaction_start(&xbt);
-        if (ret) {
-                xenbus_dev_fatal(dev, ret, "starting transaction");
-                return ret;
-        }
-        ret = xenbus_printf(xbt, dev->nodename, "ring-ref", "%d", ref);
-        if (ret)
-                goto error_xenbus;
-        ret = xenbus_printf(xbt, dev->nodename, "port", "%u",
-                            evtchn);
-        if (ret)
-                goto error_xenbus;
-        ret = xenbus_printf(xbt, dev->nodename, "type", "ioemu");
-        if (ret)
-                goto error_xenbus;
-        ret = xenbus_transaction_end(xbt, 0);
-        if (ret) {
-                if (ret == -EAGAIN)
-                        goto again;
-                xenbus_dev_fatal(dev, ret, "completing transaction");
-                return ret;
-        }
+                irq_set_noprobe(xencons_irq);
 
-        xenbus_switch_state(dev, XenbusStateInitialised);
-        return 0;
+        hp = hvc_alloc(HVC_COOKIE, xencons_irq, ops, 256);
+        if (IS_ERR(hp))
+                return PTR_ERR(hp);
 
- error_xenbus:
-        xenbus_transaction_end(xbt, 1);
-        xenbus_dev_fatal(dev, ret, "writing xenstore");
-        return ret;
-}
+        hvc = hp;
 
-static int xencons_probe(struct xenbus_device *dev,
-                                  const struct xenbus_device_id *id)
-{
-        int ret, devid;
-        struct xencons_info *info;
-
-        devid = dev->nodename[strlen(dev->nodename) - 1] - '0';
-        if (devid == 0)
-                return -ENODEV;
-
-        info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL);
-        if (!info)
-                return -ENOMEM;
-        dev_set_drvdata(&dev->dev, info);
-        info->xbdev = dev;
-        info->vtermno = xenbus_devid_to_vtermno(devid);
-        info->intf = (void *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
-        if (!info->intf)
-                goto error_nomem;
-
-        ret = xencons_connect_backend(dev, info);
-        if (ret < 0)
-                goto error;
-        spin_lock(&xencons_lock);
-        list_add_tail(&info->list, &xenconsoles);
-        spin_unlock(&xencons_lock);
+        console_pfn = mfn_to_pfn(xen_start_info->console.domU.mfn);
 
         return 0;
-
- error_nomem:
-        ret = -ENOMEM;
-        xenbus_dev_fatal(dev, ret, "allocating device memory");
- error:
-        xencons_disconnect_backend(info);
-        xencons_free(info);
-        return ret;
-}
-
-static int xencons_resume(struct xenbus_device *dev)
-{
-        struct xencons_info *info = dev_get_drvdata(&dev->dev);
-
-        xencons_disconnect_backend(info);
-        memset(info->intf, 0, PAGE_SIZE);
-        return xencons_connect_backend(dev, info);
-}
-
-static void xencons_backend_changed(struct xenbus_device *dev,
-                                   enum xenbus_state backend_state)
-{
-        switch (backend_state) {
-        case XenbusStateReconfiguring:
-        case XenbusStateReconfigured:
-        case XenbusStateInitialising:
-        case XenbusStateInitialised:
-        case XenbusStateUnknown:
-                break;
-
-        case XenbusStateInitWait:
-                break;
-
-        case XenbusStateConnected:
-                xenbus_switch_state(dev, XenbusStateConnected);
-                break;
-
-        case XenbusStateClosed:
-                if (dev->state == XenbusStateClosed)
-                        break;
-                /* Missed the backend's CLOSING state -- fallthrough */
-        case XenbusStateClosing:
-                xenbus_frontend_closed(dev);
-                break;
-        }
 }
 
-static const struct xenbus_device_id xencons_ids[] = {
-        { "console" },
-        { "" }
-};
-
-
-static DEFINE_XENBUS_DRIVER(xencons, "xenconsole",
-        .probe = xencons_probe,
-        .remove = xencons_remove,
-        .resume = xencons_resume,
-        .otherend_changed = xencons_backend_changed,
-);
-#endif /* CONFIG_HVC_XEN_FRONTEND */
-
-static int __init xen_hvc_init(void)
+void xen_console_resume(void)
 {
-        int r;
-        struct xencons_info *info;
-        const struct hv_ops *ops;
-
-        if (!xen_domain())
-                return -ENODEV;
-
-        if (xen_initial_domain()) {
-                ops = &dom0_hvc_ops;
-                r = xen_initial_domain_console_init();
-                if (r < 0)
-                        return r;
-                info = vtermno_to_xencons(HVC_COOKIE);
-        } else {
-                ops = &domU_hvc_ops;
-                if (xen_hvm_domain())
-                        r = xen_hvm_console_init();
-                else
-                        r = xen_pv_console_init();
-                if (r < 0)
-                        return r;
-
-                info = vtermno_to_xencons(HVC_COOKIE);
-                info->irq = bind_evtchn_to_irq(info->evtchn);
-        }
-        if (info->irq < 0)
-                info->irq = 0; /* NO_IRQ */
-        else
-                irq_set_noprobe(info->irq);
-
-        info->hvc = hvc_alloc(HVC_COOKIE, info->irq, ops, 256);
-        if (IS_ERR(info->hvc)) {
-                r = PTR_ERR(info->hvc);
-                spin_lock(&xencons_lock);
-                list_del(&info->list);
-                spin_unlock(&xencons_lock);
-                if (info->irq)
-                        unbind_from_irqhandler(info->irq, NULL);
-                kfree(info);
-                return r;
-        }
-
-        r = 0;
-#ifdef CONFIG_HVC_XEN_FRONTEND
-        r = xenbus_register_frontend(&xencons_driver);
-#endif
-        return r;
+        if (xencons_irq)
+                rebind_evtchn_irq(xen_start_info->console.domU.evtchn, xencons_irq);
 }
 
 static void __exit xen_hvc_fini(void)
 {
-        struct xencons_info *entry, *next;
-
-        if (list_empty(&xenconsoles))
-                        return;
-
-        list_for_each_entry_safe(entry, next, &xenconsoles, list) {
-                xen_console_remove(entry);
-        }
+        if (hvc)
+                hvc_remove(hvc);
 }
 
 static int xen_cons_init(void)
 {
-        const struct hv_ops *ops;
+        struct hv_ops *ops;
 
-        if (!xen_domain())
+        if (!xen_pv_domain())
                 return 0;
 
         if (xen_initial_domain())
                 ops = &dom0_hvc_ops;
-        else {
-                int r;
+        else
                 ops = &domU_hvc_ops;
 
-                if (xen_hvm_domain())
-                        r = xen_hvm_console_init();
-                else
-                        r = xen_pv_console_init();
-                if (r < 0)
-                        return r;
-        }
-
         hvc_instantiate(HVC_COOKIE, 0, ops);
         return 0;
 }
 
-
 module_init(xen_hvc_init);
 module_exit(xen_hvc_fini);
 console_initcall(xen_cons_init);
@@ -611,9 +230,6 @@ static void xenboot_write_console(struct console *console, const char *string,
         unsigned int linelen, off = 0;
         const char *pos;
 
-        if (!xen_pv_domain())
-                return;
-
         dom0_write_console(0, string, len);
 
         if (xen_initial_domain())
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 87763573395..4c8b6654693 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -261,7 +261,6 @@ static DEFINE_SPINLOCK(hvcs_pi_lock);
 
 /* One vty-server per hvcs_struct */
 struct hvcs_struct {
-        struct tty_port port;
         spinlock_t lock;
 
         /*
@@ -270,6 +269,9 @@ struct hvcs_struct {
          */
         unsigned int index;
 
+        struct tty_struct *tty;
+        int open_count;
+
         /*
          * Used to tell the driver kernel_thread what operations need to take
          * place upon this hvcs_struct instance.
@@ -288,11 +290,12 @@ struct hvcs_struct {
         int chars_in_buffer;
 
         /*
-         * Any variable below is valid before a tty is connected and
+         * Any variable below the kref is valid before a tty is connected and
          * stays valid after the tty is disconnected.  These shouldn't be
          * whacked until the kobject refcount reaches zero though some entries
          * may be changed via sysfs initiatives.
          */
+        struct kref kref; /* ref count & hvcs_struct lifetime */
         int connected; /* is the vty-server currently connected to a vty? */
         uint32_t p_unit_address; /* partner unit address */
         uint32_t p_partition_ID; /* partner partition ID */
@@ -301,6 +304,9 @@ struct hvcs_struct {
         struct vio_dev *vdev;
 };
 
+/* Required to back map a kref to its containing object */
+#define from_kref(k) container_of(k, struct hvcs_struct, kref)
+
 static LIST_HEAD(hvcs_structs);
 static DEFINE_SPINLOCK(hvcs_structs_lock);
 static DEFINE_MUTEX(hvcs_init_mutex);
@@ -330,12 +336,12 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp);
 static void hvcs_close(struct tty_struct *tty, struct file *filp);
 static void hvcs_hangup(struct tty_struct * tty);
 
-static int hvcs_probe(struct vio_dev *dev,
+static int __devinit hvcs_probe(struct vio_dev *dev,
                 const struct vio_device_id *id);
-static int hvcs_remove(struct vio_dev *dev);
+static int __devexit hvcs_remove(struct vio_dev *dev);
 static int __init hvcs_module_init(void);
 static void __exit hvcs_module_exit(void);
-static int hvcs_initialize(void);
+static int __devinit hvcs_initialize(void);
 
 #define HVCS_SCHED_READ 0x00000001
 #define HVCS_QUICK_READ 0x00000002
@@ -416,7 +422,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
 
         spin_lock_irqsave(&hvcsd->lock, flags);
 
-        if (hvcsd->port.count > 0) {
+        if (hvcsd->open_count > 0) {
                 spin_unlock_irqrestore(&hvcsd->lock, flags);
                 printk(KERN_INFO "HVCS: vterm state unchanged.  "
                                 "The hvcs device node is still in use.\n");
@@ -558,7 +564,7 @@ static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance)
 static void hvcs_try_write(struct hvcs_struct *hvcsd)
 {
         uint32_t unit_address = hvcsd->vdev->unit_address;
-        struct tty_struct *tty = hvcsd->port.tty;
+        struct tty_struct *tty = hvcsd->tty;
         int sent;
 
         if (hvcsd->todo_mask & HVCS_TRY_WRITE) {
@@ -596,7 +602,7 @@ static int hvcs_io(struct hvcs_struct *hvcsd)
         spin_lock_irqsave(&hvcsd->lock, flags);
 
         unit_address = hvcsd->vdev->unit_address;
-        tty = hvcsd->port.tty;
+        tty = hvcsd->tty;
 
         hvcs_try_write(hvcsd);
 
@@ -676,7 +682,7 @@ static int khvcsd(void *unused)
         return 0;
 }
 
-static struct vio_device_id hvcs_driver_table[] = {
+static struct vio_device_id hvcs_driver_table[] __devinitdata= {
         {"serial-server", "hvterm2"},
         { "", "" }
 };
@@ -695,9 +701,10 @@ static void hvcs_return_index(int index)
                 hvcs_index_list[index] = -1;
 }
 
-static void hvcs_destruct_port(struct tty_port *p)
+/* callback when the kref ref count reaches zero */
+static void destroy_hvcs_struct(struct kref *kref)
 {
-        struct hvcs_struct *hvcsd = container_of(p, struct hvcs_struct, port);
+        struct hvcs_struct *hvcsd = from_kref(kref);
         struct vio_dev *vdev;
         unsigned long flags;
 
@@ -734,10 +741,6 @@ static void hvcs_destruct_port(struct tty_port *p)
         kfree(hvcsd);
 }
 
-static const struct tty_port_operations hvcs_port_ops = {
-        .destruct = hvcs_destruct_port,
-};
-
 static int hvcs_get_index(void)
 {
         int i;
@@ -756,7 +759,7 @@ static int hvcs_get_index(void)
         return -1;
 }
 
-static int hvcs_probe(
+static int __devinit hvcs_probe(
         struct vio_dev *dev,
         const struct vio_device_id *id)
 {
@@ -786,9 +789,10 @@ static int hvcs_probe(
         if (!hvcsd)
                 return -ENODEV;
 
-        tty_port_init(&hvcsd->port);
-        hvcsd->port.ops = &hvcs_port_ops;
+
         spin_lock_init(&hvcsd->lock);
+        /* Automatically incs the refcount the first time */
+        kref_init(&hvcsd->kref);
 
         hvcsd->vdev = dev;
         dev_set_drvdata(&dev->dev, hvcsd);
@@ -835,7 +839,7 @@ static int hvcs_probe(
         return 0;
 }
 
-static int hvcs_remove(struct vio_dev *dev)
+static int __devexit hvcs_remove(struct vio_dev *dev)
 {
         struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev);
         unsigned long flags;
@@ -848,7 +852,7 @@ static int hvcs_remove(struct vio_dev *dev)
 
         spin_lock_irqsave(&hvcsd->lock, flags);
 
-        tty = hvcsd->port.tty;
+        tty = hvcsd->tty;
 
         spin_unlock_irqrestore(&hvcsd->lock, flags);
 
@@ -856,7 +860,7 @@ static int hvcs_remove(struct vio_dev *dev)
          * Let the last holder of this object cause it to be removed, which
          * would probably be tty_hangup below.
          */
-        tty_port_put(&hvcsd->port);
+        kref_put(&hvcsd->kref, destroy_hvcs_struct);
 
         /*
          * The hangup is a scheduled function which will auto chain call
@@ -874,8 +878,11 @@ static int hvcs_remove(struct vio_dev *dev)
 static struct vio_driver hvcs_vio_driver = {
         .id_table       = hvcs_driver_table,
         .probe          = hvcs_probe,
-        .remove         = hvcs_remove,
-        .name           = hvcs_driver_name,
+        .remove         = __devexit_p(hvcs_remove),
+        .driver         = {
+                .name   = hvcs_driver_name,
+                .owner  = THIS_MODULE,
+        }
 };
 
 /* Only called from hvcs_get_pi please */
@@ -1050,7 +1057,7 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
          * the conn was registered and now.
          */
         if (!(rc = request_irq(irq, &hvcs_handle_interrupt,
-                                0, "ibmhvcs", hvcsd))) {
+                                IRQF_DISABLED, "ibmhvcs", hvcsd))) {
                 /*
                  * It is possible the vty-server was removed after the irq was
                  * requested but before we have time to enable interrupts.
@@ -1083,39 +1090,50 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
  */
 static struct hvcs_struct *hvcs_get_by_index(int index)
 {
-        struct hvcs_struct *hvcsd;
+        struct hvcs_struct *hvcsd = NULL;
         unsigned long flags;
 
         spin_lock(&hvcs_structs_lock);
-        list_for_each_entry(hvcsd, &hvcs_structs, next) {
-                spin_lock_irqsave(&hvcsd->lock, flags);
-                if (hvcsd->index == index) {
-                        tty_port_get(&hvcsd->port);
+        /* We can immediately discard OOB requests */
+        if (index >= 0 && index < HVCS_MAX_SERVER_ADAPTERS) {
+                list_for_each_entry(hvcsd, &hvcs_structs, next) {
+                        spin_lock_irqsave(&hvcsd->lock, flags);
+                        if (hvcsd->index == index) {
+                                kref_get(&hvcsd->kref);
+                                spin_unlock_irqrestore(&hvcsd->lock, flags);
+                                spin_unlock(&hvcs_structs_lock);
+                                return hvcsd;
+                        }
                         spin_unlock_irqrestore(&hvcsd->lock, flags);
-                        spin_unlock(&hvcs_structs_lock);
-                        return hvcsd;
                 }
-                spin_unlock_irqrestore(&hvcsd->lock, flags);
+                hvcsd = NULL;
         }
-        spin_unlock(&hvcs_structs_lock);
 
-        return NULL;
+        spin_unlock(&hvcs_structs_lock);
+        return hvcsd;
 }
 
-static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
+/*
+ * This is invoked via the tty_open interface when a user app connects to the
+ * /dev node.
+ */
+static int hvcs_open(struct tty_struct *tty, struct file *filp)
 {
         struct hvcs_struct *hvcsd;
-        struct vio_dev *vdev;
-        unsigned long unit_address, flags;
+        int rc, retval = 0;
+        unsigned long flags;
         unsigned int irq;
-        int retval;
+        struct vio_dev *vdev;
+        unsigned long unit_address;
+
+        if (tty->driver_data)
+                goto fast_open;
 
         /*
          * Is there a vty-server that shares the same index?
          * This function increments the kref index.
          */
-        hvcsd = hvcs_get_by_index(tty->index);
-        if (!hvcsd) {
+        if (!(hvcsd = hvcs_get_by_index(tty->index))) {
                 printk(KERN_WARNING "HVCS: open failed, no device associated"
                                 " with tty->index %d.\n", tty->index);
                 return -ENODEV;
@@ -1123,17 +1141,12 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
 
         spin_lock_irqsave(&hvcsd->lock, flags);
 
-        if (hvcsd->connected == 0) {
-                retval = hvcs_partner_connect(hvcsd);
-                if (retval) {
-                        spin_unlock_irqrestore(&hvcsd->lock, flags);
-                        printk(KERN_WARNING "HVCS: partner connect failed.\n");
-                        goto err_put;
-                }
-        }
+        if (hvcsd->connected == 0)
+                if ((retval = hvcs_partner_connect(hvcsd)))
+                        goto error_release;
 
-        hvcsd->port.count = 0;
-        hvcsd->port.tty = tty;
+        hvcsd->open_count = 1;
+        hvcsd->tty = tty;
         tty->driver_data = hvcsd;
 
         memset(&hvcsd->buffer[0], 0x00, HVCS_BUFF_LEN);
@@ -1153,55 +1166,44 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
          * This must be done outside of the spinlock because it requests irqs
          * and will grab the spinlock and free the connection if it fails.
          */
-        retval = hvcs_enable_device(hvcsd, unit_address, irq, vdev);
-        if (retval) {
+        if (((rc = hvcs_enable_device(hvcsd, unit_address, irq, vdev)))) {
+                kref_put(&hvcsd->kref, destroy_hvcs_struct);
                 printk(KERN_WARNING "HVCS: enable device failed.\n");
-                goto err_put;
+                return rc;
         }
 
-        retval = tty_port_install(&hvcsd->port, driver, tty);
-        if (retval)
-                goto err_irq;
+        goto open_success;
 
-        return 0;
-err_irq:
-        spin_lock_irqsave(&hvcsd->lock, flags);
-        vio_disable_interrupts(hvcsd->vdev);
-        spin_unlock_irqrestore(&hvcsd->lock, flags);
-        free_irq(irq, hvcsd);
-err_put:
-        tty_port_put(&hvcsd->port);
-
-        return retval;
-}
-
-/*
- * This is invoked via the tty_open interface when a user app connects to the
- * /dev node.
- */
-static int hvcs_open(struct tty_struct *tty, struct file *filp)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-        unsigned long flags;
+fast_open:
+        hvcsd = tty->driver_data;
 
         spin_lock_irqsave(&hvcsd->lock, flags);
-        hvcsd->port.count++;
+        kref_get(&hvcsd->kref);
+        hvcsd->open_count++;
         hvcsd->todo_mask |= HVCS_SCHED_READ;
         spin_unlock_irqrestore(&hvcsd->lock, flags);
 
+open_success:
         hvcs_kick();
 
         printk(KERN_INFO "HVCS: vty-server@%X connection opened.\n",
                 hvcsd->vdev->unit_address );
 
         return 0;
+
+error_release:
+        spin_unlock_irqrestore(&hvcsd->lock, flags);
+        kref_put(&hvcsd->kref, destroy_hvcs_struct);
+
+        printk(KERN_WARNING "HVCS: partner connect failed.\n");
+        return retval;
 }
 
 static void hvcs_close(struct tty_struct *tty, struct file *filp)
 {
         struct hvcs_struct *hvcsd;
         unsigned long flags;
-        int irq;
+        int irq = NO_IRQ;
 
         /*
          * Is someone trying to close the file associated with this device after
@@ -1221,7 +1223,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
         hvcsd = tty->driver_data;
 
         spin_lock_irqsave(&hvcsd->lock, flags);
-        if (--hvcsd->port.count == 0) {
+        if (--hvcsd->open_count == 0) {
 
                 vio_disable_interrupts(hvcsd->vdev);
 
@@ -1230,12 +1232,12 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
                  * execute any operations on the TTY even though it is obligated
                  * to deliver any pending I/O to the hypervisor.
                  */
-                hvcsd->port.tty = NULL;
+                hvcsd->tty = NULL;
 
                 irq = hvcsd->vdev->irq;
                 spin_unlock_irqrestore(&hvcsd->lock, flags);
 
-                tty_wait_until_sent_from_close(tty, HVCS_CLOSE_WAIT);
+                tty_wait_until_sent(tty, HVCS_CLOSE_WAIT);
 
                 /*
                  * This line is important because it tells hvcs_open that this
@@ -1245,21 +1247,16 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
                 tty->driver_data = NULL;
 
                 free_irq(irq, hvcsd);
+                kref_put(&hvcsd->kref, destroy_hvcs_struct);
                 return;
-        } else if (hvcsd->port.count < 0) {
+        } else if (hvcsd->open_count < 0) {
                 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
                                 " is missmanaged.\n",
-                hvcsd->vdev->unit_address, hvcsd->port.count);
+                hvcsd->vdev->unit_address, hvcsd->open_count);
         }
 
         spin_unlock_irqrestore(&hvcsd->lock, flags);
-}
-
-static void hvcs_cleanup(struct tty_struct * tty)
-{
-        struct hvcs_struct *hvcsd = tty->driver_data;
-
-        tty_port_put(&hvcsd->port);
+        kref_put(&hvcsd->kref, destroy_hvcs_struct);
 }
 
 static void hvcs_hangup(struct tty_struct * tty)
@@ -1267,11 +1264,11 @@ static void hvcs_hangup(struct tty_struct * tty)
         struct hvcs_struct *hvcsd = tty->driver_data;
         unsigned long flags;
         int temp_open_count;
-        int irq;
+        int irq = NO_IRQ;
 
         spin_lock_irqsave(&hvcsd->lock, flags);
         /* Preserve this so that we know how many kref refs to put */
-        temp_open_count = hvcsd->port.count;
+        temp_open_count = hvcsd->open_count;
 
         /*
          * Don't kref put inside the spinlock because the destruction
@@ -1283,10 +1280,10 @@ static void hvcs_hangup(struct tty_struct * tty)
         hvcsd->todo_mask = 0;
 
         /* I don't think the tty needs the hvcs_struct pointer after a hangup */
-        tty->driver_data = NULL;
-        hvcsd->port.tty = NULL;
+        hvcsd->tty->driver_data = NULL;
+        hvcsd->tty = NULL;
 
-        hvcsd->port.count = 0;
+        hvcsd->open_count = 0;
 
         /* This will drop any buffered data on the floor which is OK in a hangup
          * scenario. */
@@ -1311,7 +1308,7 @@ static void hvcs_hangup(struct tty_struct * tty)
                  * NOTE:  If this hangup was signaled from user space then the
                  * final put will never happen.
                  */
-                tty_port_put(&hvcsd->port);
+                kref_put(&hvcsd->kref, destroy_hvcs_struct);
         }
 }
 
@@ -1357,7 +1354,7 @@ static int hvcs_write(struct tty_struct *tty,
          * the middle of a write operation?  This is a crummy place to do this
          * but we want to keep it all in the spinlock.
          */
-        if (hvcsd->port.count <= 0) {
+        if (hvcsd->open_count <= 0) {
                 spin_unlock_irqrestore(&hvcsd->lock, flags);
                 return -ENODEV;
         }
@@ -1431,7 +1428,7 @@ static int hvcs_write_room(struct tty_struct *tty)
 {
         struct hvcs_struct *hvcsd = tty->driver_data;
 
-        if (!hvcsd || hvcsd->port.count <= 0)
+        if (!hvcsd || hvcsd->open_count <= 0)
                 return 0;
 
         return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
@@ -1445,10 +1442,8 @@ static int hvcs_chars_in_buffer(struct tty_struct *tty)
 }
 
 static const struct tty_operations hvcs_ops = {
-        .install = hvcs_install,
         .open = hvcs_open,
         .close = hvcs_close,
-        .cleanup = hvcs_cleanup,
         .hangup = hvcs_hangup,
         .write = hvcs_write,
         .write_room = hvcs_write_room,
@@ -1478,7 +1473,7 @@ static void hvcs_free_index_list(void)
         hvcs_index_count = 0;
 }
 
-static int hvcs_initialize(void)
+static int __devinit hvcs_initialize(void)
 {
         int rc, num_ttys_to_alloc;
 
@@ -1496,16 +1491,16 @@ static int hvcs_initialize(void)
                 num_ttys_to_alloc = hvcs_parm_num_devs;
 
         hvcs_tty_driver = alloc_tty_driver(num_ttys_to_alloc);
-        if (!hvcs_tty_driver) {
-                mutex_unlock(&hvcs_init_mutex);
+        if (!hvcs_tty_driver)
                 return -ENOMEM;
-        }
 
         if (hvcs_alloc_index_list(num_ttys_to_alloc)) {
                 rc = -ENOMEM;
                 goto index_fail;
         }
 
+        hvcs_tty_driver->owner = THIS_MODULE;
+
         hvcs_tty_driver->driver_name = hvcs_driver_name;
         hvcs_tty_driver->name = hvcs_device_node;
 
@@ -1537,7 +1532,7 @@ static int hvcs_initialize(void)
                 goto register_fail;
         }
 
-        hvcs_pi_buff = (unsigned long *) __get_free_page(GFP_KERNEL);
+        hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
         if (!hvcs_pi_buff) {
                 rc = -ENOMEM;
                 goto buff_alloc_fail;
@@ -1553,7 +1548,7 @@ static int hvcs_initialize(void)
         return 0;
 
 kthread_fail:
-        free_page((unsigned long)hvcs_pi_buff);
+        kfree(hvcs_pi_buff);
 buff_alloc_fail:
         tty_unregister_driver(hvcs_tty_driver);
 register_fail:
@@ -1602,7 +1597,7 @@ static void __exit hvcs_module_exit(void)
         kthread_stop(hvcs_task);
 
         spin_lock(&hvcs_pi_lock);
-        free_page((unsigned long)hvcs_pi_buff);
+        kfree(hvcs_pi_buff);
         hvcs_pi_buff = NULL;
         spin_unlock(&hvcs_pi_lock);
 
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index 68357a6e4de..c94e2f5853d 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -69,13 +69,14 @@
 #define __ALIGNED__     __attribute__((__aligned__(sizeof(long))))
 
 struct hvsi_struct {
-        struct tty_port port;
         struct delayed_work writer;
         struct work_struct handshaker;
         wait_queue_head_t emptyq; /* woken when outbuf is emptied */
         wait_queue_head_t stateq; /* woken when HVSI state changes */
         spinlock_t lock;
         int index;
+        struct tty_struct *tty;
+        int count;
         uint8_t throttle_buf[128];
         uint8_t outbuf[N_OUTBUF]; /* to implement write_room and chars_in_buffer */
         /* inbuf is for packet reassembly. leave a little room for leftovers. */
@@ -236,7 +237,7 @@ static int hvsi_read(struct hvsi_struct *hp, char *buf, int count)
 }
 
 static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,
-        struct tty_struct *tty, struct hvsi_struct **to_handshake)
+        struct tty_struct **to_hangup, struct hvsi_struct **to_handshake)
 {
         struct hvsi_control *header = (struct hvsi_control *)packet;
 
@@ -246,8 +247,9 @@ static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,
                                 /* CD went away; no more connection */
                                 pr_debug("hvsi%i: CD dropped\n", hp->index);
                                 hp->mctrl &= TIOCM_CD;
-                                if (tty && !C_CLOCAL(tty))
-                                        tty_hangup(tty);
+                                /* If userland hasn't done an open(2) yet, hp->tty is NULL. */
+                                if (hp->tty && !(hp->tty->flags & CLOCAL))
+                                        *to_hangup = hp->tty;
                         }
                         break;
                 case VSV_CLOSE_PROTOCOL:
@@ -329,8 +331,7 @@ static void hvsi_recv_query(struct hvsi_struct *hp, uint8_t *packet)
         }
 }
 
-static void hvsi_insert_chars(struct hvsi_struct *hp, struct tty_struct *tty,
-                const char *buf, int len)
+static void hvsi_insert_chars(struct hvsi_struct *hp, const char *buf, int len)
 {
         int i;
 
@@ -346,7 +347,7 @@ static void hvsi_insert_chars(struct hvsi_struct *hp, struct tty_struct *tty,
                         continue;
                 }
 #endif /* CONFIG_MAGIC_SYSRQ */
-                tty_insert_flip_char(tty, c, 0);
+                tty_insert_flip_char(hp->tty, c, 0);
         }
 }
 
@@ -359,7 +360,7 @@ static void hvsi_insert_chars(struct hvsi_struct *hp, struct tty_struct *tty,
  * revisited.
  */
 #define TTY_THRESHOLD_THROTTLE 128
-static bool hvsi_recv_data(struct hvsi_struct *hp, struct tty_struct *tty,
+static struct tty_struct *hvsi_recv_data(struct hvsi_struct *hp,
                 const uint8_t *packet)
 {
         const struct hvsi_header *header = (const struct hvsi_header *)packet;
@@ -370,14 +371,14 @@ static bool hvsi_recv_data(struct hvsi_struct *hp, struct tty_struct *tty,
         pr_debug("queueing %i chars '%.*s'\n", datalen, datalen, data);
 
         if (datalen == 0)
-                return false;
+                return NULL;
 
         if (overflow > 0) {
                 pr_debug("%s: got >TTY_THRESHOLD_THROTTLE bytes\n", __func__);
                 datalen = TTY_THRESHOLD_THROTTLE;
         }
 
-        hvsi_insert_chars(hp, tty, data, datalen);
+        hvsi_insert_chars(hp, data, datalen);
 
         if (overflow > 0) {
                 /*
@@ -389,7 +390,7 @@ static bool hvsi_recv_data(struct hvsi_struct *hp, struct tty_struct *tty,
                 hp->n_throttle = overflow;
         }
 
-        return true;
+        return hp->tty;
 }
 
 /*
@@ -398,13 +399,14 @@ static bool hvsi_recv_data(struct hvsi_struct *hp, struct tty_struct *tty,
  * machine during console handshaking (in which case tty = NULL and we ignore
  * incoming data).
  */
-static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct *tty,
-                struct hvsi_struct **handshake)
+static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct **flip,
+                struct tty_struct **hangup, struct hvsi_struct **handshake)
 {
         uint8_t *packet = hp->inbuf;
         int chunklen;
-        bool flip = false;
 
+        *flip = NULL;
+        *hangup = NULL;
         *handshake = NULL;
 
         chunklen = hvsi_read(hp, hp->inbuf_end, HVSI_MAX_READ);
@@ -438,12 +440,12 @@ static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct *tty,
                         case VS_DATA_PACKET_HEADER:
                                 if (!is_open(hp))
                                         break;
-                                if (tty == NULL)
+                                if (hp->tty == NULL)
                                         break; /* no tty buffer to put data in */
-                                flip = hvsi_recv_data(hp, tty, packet);
+                                *flip = hvsi_recv_data(hp, packet);
                                 break;
                         case VS_CONTROL_PACKET_HEADER:
-                                hvsi_recv_control(hp, packet, tty, handshake);
+                                hvsi_recv_control(hp, packet, hangup, handshake);
                                 break;
                         case VS_QUERY_RESPONSE_PACKET_HEADER:
                                 hvsi_recv_response(hp, packet);
@@ -460,26 +462,28 @@ static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct *tty,
 
                 packet += len_packet(packet);
 
-                if (*handshake) {
-                        pr_debug("%s: handshake\n", __func__);
+                if (*hangup || *handshake) {
+                        pr_debug("%s: hangup or handshake\n", __func__);
+                        /*
+                         * we need to send the hangup now before receiving any more data.
+                         * If we get "data, hangup, data", we can't deliver the second
+                         * data before the hangup.
+                         */
                         break;
                 }
         }
 
         compact_inbuf(hp, packet);
 
-        if (flip)
-                tty_flip_buffer_push(tty);
-
         return 1;
 }
 
-static void hvsi_send_overflow(struct hvsi_struct *hp, struct tty_struct *tty)
+static void hvsi_send_overflow(struct hvsi_struct *hp)
 {
         pr_debug("%s: delivering %i bytes overflow\n", __func__,
                         hp->n_throttle);
 
-        hvsi_insert_chars(hp, tty, hp->throttle_buf, hp->n_throttle);
+        hvsi_insert_chars(hp, hp->throttle_buf, hp->n_throttle);
         hp->n_throttle = 0;
 }
 
@@ -490,20 +494,35 @@ static void hvsi_send_overflow(struct hvsi_struct *hp, struct tty_struct *tty)
 static irqreturn_t hvsi_interrupt(int irq, void *arg)
 {
         struct hvsi_struct *hp = (struct hvsi_struct *)arg;
+        struct tty_struct *flip;
+        struct tty_struct *hangup;
         struct hvsi_struct *handshake;
-        struct tty_struct *tty;
         unsigned long flags;
         int again = 1;
 
         pr_debug("%s\n", __func__);
 
-        tty = tty_port_tty_get(&hp->port);
-
         while (again) {
                 spin_lock_irqsave(&hp->lock, flags);
-                again = hvsi_load_chunk(hp, tty, &handshake);
+                again = hvsi_load_chunk(hp, &flip, &hangup, &handshake);
                 spin_unlock_irqrestore(&hp->lock, flags);
 
+                /*
+                 * we have to call tty_flip_buffer_push() and tty_hangup() outside our
+                 * spinlock. But we also have to keep going until we've read all the
+                 * available data.
+                 */
+
+                if (flip) {
+                        /* there was data put in the tty flip buffer */
+                        tty_flip_buffer_push(flip);
+                        flip = NULL;
+                }
+
+                if (hangup) {
+                        tty_hangup(hangup);
+                }
+
                 if (handshake) {
                         pr_debug("hvsi%i: attempting re-handshake\n", handshake->index);
                         schedule_work(&handshake->handshaker);
@@ -511,15 +530,18 @@ static irqreturn_t hvsi_interrupt(int irq, void *arg)
         }
 
         spin_lock_irqsave(&hp->lock, flags);
-        if (tty && hp->n_throttle && !test_bit(TTY_THROTTLED, &tty->flags)) {
-                /* we weren't hung up and we weren't throttled, so we can
-                 * deliver the rest now */
-                hvsi_send_overflow(hp, tty);
-                tty_flip_buffer_push(tty);
+        if (hp->tty && hp->n_throttle
+                        && (!test_bit(TTY_THROTTLED, &hp->tty->flags))) {
+                /* we weren't hung up and we weren't throttled, so we can deliver the
+                 * rest now */
+                flip = hp->tty;
+                hvsi_send_overflow(hp);
         }
         spin_unlock_irqrestore(&hp->lock, flags);
 
-        tty_kref_put(tty);
+        if (flip) {
+                tty_flip_buffer_push(flip);
+        }
 
         return IRQ_HANDLED;
 }
@@ -715,11 +737,14 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
 {
         struct hvsi_struct *hp;
         unsigned long flags;
+        int line = tty->index;
         int ret;
 
         pr_debug("%s\n", __func__);
 
-        hp = &hvsi_ports[tty->index];
+        if (line < 0 || line >= hvsi_count)
+                return -ENODEV;
+        hp = &hvsi_ports[line];
 
         tty->driver_data = hp;
 
@@ -727,9 +752,9 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
         if (hp->state == HVSI_FSP_DIED)
                 return -EIO;
 
-        tty_port_tty_set(&hp->port, tty);
         spin_lock_irqsave(&hp->lock, flags);
-        hp->port.count++;
+        hp->tty = tty;
+        hp->count++;
         atomic_set(&hp->seqno, 0);
         h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
         spin_unlock_irqrestore(&hp->lock, flags);
@@ -765,7 +790,7 @@ static void hvsi_flush_output(struct hvsi_struct *hp)
 
         /* 'writer' could still be pending if it didn't see n_outbuf = 0 yet */
         cancel_delayed_work_sync(&hp->writer);
-        flush_work(&hp->handshaker);
+        flush_work_sync(&hp->handshaker);
 
         /*
          * it's also possible that our timeout expired and hvsi_write_worker
@@ -786,8 +811,8 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
 
         spin_lock_irqsave(&hp->lock, flags);
 
-        if (--hp->port.count == 0) {
-                tty_port_tty_set(&hp->port, NULL);
+        if (--hp->count == 0) {
+                hp->tty = NULL;
                 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
 
                 /* only close down connection if it is not the console */
@@ -819,9 +844,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
 
                         spin_lock_irqsave(&hp->lock, flags);
                 }
-        } else if (hp->port.count < 0)
+        } else if (hp->count < 0)
                 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
-                       hp - hvsi_ports, hp->port.count);
+                       hp - hvsi_ports, hp->count);
 
         spin_unlock_irqrestore(&hp->lock, flags);
 }
@@ -833,11 +858,12 @@ static void hvsi_hangup(struct tty_struct *tty)
 
         pr_debug("%s\n", __func__);
 
-        tty_port_tty_set(&hp->port, NULL);
-
         spin_lock_irqsave(&hp->lock, flags);
-        hp->port.count = 0;
+
+        hp->count = 0;
         hp->n_outbuf = 0;
+        hp->tty = NULL;
+
         spin_unlock_irqrestore(&hp->lock, flags);
 }
 
@@ -865,7 +891,6 @@ static void hvsi_write_worker(struct work_struct *work)
 {
         struct hvsi_struct *hp =
                 container_of(work, struct hvsi_struct, writer.work);
-        struct tty_struct *tty;
         unsigned long flags;
 #ifdef DEBUG
         static long start_j = 0;
@@ -899,11 +924,7 @@ static void hvsi_write_worker(struct work_struct *work)
                 start_j = 0;
 #endif /* DEBUG */
                 wake_up_all(&hp->emptyq);
-                tty = tty_port_tty_get(&hp->port);
-                if (tty) {
-                        tty_wakeup(tty);
-                        tty_kref_put(tty);
-                }
+                tty_wakeup(hp->tty);
         }
 
 out:
@@ -948,8 +969,8 @@ static int hvsi_write(struct tty_struct *tty,
          * and hvsi_write_worker will be scheduled. subsequent hvsi_write() calls
          * will see there is no room in outbuf and return.
          */
-        while ((count > 0) && (hvsi_write_room(tty) > 0)) {
-                int chunksize = min(count, hvsi_write_room(tty));
+        while ((count > 0) && (hvsi_write_room(hp->tty) > 0)) {
+                int chunksize = min(count, hvsi_write_room(hp->tty));
 
                 BUG_ON(hp->n_outbuf < 0);
                 memcpy(hp->outbuf + hp->n_outbuf, source, chunksize);
@@ -996,16 +1017,19 @@ static void hvsi_unthrottle(struct tty_struct *tty)
 {
         struct hvsi_struct *hp = tty->driver_data;
         unsigned long flags;
+        int shouldflip = 0;
 
         pr_debug("%s\n", __func__);
 
         spin_lock_irqsave(&hp->lock, flags);
         if (hp->n_throttle) {
-                hvsi_send_overflow(hp, tty);
-                tty_flip_buffer_push(tty);
+                hvsi_send_overflow(hp);
+                shouldflip = 1;
         }
         spin_unlock_irqrestore(&hp->lock, flags);
 
+        if (shouldflip)
+                tty_flip_buffer_push(hp->tty);
 
         h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
 }
@@ -1064,6 +1088,7 @@ static int __init hvsi_init(void)
         if (!hvsi_driver)
                 return -ENOMEM;
 
+        hvsi_driver->owner = THIS_MODULE;
         hvsi_driver->driver_name = "hvsi";
         hvsi_driver->name = "hvsi";
         hvsi_driver->major = HVSI_MAJOR;
@@ -1080,9 +1105,7 @@ static int __init hvsi_init(void)
                 struct hvsi_struct *hp = &hvsi_ports[i];
                 int ret = 1;
 
-                tty_port_link_device(&hp->port, hvsi_driver, i);
-
-                ret = request_irq(hp->virq, hvsi_interrupt, 0, "hvsi", hp);
+                ret = request_irq(hp->virq, hvsi_interrupt, IRQF_DISABLED, "hvsi", hp);
                 if (ret)
                         printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n",
                                 hp->virq, ret);
@@ -1209,16 +1232,14 @@ static int __init hvsi_console_init(void)
                 init_waitqueue_head(&hp->emptyq);
                 init_waitqueue_head(&hp->stateq);
                 spin_lock_init(&hp->lock);
-                tty_port_init(&hp->port);
                 hp->index = hvsi_count;
                 hp->inbuf_end = hp->inbuf;
                 hp->state = HVSI_CLOSED;
                 hp->vtermno = *vtermno;
                 hp->virq = irq_create_mapping(NULL, irq[0]);
-                if (hp->virq == 0) {
+                if (hp->virq == NO_IRQ) {
                         printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
                                 __func__, irq[0]);
-                        tty_port_destroy(&hp->port);
                         continue;
                 }
 
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
index 3396eb9d57a..bd9b09827b2 100644
--- a/drivers/tty/hvc/hvsi_lib.c
+++ b/drivers/tty/hvc/hvsi_lib.c
@@ -183,7 +183,7 @@ int hvsilib_get_chars(struct hvsi_priv *pv, char *buf, int count)
         unsigned int tries, read = 0;
 
         if (WARN_ON(!pv))
-                return -ENXIO;
+                return 0;
 
         /* If we aren't open, don't do anything in order to avoid races
          * with connection establishment. The hvc core will call this
@@ -234,7 +234,7 @@ int hvsilib_put_chars(struct hvsi_priv *pv, const char *buf, int count)
         int rc, adjcount = min(count, HVSI_MAX_OUTGOING_DATA);
 
         if (WARN_ON(!pv))
-                return -ENODEV;
+                return 0;
 
         dp.hdr.type = VS_DATA_PACKET_HEADER;
         dp.hdr.len = adjcount + sizeof(struct hvsi_header);
@@ -377,7 +377,7 @@ int hvsilib_open(struct hvsi_priv *pv, struct hvc_struct *hp)
         pr_devel("HVSI@%x: open !\n", pv->termno);
 
         /* Keep track of the tty data structure */
-        pv->tty = tty_port_tty_get(&hp->port);
+        pv->tty = tty_kref_get(hp->tty);
 
         hvsilib_establish(pv);
 
@@ -400,7 +400,7 @@ void hvsilib_close(struct hvsi_priv *pv, struct hvc_struct *hp)
                 spin_unlock_irqrestore(&hp->lock, flags);
 
                 /* Clear our own DTR */
-                if (!pv->tty || (pv->tty->termios.c_cflag & HUPCL))
+                if (!pv->tty || (pv->tty->termios->c_cflag & HUPCL))
                         hvsilib_write_mctrl(pv, 0);
 
                 /* Tear down the connection */
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
index b4ba0670dc5..0aeb5a38d29 100644
--- a/drivers/tty/ipwireless/hardware.c
+++ b/drivers/tty/ipwireless/hardware.c
@@ -1729,7 +1729,7 @@ void ipwireless_hardware_free(struct ipw_hardware *hw)
 
         ipwireless_stop_interrupts(hw);
 
-        flush_work(&hw->work_rx);
+        flush_work_sync(&hw->work_rx);
 
         for (i = 0; i < NL_NUM_OF_ADDRESSES; i++)
                 if (hw->packet_assembler[i] != NULL)
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
index c0dfb642383..f7daeea598e 100644
--- a/drivers/tty/ipwireless/network.c
+++ b/drivers/tty/ipwireless/network.c
@@ -22,7 +22,7 @@
 #include <linux/ppp_channel.h>
 #include <linux/ppp_defs.h>
 #include <linux/slab.h>
-#include <linux/ppp-ioctl.h>
+#include <linux/if_ppp.h>
 #include <linux/skbuff.h>
 
 #include "network.h"
@@ -274,12 +274,7 @@ static void do_go_online(struct work_struct *work_go_online)
                 network->xaccm[0] = ~0U;
                 network->xaccm[3] = 0x60000000U;
                 network->raccm = ~0U;
-                if (ppp_register_channel(channel) < 0) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                        ": unable to register PPP channel\n");
-                        kfree(channel);
-                        return;
-                }
+                ppp_register_channel(channel);
                 spin_lock_irqsave(&network->lock, flags);
                 network->ppp_channel = channel;
         }
@@ -352,8 +347,6 @@ static struct sk_buff *ipw_packet_received_skb(unsigned char *data,
         }
 
         skb = dev_alloc_skb(length + 4);
-        if (skb == NULL)
-                return NULL;
         skb_reserve(skb, 2);
         memcpy(skb_put(skb, length), data, length);
 
@@ -399,8 +392,7 @@ void ipwireless_network_packet_received(struct ipw_network *network,
 
                                 /* Send the data to the ppp_generic module. */
                                 skb = ipw_packet_received_skb(data, length);
-                                if (skb)
-                                        ppp_input(network->ppp_channel, skb);
+                                ppp_input(network->ppp_channel, skb);
                         } else
                                 spin_unlock_irqrestore(&network->lock,
                                                 flags);
@@ -438,8 +430,8 @@ void ipwireless_network_free(struct ipw_network *network)
         network->shutting_down = 1;
 
         ipwireless_ppp_close(network);
-        flush_work(&network->work_go_online);
-        flush_work(&network->work_go_offline);
+        flush_work_sync(&network->work_go_online);
+        flush_work_sync(&network->work_go_offline);
 
         ipwireless_stop_interrupts(network->hardware);
         ipwireless_associate_network(network->hardware, NULL);
diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h
index 002c34e7252..9d6bcc77c73 100644
--- a/drivers/tty/ipwireless/setup_protocol.h
+++ b/drivers/tty/ipwireless/setup_protocol.h
@@ -59,7 +59,7 @@ struct tl_setup_config_done_msg {
         unsigned char sig_no;           /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */
 } __attribute__ ((__packed__));
 
-/* Asynchronous messages */
+/* Asyncronous messages */
 struct tl_setup_open_msg {
         unsigned char sig_no;           /* TL_SETUP_SIGNO_OPEN_MSG */
         unsigned char port_no;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index 2cde13ddf9f..ef92869502a 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -21,7 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/ppp_defs.h>
 #include <linux/if.h>
-#include <linux/ppp-ioctl.h>
+#include <linux/if_ppp.h>
 #include <linux/sched.h>
 #include <linux/serial.h>
 #include <linux/slab.h>
@@ -44,13 +44,14 @@
 #define TTYTYPE_RAS_RAW  (2)
 
 struct ipw_tty {
-        struct tty_port port;
         int index;
         struct ipw_hardware *hardware;
         unsigned int channel_idx;
         unsigned int secondary_channel_idx;
         int tty_type;
         struct ipw_network *network;
+        struct tty_struct *linux_tty;
+        int open_count;
         unsigned int control_lines;
         struct mutex ipw_tty_mutex;
         int tx_bytes_queued;
@@ -72,23 +73,50 @@ static char *tty_type_name(int tty_type)
         return channel_names[tty_type];
 }
 
-static struct ipw_tty *get_tty(int index)
+static void report_registering(struct ipw_tty *tty)
 {
-        /*
-         * The 'ras_raw' channel is only available when 'loopback' mode
-         * is enabled.
-         * Number of minor starts with 16 (_RANGE * _RAS_RAW).
-         */
-        if (!ipwireless_loopback && index >=
-                         IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
-                return NULL;
+        char *iftype = tty_type_name(tty->tty_type);
+
+        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
+               ": registering %s device ttyIPWp%d\n", iftype, tty->index);
+}
+
+static void report_deregistering(struct ipw_tty *tty)
+{
+        char *iftype = tty_type_name(tty->tty_type);
 
-        return ttys[index];
+        printk(KERN_INFO IPWIRELESS_PCCARD_NAME
+               ": deregistering %s device ttyIPWp%d\n", iftype,
+               tty->index);
+}
+
+static struct ipw_tty *get_tty(int minor)
+{
+        if (minor < ipw_tty_driver->minor_start
+                        || minor >= ipw_tty_driver->minor_start +
+                        IPWIRELESS_PCMCIA_MINORS)
+                return NULL;
+        else {
+                int minor_offset = minor - ipw_tty_driver->minor_start;
+
+                /*
+                 * The 'ras_raw' channel is only available when 'loopback' mode
+                 * is enabled.
+                 * Number of minor starts with 16 (_RANGE * _RAS_RAW).
+                 */
+                if (!ipwireless_loopback &&
+                                minor_offset >=
+                                 IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
+                        return NULL;
+
+                return ttys[minor_offset];
+        }
 }
 
 static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
 {
-        struct ipw_tty *tty = get_tty(linux_tty->index);
+        int minor = linux_tty->index;
+        struct ipw_tty *tty = get_tty(minor);
 
         if (!tty)
                 return -ENODEV;
@@ -99,12 +127,12 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return -ENODEV;
         }
-        if (tty->port.count == 0)
+        if (tty->open_count == 0)
                 tty->tx_bytes_queued = 0;
 
-        tty->port.count++;
+        tty->open_count++;
 
-        tty->port.tty = linux_tty;
+        tty->linux_tty = linux_tty;
         linux_tty->driver_data = tty;
         linux_tty->low_latency = 1;
 
@@ -118,13 +146,13 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
 
 static void do_ipw_close(struct ipw_tty *tty)
 {
-        tty->port.count--;
+        tty->open_count--;
 
-        if (tty->port.count == 0) {
-                struct tty_struct *linux_tty = tty->port.tty;
+        if (tty->open_count == 0) {
+                struct tty_struct *linux_tty = tty->linux_tty;
 
                 if (linux_tty != NULL) {
-                        tty->port.tty = NULL;
+                        tty->linux_tty = NULL;
                         linux_tty->driver_data = NULL;
 
                         if (tty->tty_type == TTYTYPE_MODEM)
@@ -141,7 +169,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
                 return;
 
         mutex_lock(&tty->ipw_tty_mutex);
-        if (tty->port.count == 0) {
+        if (tty->open_count == 0) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return;
         }
@@ -164,13 +192,13 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
         int work = 0;
 
         mutex_lock(&tty->ipw_tty_mutex);
-        linux_tty = tty->port.tty;
+        linux_tty = tty->linux_tty;
         if (linux_tty == NULL) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return;
         }
 
-        if (!tty->port.count) {
+        if (!tty->open_count) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return;
         }
@@ -212,7 +240,7 @@ static int ipw_write(struct tty_struct *linux_tty,
                 return -ENODEV;
 
         mutex_lock(&tty->ipw_tty_mutex);
-        if (!tty->port.count) {
+        if (!tty->open_count) {
                 mutex_unlock(&tty->ipw_tty_mutex);
                 return -EINVAL;
         }
@@ -252,7 +280,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
@@ -294,7 +322,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
         if (!tty)
                 return 0;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return 0;
 
         return tty->tx_bytes_queued;
@@ -375,7 +403,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         return get_control_lines(tty);
@@ -391,7 +419,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         return set_control_lines(tty, set, clear);
@@ -405,7 +433,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
         if (!tty)
                 return -ENODEV;
 
-        if (!tty->port.count)
+        if (!tty->open_count)
                 return -EINVAL;
 
         /* FIXME: Exactly how is the tty object locked here .. */
@@ -474,21 +502,16 @@ static int add_tty(int j,
         ttys[j]->network = network;
         ttys[j]->tty_type = tty_type;
         mutex_init(&ttys[j]->ipw_tty_mutex);
-        tty_port_init(&ttys[j]->port);
 
-        tty_port_register_device(&ttys[j]->port, ipw_tty_driver, j, NULL);
+        tty_register_device(ipw_tty_driver, j, NULL);
         ipwireless_associate_network_tty(network, channel_idx, ttys[j]);
 
         if (secondary_channel_idx != -1)
                 ipwireless_associate_network_tty(network,
                                                  secondary_channel_idx,
                                                  ttys[j]);
-        /* check if we provide raw device (if loopback is enabled) */
-        if (get_tty(j))
-                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                       ": registering %s device ttyIPWp%d\n",
-                       tty_type_name(tty_type), j);
-
+        if (get_tty(j + ipw_tty_driver->minor_start) == ttys[j])
+                report_registering(ttys[j]);
         return 0;
 }
 
@@ -547,26 +570,23 @@ void ipwireless_tty_free(struct ipw_tty *tty)
 
                 if (ttyj) {
                         mutex_lock(&ttyj->ipw_tty_mutex);
-                        if (get_tty(j))
-                                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
-                                       ": deregistering %s device ttyIPWp%d\n",
-                                       tty_type_name(ttyj->tty_type), j);
+                        if (get_tty(j + ipw_tty_driver->minor_start) == ttyj)
+                                report_deregistering(ttyj);
                         ttyj->closing = 1;
-                        if (ttyj->port.tty != NULL) {
+                        if (ttyj->linux_tty != NULL) {
                                 mutex_unlock(&ttyj->ipw_tty_mutex);
-                                tty_vhangup(ttyj->port.tty);
+                                tty_hangup(ttyj->linux_tty);
+                                /* Wait till the tty_hangup has completed */
+                                flush_work_sync(&ttyj->linux_tty->hangup_work);
                                 /* FIXME: Exactly how is the tty object locked here
                                    against a parallel ioctl etc */
-                                /* FIXME2: hangup does not mean all processes
-                                 * are gone */
                                 mutex_lock(&ttyj->ipw_tty_mutex);
                         }
-                        while (ttyj->port.count)
+                        while (ttyj->open_count)
                                 do_ipw_close(ttyj);
                         ipwireless_disassociate_network_ttys(network,
                                                              ttyj->channel_idx);
                         tty_unregister_device(ipw_tty_driver, j);
-                        tty_port_destroy(&ttyj->port);
                         ttys[j] = NULL;
                         mutex_unlock(&ttyj->ipw_tty_mutex);
                         kfree(ttyj);
@@ -594,6 +614,7 @@ int ipwireless_tty_init(void)
         if (!ipw_tty_driver)
                 return -ENOMEM;
 
+        ipw_tty_driver->owner = THIS_MODULE;
         ipw_tty_driver->driver_name = IPWIRELESS_PCCARD_NAME;
         ipw_tty_driver->name = "ttyIPWp";
         ipw_tty_driver->major = 0;
@@ -651,8 +672,8 @@ ipwireless_tty_notify_control_line_change(struct ipw_tty *tty,
          */
         if ((old_control_lines & IPW_CONTROL_LINE_DCD)
                         && !(tty->control_lines & IPW_CONTROL_LINE_DCD)
-                        && tty->port.tty) {
-                tty_hangup(tty->port.tty);
+                        && tty->linux_tty) {
+                tty_hangup(tty->linux_tty);
         }
 }
 
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 3205b2e9090..db1cf9c328d 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -102,7 +102,7 @@
  *      You can find the original tools for this direct from Multitech
  *              ftp://ftp.multitech.com/ISI-Cards/
  *
- *      Having installed the cards the module options (/etc/modprobe.d/)
+ *      Having installed the cards the module options (/etc/modprobe.conf)
  *
  *      options isicom   io=card1,card2,card3,card4 irq=card1,card2,card3,card4
  *
@@ -133,6 +133,7 @@
 
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <asm/system.h>
 
 #include <linux/pci.h>
 
@@ -148,7 +149,7 @@
 #endif
 
 static int isicom_probe(struct pci_dev *, const struct pci_device_id *);
-static void isicom_remove(struct pci_dev *);
+static void __devexit isicom_remove(struct pci_dev *);
 
 static struct pci_device_id isicom_pci_tbl[] = {
         { PCI_DEVICE(VENDOR_ID, 0x2028) },
@@ -168,7 +169,7 @@ static struct pci_driver isicom_driver = {
         .name           = "isicom",
         .id_table       = isicom_pci_tbl,
         .probe          = isicom_probe,
-        .remove         = isicom_remove
+        .remove         = __devexit_p(isicom_remove)
 };
 
 static int prev_card = 3;       /*      start servicing isi_card[0]     */
@@ -600,10 +601,10 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                                         port->status &= ~ISI_DCD;
                         }
 
-                        if (tty_port_cts_enabled(&port->port)) {
+                        if (port->port.flags & ASYNC_CTS_FLOW) {
                                 if (tty->hw_stopped) {
                                         if (header & ISI_CTS) {
-                                                tty->hw_stopped = 0;
+                                                port->port.tty->hw_stopped = 0;
                                                 /* start tx ing */
                                                 port->status |= (ISI_TXOK
                                                         | ISI_CTS);
@@ -702,7 +703,7 @@ static void isicom_config_port(struct tty_struct *tty)
 
                 /* 1,2,3,4 => 57.6, 115.2, 230, 460 kbps resp. */
                 if (baud < 1 || baud > 4)
-                        tty->termios.c_cflag &= ~CBAUDEX;
+                        tty->termios->c_cflag &= ~CBAUDEX;
                 else
                         baud += 15;
         }
@@ -848,6 +849,8 @@ static struct tty_port *isicom_find_port(struct tty_struct *tty)
         unsigned int board;
         int line = tty->index;
 
+        if (line < 0 || line > PORT_COUNT-1)
+                return NULL;
         board = BOARD(line);
         card = &isi_card[board];
 
@@ -1196,8 +1199,8 @@ static void isicom_set_termios(struct tty_struct *tty,
         if (isicom_paranoia_check(port, tty->name, "isicom_set_termios"))
                 return;
 
-        if (tty->termios.c_cflag == old_termios->c_cflag &&
-                        tty->termios.c_iflag == old_termios->c_iflag)
+        if (tty->termios->c_cflag == old_termios->c_cflag &&
+                        tty->termios->c_iflag == old_termios->c_iflag)
                 return;
 
         spin_lock_irqsave(&port->card->card_lock, flags);
@@ -1205,7 +1208,7 @@ static void isicom_set_termios(struct tty_struct *tty,
         spin_unlock_irqrestore(&port->card->card_lock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios.c_cflag & CRTSCTS)) {
+                        !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 isicom_start(tty);
         }
@@ -1307,7 +1310,7 @@ static const struct tty_port_operations isicom_port_ops = {
         .shutdown               = isicom_shutdown,
 };
 
-static int reset_card(struct pci_dev *pdev,
+static int __devinit reset_card(struct pci_dev *pdev,
         const unsigned int card, unsigned int *signature)
 {
         struct isi_board *board = pci_get_drvdata(pdev);
@@ -1368,7 +1371,7 @@ end:
         return retval;
 }
 
-static int load_firmware(struct pci_dev *pdev,
+static int __devinit load_firmware(struct pci_dev *pdev,
         const unsigned int index, const unsigned int signature)
 {
         struct isi_board *board = pci_get_drvdata(pdev);
@@ -1548,7 +1551,7 @@ end:
  */
 static unsigned int card_count;
 
-static int isicom_probe(struct pci_dev *pdev,
+static int __devinit isicom_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         unsigned int uninitialized_var(signature), index;
@@ -1595,7 +1598,7 @@ static int isicom_probe(struct pci_dev *pdev,
         }
 
         retval = request_irq(board->irq, isicom_interrupt,
-                        IRQF_SHARED, ISICOM_NAME, board);
+                        IRQF_SHARED | IRQF_DISABLED, ISICOM_NAME, board);
         if (retval < 0) {
                 dev_err(&pdev->dev, "Could not install handler at Irq %d. "
                         "Card%d will be disabled.\n", board->irq, index + 1);
@@ -1610,15 +1613,9 @@ static int isicom_probe(struct pci_dev *pdev,
         if (retval < 0)
                 goto errunri;
 
-        for (index = 0; index < board->port_count; index++) {
-                struct tty_port *tport = &board->ports[index].port;
-                tty_port_init(tport);
-                tport->ops = &isicom_port_ops;
-                tport->close_delay = 50 * HZ/100;
-                tport->closing_wait = 3000 * HZ/100;
-                tty_port_register_device(tport, isicom_normal,
-                                board->index * 16 + index, &pdev->dev);
-        }
+        for (index = 0; index < board->port_count; index++)
+                tty_register_device(isicom_normal, board->index * 16 + index,
+                                &pdev->dev);
 
         return 0;
 
@@ -1635,15 +1632,13 @@ err:
         return retval;
 }
 
-static void isicom_remove(struct pci_dev *pdev)
+static void __devexit isicom_remove(struct pci_dev *pdev)
 {
         struct isi_board *board = pci_get_drvdata(pdev);
         unsigned int i;
 
-        for (i = 0; i < board->port_count; i++) {
+        for (i = 0; i < board->port_count; i++)
                 tty_unregister_device(isicom_normal, board->index * 16 + i);
-                tty_port_destroy(&board->ports[i].port);
-        }
 
         free_irq(board->irq, board);
         pci_release_region(pdev, 3);
@@ -1662,9 +1657,13 @@ static int __init isicom_init(void)
                 isi_card[idx].ports = port;
                 spin_lock_init(&isi_card[idx].card_lock);
                 for (channel = 0; channel < 16; channel++, port++) {
+                        tty_port_init(&port->port);
+                        port->port.ops = &isicom_port_ops;
                         port->magic = ISICOM_MAGIC;
                         port->card = &isi_card[idx];
                         port->channel = channel;
+                        port->port.close_delay = 50 * HZ/100;
+                        port->port.closing_wait = 3000 * HZ/100;
                         port->status = 0;
                         /*  . . .  */
                 }
@@ -1679,6 +1678,7 @@ static int __init isicom_init(void)
                 goto error;
         }
 
+        isicom_normal->owner                    = THIS_MODULE;
         isicom_normal->name                     = "ttyM";
         isicom_normal->major                    = ISICOM_NMAJOR;
         isicom_normal->minor_start              = 0;
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index f9d28503bde..d15a071b1a5 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -46,6 +46,7 @@
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
@@ -169,7 +170,6 @@ static DEFINE_SPINLOCK(moxa_lock);
 static unsigned long baseaddr[MAX_BOARDS];
 static unsigned int type[MAX_BOARDS];
 static unsigned int numports[MAX_BOARDS];
-static struct tty_port moxa_service_port;
 
 MODULE_AUTHOR("William Chen");
 MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver");
@@ -368,10 +368,10 @@ static int moxa_ioctl(struct tty_struct *tty,
                                         tmp.dcd = 1;
 
                                 ttyp = tty_port_tty_get(&p->port);
-                                if (!ttyp)
+                                if (!ttyp || !ttyp->termios)
                                         tmp.cflag = p->cflag;
                                 else
-                                        tmp.cflag = ttyp->termios.c_cflag;
+                                        tmp.cflag = ttyp->termios->c_cflag;
                                 tty_kref_put(ttyp);
 copy:
                                 if (copy_to_user(argm, &tmp, sizeof(tmp)))
@@ -835,7 +835,7 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev)
         const struct firmware *fw;
         const char *file;
         struct moxa_port *p;
-        unsigned int i, first_idx;
+        unsigned int i;
         int ret;
 
         brd->ports = kcalloc(MAX_PORTS_PER_BOARD, sizeof(*brd->ports),
@@ -888,15 +888,8 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev)
                 mod_timer(&moxaTimer, jiffies + HZ / 50);
         spin_unlock_bh(&moxa_lock);
 
-        first_idx = (brd - moxa_boards) * MAX_PORTS_PER_BOARD;
-        for (i = 0; i < brd->numPorts; i++)
-                tty_port_register_device(&brd->ports[i].port, moxaDriver,
-                                first_idx + i, dev);
-
         return 0;
 err_free:
-        for (i = 0; i < MAX_PORTS_PER_BOARD; i++)
-                tty_port_destroy(&brd->ports[i].port);
         kfree(brd->ports);
 err:
         return ret;
@@ -904,7 +897,7 @@ err:
 
 static void moxa_board_deinit(struct moxa_board_conf *brd)
 {
-        unsigned int a, opened, first_idx;
+        unsigned int a, opened;
 
         mutex_lock(&moxa_openlock);
         spin_lock_bh(&moxa_lock);
@@ -921,8 +914,6 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
                                 tty_kref_put(tty);
                         }
                 }
-        for (a = 0; a < MAX_PORTS_PER_BOARD; a++)
-                tty_port_destroy(&brd->ports[a].port);
         while (1) {
                 opened = 0;
                 for (a = 0; a < brd->numPorts; a++)
@@ -935,17 +926,13 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
                 mutex_lock(&moxa_openlock);
         }
 
-        first_idx = (brd - moxa_boards) * MAX_PORTS_PER_BOARD;
-        for (a = 0; a < brd->numPorts; a++)
-                tty_unregister_device(moxaDriver, first_idx + a);
-
         iounmap(brd->basemem);
         brd->basemem = NULL;
         kfree(brd->ports);
 }
 
 #ifdef CONFIG_PCI
-static int moxa_pci_probe(struct pci_dev *pdev,
+static int __devinit moxa_pci_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
         struct moxa_board_conf *board;
@@ -981,7 +968,6 @@ static int moxa_pci_probe(struct pci_dev *pdev,
         board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
         if (board->basemem == NULL) {
                 dev_err(&pdev->dev, "can't remap io space 2\n");
-                retval = -ENOMEM;
                 goto err_reg;
         }
 
@@ -1020,7 +1006,7 @@ err:
         return retval;
 }
 
-static void moxa_pci_remove(struct pci_dev *pdev)
+static void __devexit moxa_pci_remove(struct pci_dev *pdev)
 {
         struct moxa_board_conf *brd = pci_get_drvdata(pdev);
 
@@ -1033,7 +1019,7 @@ static struct pci_driver moxa_pci_driver = {
         .name = "moxa",
         .id_table = moxa_pcibrds,
         .probe = moxa_pci_probe,
-        .remove = moxa_pci_remove
+        .remove = __devexit_p(moxa_pci_remove)
 };
 #endif /* CONFIG_PCI */
 
@@ -1046,15 +1032,11 @@ static int __init moxa_init(void)
 
         printk(KERN_INFO "MOXA Intellio family driver version %s\n",
                         MOXA_VERSION);
+        moxaDriver = alloc_tty_driver(MAX_PORTS + 1);
+        if (!moxaDriver)
+                return -ENOMEM;
 
-        tty_port_init(&moxa_service_port);
-
-        moxaDriver = tty_alloc_driver(MAX_PORTS + 1,
-                        TTY_DRIVER_REAL_RAW |
-                        TTY_DRIVER_DYNAMIC_DEV);
-        if (IS_ERR(moxaDriver))
-                return PTR_ERR(moxaDriver);
-
+        moxaDriver->owner = THIS_MODULE;
         moxaDriver->name = "ttyMX";
         moxaDriver->major = ttymajor;
         moxaDriver->minor_start = 0;
@@ -1064,9 +1046,8 @@ static int __init moxa_init(void)
         moxaDriver->init_termios.c_cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
         moxaDriver->init_termios.c_ispeed = 9600;
         moxaDriver->init_termios.c_ospeed = 9600;
+        moxaDriver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(moxaDriver, &moxa_ops);
-        /* Having one more port only for ioctls is ugly */
-        tty_port_link_device(&moxa_service_port, moxaDriver, MAX_PORTS);
 
         if (tty_register_driver(moxaDriver)) {
                 printk(KERN_ERR "can't register MOXA Smartio tty driver!\n");
@@ -1199,7 +1180,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
         mutex_lock(&ch->port.mutex);
         if (!(ch->port.flags & ASYNC_INITIALIZED)) {
                 ch->statusflags = 0;
-                moxa_set_tty_param(tty, &tty->termios);
+                moxa_set_tty_param(tty, tty->termios);
                 MoxaPortLineCtrl(ch, 1, 1);
                 MoxaPortEnable(ch);
                 MoxaSetFifo(ch, ch->type == PORT_16550A);
@@ -1214,7 +1195,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
 static void moxa_close(struct tty_struct *tty, struct file *filp)
 {
         struct moxa_port *ch = tty->driver_data;
-        ch->cflag = tty->termios.c_cflag;
+        ch->cflag = tty->termios->c_cflag;
         tty_port_close(&ch->port, tty, filp);
 }
 
@@ -1350,7 +1331,7 @@ static void moxa_start(struct tty_struct *tty)
         if (ch == NULL)
                 return;
 
-        if (!test_bit(TXSTOPPED, &ch->statusflags))
+        if (!(ch->statusflags & TXSTOPPED))
                 return;
 
         MoxaPortTxEnable(ch);
@@ -1374,7 +1355,7 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
                 p->DCDState = dcd;
                 spin_unlock_irqrestore(&p->port.lock, flags);
                 tty = tty_port_tty_get(&p->port);
-                if (tty && !C_CLOCAL(tty) && !dcd)
+                if (tty && C_CLOCAL(tty) && !dcd)
                         tty_hangup(tty);
                 tty_kref_put(tty);
         }
@@ -1485,7 +1466,7 @@ static void moxa_poll(unsigned long ignored)
 
 static void moxa_set_tty_param(struct tty_struct *tty, struct ktermios *old_termios)
 {
-        register struct ktermios *ts = &tty->termios;
+        register struct ktermios *ts = tty->termios;
         struct moxa_port *ch = tty->driver_data;
         int rts, cts, txflow, rxflow, xany, baud;
 
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 40113868bec..7fc8c02fea6 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -41,6 +41,7 @@
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -487,7 +488,7 @@ static void mxser_disable_must_rx_software_flow_control(unsigned long baseio)
 }
 
 #ifdef CONFIG_PCI
-static int CheckIsMoxaMust(unsigned long io)
+static int __devinit CheckIsMoxaMust(unsigned long io)
 {
         u8 oldmcr, hwid;
         int i;
@@ -643,7 +644,7 @@ static int mxser_change_speed(struct tty_struct *tty,
         int ret = 0;
         unsigned char status;
 
-        cflag = tty->termios.c_cflag;
+        cflag = tty->termios->c_cflag;
         if (!info->ioaddr)
                 return ret;
 
@@ -830,7 +831,7 @@ static void mxser_check_modem_status(struct tty_struct *tty,
                         wake_up_interruptible(&port->port.open_wait);
         }
 
-        if (tty_port_cts_enabled(&port->port)) {
+        if (port->port.flags & ASYNC_CTS_FLOW) {
                 if (tty->hw_stopped) {
                         if (status & UART_MSR_CTS) {
                                 tty->hw_stopped = 0;
@@ -1009,6 +1010,8 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
         line = tty->index;
         if (line == MXSER_PORTS)
                 return 0;
+        if (line < 0 || line > MXSER_PORTS)
+                return -ENODEV;
         info = &mxser_boards[line / MXSER_PORTS_PER_BOARD].ports[line % MXSER_PORTS_PER_BOARD];
         if (!info->ioaddr)
                 return -ENODEV;
@@ -1520,10 +1523,10 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
                                 
                                 tty = tty_port_tty_get(port);
 
-                                if (!tty)
+                                if (!tty || !tty->termios)
                                         ms.cflag = ip->normal_termios.c_cflag;
                                 else
-                                        ms.cflag = tty->termios.c_cflag;
+                                        ms.cflag = tty->termios->c_cflag;
                                 tty_kref_put(tty);
                                 spin_lock_irq(&ip->slock);
                                 status = inb(ip->ioaddr + UART_MSR);
@@ -1589,13 +1592,13 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
 
                                 tty = tty_port_tty_get(&ip->port);
 
-                                if (!tty) {
+                                if (!tty || !tty->termios) {
                                         cflag = ip->normal_termios.c_cflag;
                                         iflag = ip->normal_termios.c_iflag;
                                         me->baudrate[p] = tty_termios_baud_rate(&ip->normal_termios);
                                 } else {
-                                        cflag = tty->termios.c_cflag;
-                                        iflag = tty->termios.c_iflag;
+                                        cflag = tty->termios->c_cflag;
+                                        iflag = tty->termios->c_iflag;
                                         me->baudrate[p] = tty_get_baud_rate(tty);
                                 }
                                 tty_kref_put(tty);
@@ -1853,7 +1856,7 @@ static void mxser_stoprx(struct tty_struct *tty)
                 }
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 info->MCR &= ~UART_MCR_RTS;
                 outb(info->MCR, info->ioaddr + UART_MCR);
         }
@@ -1890,7 +1893,7 @@ static void mxser_unthrottle(struct tty_struct *tty)
                 }
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 info->MCR |= UART_MCR_RTS;
                 outb(info->MCR, info->ioaddr + UART_MCR);
         }
@@ -1939,14 +1942,14 @@ static void mxser_set_termios(struct tty_struct *tty, struct ktermios *old_termi
         spin_unlock_irqrestore(&info->slock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios.c_cflag & CRTSCTS)) {
+                        !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 mxser_start(tty);
         }
 
         /* Handle sw stopped */
         if ((old_termios->c_iflag & IXON) &&
-                        !(tty->termios.c_iflag & IXON)) {
+                        !(tty->termios->c_iflag & IXON)) {
                 tty->stopped = 0;
 
                 if (info->board->chip_flag) {
@@ -2002,9 +2005,16 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
          */
         if (!timeout || timeout > 2 * info->timeout)
                 timeout = 2 * info->timeout;
-
+#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+        printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...",
+                timeout, char_time);
+        printk("jiff=%lu...", jiffies);
+#endif
         spin_lock_irqsave(&info->slock, flags);
         while (!((lsr = inb(info->ioaddr + UART_LSR)) & UART_LSR_TEMT)) {
+#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+                printk("lsr = %d (jiff=%lu)...", lsr, jiffies);
+#endif
                 spin_unlock_irqrestore(&info->slock, flags);
                 schedule_timeout_interruptible(char_time);
                 spin_lock_irqsave(&info->slock, flags);
@@ -2015,6 +2025,10 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
         }
         spin_unlock_irqrestore(&info->slock, flags);
         set_current_state(TASK_RUNNING);
+
+#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
+        printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
+#endif
 }
 
 /*
@@ -2326,7 +2340,7 @@ static const struct tty_operations mxser_ops = {
         .get_icount = mxser_get_icount,
 };
 
-static struct tty_port_operations mxser_port_ops = {
+struct tty_port_operations mxser_port_ops = {
         .carrier_raised = mxser_carrier_raised,
         .dtr_rts = mxser_dtr_rts,
         .activate = mxser_activate,
@@ -2337,39 +2351,14 @@ static struct tty_port_operations mxser_port_ops = {
  * The MOXA Smartio/Industio serial driver boot-time initialization code!
  */
 
-static bool allow_overlapping_vector;
-module_param(allow_overlapping_vector, bool, S_IRUGO);
-MODULE_PARM_DESC(allow_overlapping_vector, "whether we allow ISA cards to be configured such that vector overlabs IO ports (default=no)");
-
-static bool mxser_overlapping_vector(struct mxser_board *brd)
-{
-        return allow_overlapping_vector &&
-                brd->vector >= brd->ports[0].ioaddr &&
-                brd->vector < brd->ports[0].ioaddr + 8 * brd->info->nports;
-}
-
-static int mxser_request_vector(struct mxser_board *brd)
-{
-        if (mxser_overlapping_vector(brd))
-                return 0;
-        return request_region(brd->vector, 1, "mxser(vector)") ? 0 : -EIO;
-}
-
-static void mxser_release_vector(struct mxser_board *brd)
-{
-        if (mxser_overlapping_vector(brd))
-                return;
-        release_region(brd->vector, 1);
-}
-
 static void mxser_release_ISA_res(struct mxser_board *brd)
 {
         free_irq(brd->irq, brd);
         release_region(brd->ports[0].ioaddr, 8 * brd->info->nports);
-        mxser_release_vector(brd);
+        release_region(brd->vector, 1);
 }
 
-static int mxser_initbrd(struct mxser_board *brd,
+static int __devinit mxser_initbrd(struct mxser_board *brd,
                 struct pci_dev *pdev)
 {
         struct mxser_port *info;
@@ -2411,30 +2400,17 @@ static int mxser_initbrd(struct mxser_board *brd,
 
         retval = request_irq(brd->irq, mxser_interrupt, IRQF_SHARED, "mxser",
                         brd);
-        if (retval) {
-                for (i = 0; i < brd->info->nports; i++)
-                        tty_port_destroy(&brd->ports[i].port);
+        if (retval)
                 printk(KERN_ERR "Board %s: Request irq failed, IRQ (%d) may "
                         "conflict with another device.\n",
                         brd->info->name, brd->irq);
-        }
 
         return retval;
 }
 
-static void mxser_board_remove(struct mxser_board *brd)
-{
-        unsigned int i;
-
-        for (i = 0; i < brd->info->nports; i++) {
-                tty_unregister_device(mxvar_sdriver, brd->idx + i);
-                tty_port_destroy(&brd->ports[i].port);
-        }
-}
-
 static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)
 {
-        int id, i, bits, ret;
+        int id, i, bits;
         unsigned short regs[16], irq;
         unsigned char scratch, scratch2;
 
@@ -2530,15 +2506,13 @@ static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)
                                 8 * brd->info->nports - 1);
                 return -EIO;
         }
-
-        ret = mxser_request_vector(brd);
-        if (ret) {
+        if (!request_region(brd->vector, 1, "mxser(vector)")) {
                 release_region(brd->ports[0].ioaddr, 8 * brd->info->nports);
                 printk(KERN_ERR "mxser: can't request interrupt vector region: "
                                 "0x%.8lx-0x%.8lx\n",
                                 brd->ports[0].ioaddr, brd->ports[0].ioaddr +
                                 8 * brd->info->nports - 1);
-                return ret;
+                return -EIO;
         }
         return brd->info->nports;
 
@@ -2547,7 +2521,7 @@ err_irqconflict:
         return -EIO;
 }
 
-static int mxser_probe(struct pci_dev *pdev,
+static int __devinit mxser_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
 #ifdef CONFIG_PCI
@@ -2638,8 +2612,7 @@ static int mxser_probe(struct pci_dev *pdev,
                 goto err_rel3;
 
         for (i = 0; i < brd->info->nports; i++)
-                tty_port_register_device(&brd->ports[i].port, mxvar_sdriver,
-                                brd->idx + i, &pdev->dev);
+                tty_register_device(mxvar_sdriver, brd->idx + i, &pdev->dev);
 
         pci_set_drvdata(pdev, brd);
 
@@ -2658,12 +2631,14 @@ err:
 #endif
 }
 
-static void mxser_remove(struct pci_dev *pdev)
+static void __devexit mxser_remove(struct pci_dev *pdev)
 {
 #ifdef CONFIG_PCI
         struct mxser_board *brd = pci_get_drvdata(pdev);
+        unsigned int i;
 
-        mxser_board_remove(brd);
+        for (i = 0; i < brd->info->nports; i++)
+                tty_unregister_device(mxvar_sdriver, brd->idx + i);
 
         free_irq(pdev->irq, brd);
         pci_release_region(pdev, 2);
@@ -2677,7 +2652,7 @@ static struct pci_driver mxser_driver = {
         .name = "mxser",
         .id_table = mxser_pcibrds,
         .probe = mxser_probe,
-        .remove = mxser_remove
+        .remove = __devexit_p(mxser_remove)
 };
 
 static int __init mxser_module_init(void)
@@ -2694,9 +2669,12 @@ static int __init mxser_module_init(void)
                 MXSER_VERSION);
 
         /* Initialize the tty_driver structure */
+        mxvar_sdriver->owner = THIS_MODULE;
+        mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
         mxvar_sdriver->name = "ttyMI";
         mxvar_sdriver->major = ttymajor;
         mxvar_sdriver->minor_start = 0;
+        mxvar_sdriver->num = MXSER_PORTS + 1;
         mxvar_sdriver->type = TTY_DRIVER_TYPE_SERIAL;
         mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL;
         mxvar_sdriver->init_termios = tty_std_termios;
@@ -2734,8 +2712,7 @@ static int __init mxser_module_init(void)
 
                 brd->idx = m * MXSER_PORTS_PER_BOARD;
                 for (i = 0; i < brd->info->nports; i++)
-                        tty_port_register_device(&brd->ports[i].port,
-                                        mxvar_sdriver, brd->idx + i, NULL);
+                        tty_register_device(mxvar_sdriver, brd->idx + i, NULL);
 
                 m++;
         }
@@ -2759,13 +2736,15 @@ err_put:
 
 static void __exit mxser_module_exit(void)
 {
-        unsigned int i;
+        unsigned int i, j;
 
         pci_unregister_driver(&mxser_driver);
 
         for (i = 0; i < MXSER_BOARDS; i++) /* ISA remains */
                 if (mxser_boards[i].info != NULL)
-                        mxser_board_remove(&mxser_boards[i]);
+                        for (j = 0; j < mxser_boards[i].info->nports; j++)
+                                tty_unregister_device(mxvar_sdriver,
+                                                mxser_boards[i].idx + j);
         tty_unregister_driver(mxvar_sdriver);
         put_tty_driver(mxvar_sdriver);
 
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index dcc0430a49c..8a50e4eebf1 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -21,6 +21,7 @@
  *      Mostly done:    ioctls for setting modes/timing
  *      Partly done:    hooks so you can pull off frames to non tty devs
  *      Restart DLCI 0 when it closes ?
+ *      Test basic encoding
  *      Improve the tx engine
  *      Resolve tx side locking by adding a queue_head and routing
  *              all control traffic via it
@@ -66,16 +67,14 @@
 static int debug;
 module_param(debug, int, 0600);
 
-/* Defaults: these are from the specification */
-
-#define T1      10              /* 100mS */
-#define T2      34              /* 333mS */
-#define N2      3               /* Retry 3 times */
+#define T1      (HZ/10)
+#define T2      (HZ/3)
+#define N2      3
 
 /* Use long timers for testing at low speed with debug on */
 #ifdef DEBUG_TIMING
-#define T1      100
-#define T2      200
+#define T1      HZ
+#define T2      (2 * HZ)
 #endif
 
 /*
@@ -108,7 +107,7 @@ struct gsm_mux_net {
  */
 
 struct gsm_msg {
-        struct list_head list;
+        struct gsm_msg *next;
         u8 addr;                /* DLCI address + flags */
         u8 ctrl;                /* Control byte + flags */
         unsigned int len;       /* Length of data block (can be zero) */
@@ -134,6 +133,7 @@ struct gsm_dlci {
 #define DLCI_OPENING            1       /* Sending SABM not seen UA */
 #define DLCI_OPEN               2       /* SABM/UA complete */
 #define DLCI_CLOSING            3       /* Sending DISC not seen UA/DM */
+        struct kref ref;                /* freed from port or mux close */
         struct mutex mutex;
 
         /* Link layer */
@@ -244,7 +244,8 @@ struct gsm_mux {
         unsigned int tx_bytes;          /* TX data outstanding */
 #define TX_THRESH_HI            8192
 #define TX_THRESH_LO            2048
-        struct list_head tx_list;       /* Pending data packets */
+        struct gsm_msg *tx_head;        /* Pending data packets */
+        struct gsm_msg *tx_tail;
 
         /* Control messages */
         struct timer_list t2_timer;     /* Retransmit timer for commands */
@@ -487,7 +488,7 @@ static void gsm_print_packet(const char *hdr, int addr, int cr,
         default:
                 if (!(control & 0x01)) {
                         pr_cont("I N(S)%d N(R)%d",
-                                (control & 0x0E) >> 1, (control & 0xE0) >> 5);
+                                (control & 0x0E) >> 1, (control & 0xE) >> 5);
                 } else switch (control & 0x0F) {
                         case RR:
                                 pr_cont("RR(%d)", (control & 0xE0) >> 5);
@@ -661,7 +662,7 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,
         m->len = len;
         m->addr = addr;
         m->ctrl = ctrl;
-        INIT_LIST_HEAD(&m->list);
+        m->next = NULL;
         return m;
 }
 
@@ -671,21 +672,22 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,
  *
  *      The tty device has called us to indicate that room has appeared in
  *      the transmit queue. Ram more data into the pipe if we have any
- *      If we have been flow-stopped by a CMD_FCOFF, then we can only
- *      send messages on DLCI0 until CMD_FCON
  *
  *      FIXME: lock against link layer control transmissions
  */
 
 static void gsm_data_kick(struct gsm_mux *gsm)
 {
-        struct gsm_msg *msg, *nmsg;
+        struct gsm_msg *msg = gsm->tx_head;
         int len;
         int skip_sof = 0;
 
-        list_for_each_entry_safe(msg, nmsg, &gsm->tx_list, list) {
-                if (gsm->constipated && msg->addr)
-                        continue;
+        /* FIXME: We need to apply this solely to data messages */
+        if (gsm->constipated)
+                return;
+
+        while (gsm->tx_head != NULL) {
+                msg = gsm->tx_head;
                 if (gsm->encoding != 0) {
                         gsm->txframe[0] = GSM1_SOF;
                         len = gsm_stuff_frame(msg->data,
@@ -708,13 +710,14 @@ static void gsm_data_kick(struct gsm_mux *gsm)
                                                 len - skip_sof) < 0)
                         break;
                 /* FIXME: Can eliminate one SOF in many more cases */
+                gsm->tx_head = msg->next;
+                if (gsm->tx_head == NULL)
+                        gsm->tx_tail = NULL;
                 gsm->tx_bytes -= msg->len;
+                kfree(msg);
                 /* For a burst of frames skip the extra SOF within the
                    burst */
                 skip_sof = 1;
-
-                list_del(&msg->list);
-                kfree(msg);
         }
 }
 
@@ -764,7 +767,11 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
         msg->data = dp;
 
         /* Add to the actual output queue */
-        list_add_tail(&msg->list, &gsm->tx_list);
+        if (gsm->tx_tail)
+                gsm->tx_tail->next = msg;
+        else
+                gsm->tx_head = msg;
+        gsm->tx_tail = msg;
         gsm->tx_bytes += msg->len;
         gsm_data_kick(gsm);
 }
@@ -803,41 +810,38 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci)
 {
         struct gsm_msg *msg;
         u8 *dp;
-        int len, total_size, size;
+        int len, size;
         int h = dlci->adaption - 1;
 
-        total_size = 0;
-        while(1) {
-                len = kfifo_len(dlci->fifo);
-                if (len == 0)
-                        return total_size;
-
-                /* MTU/MRU count only the data bits */
-                if (len > gsm->mtu)
-                        len = gsm->mtu;
-
-                size = len + h;
-
-                msg = gsm_data_alloc(gsm, dlci->addr, size, gsm->ftype);
-                /* FIXME: need a timer or something to kick this so it can't
-                   get stuck with no work outstanding and no buffer free */
-                if (msg == NULL)
-                        return -ENOMEM;
-                dp = msg->data;
-                switch (dlci->adaption) {
-                case 1: /* Unstructured */
-                        break;
-                case 2: /* Unstructed with modem bits. Always one byte as we never
-                           send inline break data */
-                        *dp++ = gsm_encode_modem(dlci);
-                        break;
-                }
-                WARN_ON(kfifo_out_locked(dlci->fifo, dp , len, &dlci->lock) != len);
-                __gsm_data_queue(dlci, msg);
-                total_size += size;
+        len = kfifo_len(dlci->fifo);
+        if (len == 0)
+                return 0;
+
+        /* MTU/MRU count only the data bits */
+        if (len > gsm->mtu)
+                len = gsm->mtu;
+
+        size = len + h;
+
+        msg = gsm_data_alloc(gsm, dlci->addr, size, gsm->ftype);
+        /* FIXME: need a timer or something to kick this so it can't
+           get stuck with no work outstanding and no buffer free */
+        if (msg == NULL)
+                return -ENOMEM;
+        dp = msg->data;
+        switch (dlci->adaption) {
+        case 1: /* Unstructured */
+                break;
+        case 2: /* Unstructed with modem bits. Always one byte as we never
+                   send inline break data */
+                *dp += gsm_encode_modem(dlci);
+                len--;
+                break;
         }
+        WARN_ON(kfifo_out_locked(dlci->fifo, dp , len, &dlci->lock) != len);
+        __gsm_data_queue(dlci, msg);
         /* Bytes of data we used up */
-        return total_size;
+        return size;
 }
 
 /**
@@ -867,7 +871,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
 
         /* dlci->skb is locked by tx_lock */
         if (dlci->skb == NULL) {
-                dlci->skb = skb_dequeue_tail(&dlci->skb_list);
+                dlci->skb = skb_dequeue(&dlci->skb_list);
                 if (dlci->skb == NULL)
                         return 0;
                 first = 1;
@@ -878,7 +882,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
         if (len > gsm->mtu) {
                 if (dlci->adaption == 3) {
                         /* Over long frame, bin it */
-                        dev_kfree_skb_any(dlci->skb);
+                        kfree_skb(dlci->skb);
                         dlci->skb = NULL;
                         return 0;
                 }
@@ -891,11 +895,8 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
 
         /* FIXME: need a timer or something to kick this so it can't
            get stuck with no work outstanding and no buffer free */
-        if (msg == NULL) {
-                skb_queue_tail(&dlci->skb_list, dlci->skb);
-                dlci->skb = NULL;
+        if (msg == NULL)
                 return -ENOMEM;
-        }
         dp = msg->data;
 
         if (dlci->adaption == 4) { /* Interruptible framed (Packetised Data) */
@@ -907,7 +908,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
         skb_pull(dlci->skb, len);
         __gsm_data_queue(dlci, msg);
         if (last) {
-                dev_kfree_skb_any(dlci->skb);
+                kfree_skb(dlci->skb);
                 dlci->skb = NULL;
         }
         return size;
@@ -966,22 +967,16 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm)
 static void gsm_dlci_data_kick(struct gsm_dlci *dlci)
 {
         unsigned long flags;
-        int sweep;
-
-        if (dlci->constipated) 
-                return;
 
         spin_lock_irqsave(&dlci->gsm->tx_lock, flags);
         /* If we have nothing running then we need to fire up */
-        sweep = (dlci->gsm->tx_bytes < TX_THRESH_LO);
         if (dlci->gsm->tx_bytes == 0) {
                 if (dlci->net)
                         gsm_dlci_data_output_framed(dlci->gsm, dlci);
                 else
                         gsm_dlci_data_output(dlci->gsm, dlci);
-        }
-        if (sweep)
-                gsm_dlci_data_sweep(dlci->gsm);
+        } else if (dlci->gsm->tx_bytes < TX_THRESH_LO)
+                gsm_dlci_data_sweep(dlci->gsm);
         spin_unlock_irqrestore(&dlci->gsm->tx_lock, flags);
 }
 
@@ -1028,7 +1023,6 @@ static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,
 {
         int  mlines = 0;
         u8 brk = 0;
-        int fc;
 
         /* The modem status command can either contain one octet (v.24 signals)
            or two octets (v.24 signals + break signals). The length field will
@@ -1040,21 +1034,19 @@ static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,
         else {
                 brk = modem & 0x7f;
                 modem = (modem >> 7) & 0x7f;
-        }
+        };
 
         /* Flow control/ready to communicate */
-        fc = (modem & MDM_FC) || !(modem & MDM_RTR);
-        if (fc && !dlci->constipated) {
+        if (modem & MDM_FC) {
                 /* Need to throttle our output on this device */
                 dlci->constipated = 1;
-        } else if (!fc && dlci->constipated) {
+        }
+        if (modem & MDM_RTC) {
+                mlines |= TIOCM_DSR | TIOCM_DTR;
                 dlci->constipated = 0;
                 gsm_dlci_data_kick(dlci);
         }
-
         /* Map modem bits */
-        if (modem & MDM_RTC)
-                mlines |= TIOCM_DSR | TIOCM_DTR;
         if (modem & MDM_RTR)
                 mlines |= TIOCM_RTS | TIOCM_CTS;
         if (modem & MDM_IC)
@@ -1065,7 +1057,7 @@ static void gsm_process_modem(struct tty_struct *tty, struct gsm_dlci *dlci,
         /* Carrier drop -> hangup */
         if (tty) {
                 if ((mlines & TIOCM_CD) == 0 && (dlci->modem_rx & TIOCM_CD))
-                        if (!(tty->termios.c_cflag & CLOCAL))
+                        if (!(tty->termios->c_cflag & CLOCAL))
                                 tty_hangup(tty);
                 if (brk & 0x01)
                         tty_insert_flip_char(tty, 0, TTY_BREAK);
@@ -1194,8 +1186,6 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
                                                         u8 *data, int clen)
 {
         u8 buf[1];
-        unsigned long flags;
-
         switch (command) {
         case CMD_CLD: {
                 struct gsm_dlci *dlci = gsm->dlci[0];
@@ -1212,18 +1202,16 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
                 gsm_control_reply(gsm, CMD_TEST, data, clen);
                 break;
         case CMD_FCON:
-                /* Modem can accept data again */
-                gsm->constipated = 0;
+                /* Modem wants us to STFU */
+                gsm->constipated = 1;
                 gsm_control_reply(gsm, CMD_FCON, NULL, 0);
-                /* Kick the link in case it is idling */
-                spin_lock_irqsave(&gsm->tx_lock, flags);
-                gsm_data_kick(gsm);
-                spin_unlock_irqrestore(&gsm->tx_lock, flags);
                 break;
         case CMD_FCOFF:
-                /* Modem wants us to STFU */
-                gsm->constipated = 1;
+                /* Modem can accept data again */
+                gsm->constipated = 0;
                 gsm_control_reply(gsm, CMD_FCOFF, NULL, 0);
+                /* Kick the link in case it is idling */
+                gsm_data_kick(gsm);
                 break;
         case CMD_MSC:
                 /* Out of band modem line change indicator for a DLCI */
@@ -1634,6 +1622,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
         if (dlci == NULL)
                 return NULL;
         spin_lock_init(&dlci->lock);
+        kref_init(&dlci->ref);
         mutex_init(&dlci->mutex);
         dlci->fifo = &dlci->_fifo;
         if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
@@ -1667,26 +1656,26 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
  *
  *      Can sleep.
  */
-static void gsm_dlci_free(struct tty_port *port)
+static void gsm_dlci_free(struct kref *ref)
 {
-        struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port);
+        struct gsm_dlci *dlci = container_of(ref, struct gsm_dlci, ref);
 
         del_timer_sync(&dlci->t1);
         dlci->gsm->dlci[dlci->addr] = NULL;
         kfifo_free(dlci->fifo);
         while ((dlci->skb = skb_dequeue(&dlci->skb_list)))
-                dev_kfree_skb(dlci->skb);
+                kfree_skb(dlci->skb);
         kfree(dlci);
 }
 
 static inline void dlci_get(struct gsm_dlci *dlci)
 {
-        tty_port_get(&dlci->port);
+        kref_get(&dlci->ref);
 }
 
 static inline void dlci_put(struct gsm_dlci *dlci)
 {
-        tty_port_put(&dlci->port);
+        kref_put(&dlci->ref, gsm_dlci_free);
 }
 
 /**
@@ -2014,8 +2003,7 @@ void gsm_cleanup_mux(struct gsm_mux *gsm)
 {
         int i;
         struct gsm_dlci *dlci = gsm->dlci[0];
-        struct gsm_msg *txq, *ntxq;
-        struct gsm_control *gc;
+        struct gsm_msg *txq;
 
         gsm->dead = 1;
 
@@ -2029,13 +2017,6 @@ void gsm_cleanup_mux(struct gsm_mux *gsm)
         spin_unlock(&gsm_mux_lock);
         WARN_ON(i == MAX_MUX);
 
-        /* In theory disconnecting DLCI 0 is sufficient but for some
-           modems this is apparently not the case. */
-        if (dlci) {
-                gc = gsm_control_send(gsm, CMD_CLD, NULL, 0);
-                if (gc)
-                        gsm_control_wait(gsm, gc);
-        }
         del_timer_sync(&gsm->t2_timer);
         /* Now we are sure T2 has stopped */
         if (dlci) {
@@ -2049,9 +2030,11 @@ void gsm_cleanup_mux(struct gsm_mux *gsm)
                 if (gsm->dlci[i])
                         gsm_dlci_release(gsm->dlci[i]);
         /* Now wipe the queues */
-        list_for_each_entry_safe(txq, ntxq, &gsm->tx_list, list)
+        for (txq = gsm->tx_head; txq != NULL; txq = gsm->tx_head) {
+                gsm->tx_head = txq->next;
                 kfree(txq);
-        INIT_LIST_HEAD(&gsm->tx_list);
+        }
+        gsm->tx_tail = NULL;
 }
 EXPORT_SYMBOL_GPL(gsm_cleanup_mux);
 
@@ -2162,7 +2145,6 @@ struct gsm_mux *gsm_alloc_mux(void)
         }
         spin_lock_init(&gsm->lock);
         kref_init(&gsm->ref);
-        INIT_LIST_HEAD(&gsm->tx_list);
 
         gsm->t1 = T1;
         gsm->t2 = T2;
@@ -2279,7 +2261,7 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp,
                         gsm->error(gsm, *dp, flags);
                         break;
                 default:
-                        WARN_ONCE(1, "%s: unknown flag %d\n",
+                        WARN_ONCE("%s: unknown flag %d\n",
                                tty_name(tty, buf), flags);
                         break;
                 }
@@ -2383,12 +2365,12 @@ static void gsmld_write_wakeup(struct tty_struct *tty)
 
         /* Queue poll */
         clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-        spin_lock_irqsave(&gsm->tx_lock, flags);
         gsm_data_kick(gsm);
         if (gsm->tx_bytes < TX_THRESH_LO) {
+                spin_lock_irqsave(&gsm->tx_lock, flags);
                 gsm_dlci_data_sweep(gsm);
+                spin_unlock_irqrestore(&gsm->tx_lock, flags);
         }
-        spin_unlock_irqrestore(&gsm->tx_lock, flags);
 }
 
 /**
@@ -2872,17 +2854,16 @@ static void gsm_dtr_rts(struct tty_port *port, int onoff)
 static const struct tty_port_operations gsm_port_ops = {
         .carrier_raised = gsm_carrier_raised,
         .dtr_rts = gsm_dtr_rts,
-        .destruct = gsm_dlci_free,
 };
 
-static int gsmtty_install(struct tty_driver *driver, struct tty_struct *tty)
+
+static int gsmtty_open(struct tty_struct *tty, struct file *filp)
 {
         struct gsm_mux *gsm;
         struct gsm_dlci *dlci;
+        struct tty_port *port;
         unsigned int line = tty->index;
         unsigned int mux = line >> 6;
-        bool alloc = false;
-        int ret;
 
         line = line & 0x3F;
 
@@ -2896,35 +2877,14 @@ static int gsmtty_install(struct tty_driver *driver, struct tty_struct *tty)
         gsm = gsm_mux[mux];
         if (gsm->dead)
                 return -EL2HLT;
-        /* If DLCI 0 is not yet fully open return an error. This is ok from a locking
-           perspective as we don't have to worry about this if DLCI0 is lost */
-        if (gsm->dlci[0] && gsm->dlci[0]->state != DLCI_OPEN) 
-                return -EL2NSYNC;
         dlci = gsm->dlci[line];
-        if (dlci == NULL) {
-                alloc = true;
+        if (dlci == NULL)
                 dlci = gsm_dlci_alloc(gsm, line);
-        }
         if (dlci == NULL)
                 return -ENOMEM;
-        ret = tty_port_install(&dlci->port, driver, tty);
-        if (ret) {
-                if (alloc)
-                        dlci_put(dlci);
-                return ret;
-        }
-
-        tty->driver_data = dlci;
-
-        return 0;
-}
-
-static int gsmtty_open(struct tty_struct *tty, struct file *filp)
-{
-        struct gsm_dlci *dlci = tty->driver_data;
-        struct tty_port *port = &dlci->port;
-
+        port = &dlci->port;
         port->count++;
+        tty->driver_data = dlci;
         dlci_get(dlci);
         dlci_get(dlci->gsm->dlci[0]);
         mux_get(dlci->gsm);
@@ -3022,7 +2982,7 @@ static int gsmtty_tiocmset(struct tty_struct *tty,
         struct gsm_dlci *dlci = tty->driver_data;
         unsigned int modem_tx = dlci->modem_tx;
 
-        modem_tx &= ~clear;
+        modem_tx &= clear;
         modem_tx |= set;
 
         if (modem_tx != dlci->modem_tx) {
@@ -3071,13 +3031,13 @@ static void gsmtty_set_termios(struct tty_struct *tty, struct ktermios *old)
            the RPN control message. This however rapidly gets nasty as we
            then have to remap modem signals each way according to whether
            our virtual cable is null modem etc .. */
-        tty_termios_copy_hw(&tty->termios, old);
+        tty_termios_copy_hw(tty->termios, old);
 }
 
 static void gsmtty_throttle(struct tty_struct *tty)
 {
         struct gsm_dlci *dlci = tty->driver_data;
-        if (tty->termios.c_cflag & CRTSCTS)
+        if (tty->termios->c_cflag & CRTSCTS)
                 dlci->modem_tx &= ~TIOCM_DTR;
         dlci->throttled = 1;
         /* Send an MSC with DTR cleared */
@@ -3087,7 +3047,7 @@ static void gsmtty_throttle(struct tty_struct *tty)
 static void gsmtty_unthrottle(struct tty_struct *tty)
 {
         struct gsm_dlci *dlci = tty->driver_data;
-        if (tty->termios.c_cflag & CRTSCTS)
+        if (tty->termios->c_cflag & CRTSCTS)
                 dlci->modem_tx |= TIOCM_DTR;
         dlci->throttled = 0;
         /* Send an MSC with DTR set */
@@ -3113,7 +3073,6 @@ static int gsmtty_break_ctl(struct tty_struct *tty, int state)
 
 /* Virtual ttys for the demux */
 static const struct tty_operations gsmtty_ops = {
-        .install                = gsmtty_install,
         .open                   = gsmtty_open,
         .close                  = gsmtty_close,
         .write                  = gsmtty_write,
@@ -3149,6 +3108,7 @@ static int __init gsm_init(void)
                 pr_err("gsm_init: tty allocation failed.\n");
                 return -EINVAL;
         }
+        gsm_tty_driver->owner   = THIS_MODULE;
         gsm_tty_driver->driver_name     = "gsmtty";
         gsm_tty_driver->name            = "gsmtty";
         gsm_tty_driver->major           = 0;    /* Dynamic */
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 1b2db9a3038..cea56033b34 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -102,6 +102,7 @@
 #include <linux/if.h>
 #include <linux/bitops.h>
 
+#include <asm/system.h>
 #include <asm/termios.h>
 #include <asm/uaccess.h>
 
@@ -416,7 +417,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
                                 __FILE__,__LINE__,tbuf,tbuf->count);
                         
                 /* Send the next block of data to device */
-                set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
                 actual = tty->ops->write(tty, tbuf->buf, tbuf->count);
 
                 /* rollback was possible and has been done */
@@ -458,7 +459,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
         }
         
         if (!tbuf)
-                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                tty->flags  &= ~(1 << TTY_DO_WRITE_WAKEUP);
         
         /* Clear the re-entry flag */
         spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
@@ -490,7 +491,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty)
                 return;
 
         if (tty != n_hdlc->tty) {
-                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
                 return;
         }
 
diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index 1e6405070ce..5c6c31459a2 100644
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -1065,7 +1065,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
 
         TRACE_L("read()");
 
-        tty_lock(tty);
+        tty_lock();
 
         pClient = findClient(pInfo, task_pid(current));
         if (pClient) {
@@ -1077,7 +1077,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
                                 goto unlock;
                         }
                         /* block until there is a message: */
-                        wait_event_interruptible_tty(tty, pInfo->read_wait,
+                        wait_event_interruptible_tty(pInfo->read_wait,
                                         (pMsg = remove_msg(pInfo, pClient)));
                 }
 
@@ -1107,7 +1107,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
         }
         ret = -EPERM;
 unlock:
-        tty_unlock(tty);
+        tty_unlock();
         return ret;
 }
 
@@ -1156,7 +1156,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
         pHeader->locks = 0;
         pHeader->owner = NULL;
 
-        tty_lock(tty);
+        tty_lock();
 
         pClient = findClient(pInfo, task_pid(current));
         if (pClient) {
@@ -1175,7 +1175,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
         add_tx_queue(pInfo, pHeader);
         trigger_transmit(pInfo);
 
-        tty_unlock(tty);
+        tty_unlock();
 
         return 0;
 }
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 19083efa231..39d6ab6551e 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -50,6 +50,7 @@
 #include <linux/uaccess.h>
 #include <linux/module.h>
 
+#include <asm/system.h>
 
 /* number of characters left in xmit buffer before select has we have room */
 #define WAKEUP_CHARS 256
@@ -60,7 +61,7 @@
  * controlling the space in the read buffer.
  */
 #define TTY_THRESHOLD_THROTTLE          128 /* now based on remaining room */
-#define TTY_THRESHOLD_UNTHROTTLE        128
+#define TTY_THRESHOLD_UNTHROTTLE        128
 
 /*
  * Special byte codes used in the echo buffer to represent operations
@@ -73,42 +74,10 @@
 #define ECHO_OP_SET_CANON_COL 0x81
 #define ECHO_OP_ERASE_TAB 0x82
 
-struct n_tty_data {
-        unsigned int column;
-        unsigned long overrun_time;
-        int num_overrun;
-
-        unsigned char lnext:1, erasing:1, raw:1, real_raw:1, icanon:1;
-        unsigned char echo_overrun:1;
-
-        DECLARE_BITMAP(process_char_map, 256);
-        DECLARE_BITMAP(read_flags, N_TTY_BUF_SIZE);
-
-        char *read_buf;
-        int read_head;
-        int read_tail;
-        int read_cnt;
-
-        unsigned char *echo_buf;
-        unsigned int echo_pos;
-        unsigned int echo_cnt;
-
-        int canon_data;
-        unsigned long canon_head;
-        unsigned int canon_column;
-
-        struct mutex atomic_read_lock;
-        struct mutex output_lock;
-        struct mutex echo_lock;
-        spinlock_t read_lock;
-};
-
 static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
                                unsigned char __user *ptr)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-
-        tty_audit_add_data(tty, &x, 1, ldata->icanon);
+        tty_audit_add_data(tty, &x, 1);
         return put_user(x, ptr);
 }
 
@@ -124,19 +93,10 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
 
 static void n_tty_set_room(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-        int left;
+        /* tty->read_cnt is not read locked ? */
+        int     left = N_TTY_BUF_SIZE - tty->read_cnt - 1;
         int old_left;
 
-        /* ldata->read_cnt is not read locked ? */
-        if (I_PARMRK(tty)) {
-                /* Multiply read_cnt by 3, since each byte might take up to
-                 * three times as many spaces when PARMRK is set (depending on
-                 * its flags, e.g. parity error). */
-                left = N_TTY_BUF_SIZE - ldata->read_cnt * 3 - 1;
-        } else
-                left = N_TTY_BUF_SIZE - ldata->read_cnt - 1;
-
         /*
          * If we are doing input canonicalization, and there are no
          * pending newlines, let characters through without limit, so
@@ -144,47 +104,44 @@ static void n_tty_set_room(struct tty_struct *tty)
          * characters will be beeped.
          */
         if (left <= 0)
-                left = ldata->icanon && !ldata->canon_data;
+                left = tty->icanon && !tty->canon_data;
         old_left = tty->receive_room;
         tty->receive_room = left;
 
         /* Did this open up the receive buffer? We may need to flip */
-        if (left && !old_left) {
-                WARN_RATELIMIT(tty->port->itty == NULL,
-                                "scheduling with invalid itty\n");
-                schedule_work(&tty->port->buf.work);
-        }
+        if (left && !old_left)
+                schedule_work(&tty->buf.work);
 }
 
-static void put_tty_queue_nolock(unsigned char c, struct n_tty_data *ldata)
+static void put_tty_queue_nolock(unsigned char c, struct tty_struct *tty)
 {
-        if (ldata->read_cnt < N_TTY_BUF_SIZE) {
-                ldata->read_buf[ldata->read_head] = c;
-                ldata->read_head = (ldata->read_head + 1) & (N_TTY_BUF_SIZE-1);
-                ldata->read_cnt++;
+        if (tty->read_cnt < N_TTY_BUF_SIZE) {
+                tty->read_buf[tty->read_head] = c;
+                tty->read_head = (tty->read_head + 1) & (N_TTY_BUF_SIZE-1);
+                tty->read_cnt++;
         }
 }
 
 /**
  *      put_tty_queue           -       add character to tty
  *      @c: character
- *      @ldata: n_tty data
+ *      @tty: tty device
  *
  *      Add a character to the tty read_buf queue. This is done under the
  *      read_lock to serialize character addition and also to protect us
  *      against parallel reads or flushes
  */
 
-static void put_tty_queue(unsigned char c, struct n_tty_data *ldata)
+static void put_tty_queue(unsigned char c, struct tty_struct *tty)
 {
         unsigned long flags;
         /*
          *      The problem of stomping on the buffers ends here.
          *      Why didn't anyone see this one coming? --AJK
         */
-        spin_lock_irqsave(&ldata->read_lock, flags);
-        put_tty_queue_nolock(c, ldata);
-        spin_unlock_irqrestore(&ldata->read_lock, flags);
+        spin_lock_irqsave(&tty->read_lock, flags);
+        put_tty_queue_nolock(c, tty);
+        spin_unlock_irqrestore(&tty->read_lock, flags);
 }
 
 /**
@@ -215,19 +172,18 @@ static void check_unthrottle(struct tty_struct *tty)
 
 static void reset_buffer_flags(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         unsigned long flags;
 
-        spin_lock_irqsave(&ldata->read_lock, flags);
-        ldata->read_head = ldata->read_tail = ldata->read_cnt = 0;
-        spin_unlock_irqrestore(&ldata->read_lock, flags);
+        spin_lock_irqsave(&tty->read_lock, flags);
+        tty->read_head = tty->read_tail = tty->read_cnt = 0;
+        spin_unlock_irqrestore(&tty->read_lock, flags);
 
-        mutex_lock(&ldata->echo_lock);
-        ldata->echo_pos = ldata->echo_cnt = ldata->echo_overrun = 0;
-        mutex_unlock(&ldata->echo_lock);
+        mutex_lock(&tty->echo_lock);
+        tty->echo_pos = tty->echo_cnt = tty->echo_overrun = 0;
+        mutex_unlock(&tty->echo_lock);
 
-        ldata->canon_head = ldata->canon_data = ldata->erasing = 0;
-        bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
+        tty->canon_head = tty->canon_data = tty->erasing = 0;
+        memset(&tty->read_flags, 0, sizeof tty->read_flags);
         n_tty_set_room(tty);
 }
 
@@ -272,19 +228,18 @@ static void n_tty_flush_buffer(struct tty_struct *tty)
 
 static ssize_t n_tty_chars_in_buffer(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         unsigned long flags;
         ssize_t n = 0;
 
-        spin_lock_irqsave(&ldata->read_lock, flags);
-        if (!ldata->icanon) {
-                n = ldata->read_cnt;
-        } else if (ldata->canon_data) {
-                n = (ldata->canon_head > ldata->read_tail) ?
-                        ldata->canon_head - ldata->read_tail :
-                        ldata->canon_head + (N_TTY_BUF_SIZE - ldata->read_tail);
+        spin_lock_irqsave(&tty->read_lock, flags);
+        if (!tty->icanon) {
+                n = tty->read_cnt;
+        } else if (tty->canon_data) {
+                n = (tty->canon_head > tty->read_tail) ?
+                        tty->canon_head - tty->read_tail :
+                        tty->canon_head + (N_TTY_BUF_SIZE - tty->read_tail);
         }
-        spin_unlock_irqrestore(&ldata->read_lock, flags);
+        spin_unlock_irqrestore(&tty->read_lock, flags);
         return n;
 }
 
@@ -339,7 +294,6 @@ static inline int is_continuation(unsigned char c, struct tty_struct *tty)
 
 static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int     spaces;
 
         if (!space)
@@ -348,48 +302,48 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
         switch (c) {
         case '\n':
                 if (O_ONLRET(tty))
-                        ldata->column = 0;
+                        tty->column = 0;
                 if (O_ONLCR(tty)) {
                         if (space < 2)
                                 return -1;
-                        ldata->canon_column = ldata->column = 0;
+                        tty->canon_column = tty->column = 0;
                         tty->ops->write(tty, "\r\n", 2);
                         return 2;
                 }
-                ldata->canon_column = ldata->column;
+                tty->canon_column = tty->column;
                 break;
         case '\r':
-                if (O_ONOCR(tty) && ldata->column == 0)
+                if (O_ONOCR(tty) && tty->column == 0)
                         return 0;
                 if (O_OCRNL(tty)) {
                         c = '\n';
                         if (O_ONLRET(tty))
-                                ldata->canon_column = ldata->column = 0;
+                                tty->canon_column = tty->column = 0;
                         break;
                 }
-                ldata->canon_column = ldata->column = 0;
+                tty->canon_column = tty->column = 0;
                 break;
         case '\t':
-                spaces = 8 - (ldata->column & 7);
+                spaces = 8 - (tty->column & 7);
                 if (O_TABDLY(tty) == XTABS) {
                         if (space < spaces)
                                 return -1;
-                        ldata->column += spaces;
+                        tty->column += spaces;
                         tty->ops->write(tty, "        ", spaces);
                         return spaces;
                 }
-                ldata->column += spaces;
+                tty->column += spaces;
                 break;
         case '\b':
-                if (ldata->column > 0)
-                        ldata->column--;
+                if (tty->column > 0)
+                        tty->column--;
                 break;
         default:
                 if (!iscntrl(c)) {
                         if (O_OLCUC(tty))
                                 c = toupper(c);
                         if (!is_continuation(c, tty))
-                                ldata->column++;
+                                tty->column++;
                 }
                 break;
         }
@@ -414,15 +368,14 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
 
 static int process_output(unsigned char c, struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int     space, retval;
 
-        mutex_lock(&ldata->output_lock);
+        mutex_lock(&tty->output_lock);
 
         space = tty_write_room(tty);
         retval = do_output_char(c, tty, space);
 
-        mutex_unlock(&ldata->output_lock);
+        mutex_unlock(&tty->output_lock);
         if (retval < 0)
                 return -1;
         else
@@ -451,16 +404,15 @@ static int process_output(unsigned char c, struct tty_struct *tty)
 static ssize_t process_output_block(struct tty_struct *tty,
                                     const unsigned char *buf, unsigned int nr)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int     space;
-        int     i;
+        int     i;
         const unsigned char *cp;
 
-        mutex_lock(&ldata->output_lock);
+        mutex_lock(&tty->output_lock);
 
         space = tty_write_room(tty);
         if (!space) {
-                mutex_unlock(&ldata->output_lock);
+                mutex_unlock(&tty->output_lock);
                 return 0;
         }
         if (nr > space)
@@ -472,30 +424,30 @@ static ssize_t process_output_block(struct tty_struct *tty,
                 switch (c) {
                 case '\n':
                         if (O_ONLRET(tty))
-                                ldata->column = 0;
+                                tty->column = 0;
                         if (O_ONLCR(tty))
                                 goto break_out;
-                        ldata->canon_column = ldata->column;
+                        tty->canon_column = tty->column;
                         break;
                 case '\r':
-                        if (O_ONOCR(tty) && ldata->column == 0)
+                        if (O_ONOCR(tty) && tty->column == 0)
                                 goto break_out;
                         if (O_OCRNL(tty))
                                 goto break_out;
-                        ldata->canon_column = ldata->column = 0;
+                        tty->canon_column = tty->column = 0;
                         break;
                 case '\t':
                         goto break_out;
                 case '\b':
-                        if (ldata->column > 0)
-                                ldata->column--;
+                        if (tty->column > 0)
+                                tty->column--;
                         break;
                 default:
                         if (!iscntrl(c)) {
                                 if (O_OLCUC(tty))
                                         goto break_out;
                                 if (!is_continuation(c, tty))
-                                        ldata->column++;
+                                        tty->column++;
                         }
                         break;
                 }
@@ -503,7 +455,7 @@ static ssize_t process_output_block(struct tty_struct *tty,
 break_out:
         i = tty->ops->write(tty, buf, i);
 
-        mutex_unlock(&ldata->output_lock);
+        mutex_unlock(&tty->output_lock);
         return i;
 }
 
@@ -535,22 +487,21 @@ break_out:
 
 static void process_echoes(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int     space, nr;
         unsigned char c;
         unsigned char *cp, *buf_end;
 
-        if (!ldata->echo_cnt)
+        if (!tty->echo_cnt)
                 return;
 
-        mutex_lock(&ldata->output_lock);
-        mutex_lock(&ldata->echo_lock);
+        mutex_lock(&tty->output_lock);
+        mutex_lock(&tty->echo_lock);
 
         space = tty_write_room(tty);
 
-        buf_end = ldata->echo_buf + N_TTY_BUF_SIZE;
-        cp = ldata->echo_buf + ldata->echo_pos;
-        nr = ldata->echo_cnt;
+        buf_end = tty->echo_buf + N_TTY_BUF_SIZE;
+        cp = tty->echo_buf + tty->echo_pos;
+        nr = tty->echo_cnt;
         while (nr > 0) {
                 c = *cp;
                 if (c == ECHO_OP_START) {
@@ -587,7 +538,7 @@ static void process_echoes(struct tty_struct *tty)
                                  * Otherwise, tab spacing is normal.
                                  */
                                 if (!(num_chars & 0x80))
-                                        num_chars += ldata->canon_column;
+                                        num_chars += tty->canon_column;
                                 num_bs = 8 - (num_chars & 7);
 
                                 if (num_bs > space) {
@@ -597,22 +548,22 @@ static void process_echoes(struct tty_struct *tty)
                                 space -= num_bs;
                                 while (num_bs--) {
                                         tty_put_char(tty, '\b');
-                                        if (ldata->column > 0)
-                                                ldata->column--;
+                                        if (tty->column > 0)
+                                                tty->column--;
                                 }
                                 cp += 3;
                                 nr -= 3;
                                 break;
 
                         case ECHO_OP_SET_CANON_COL:
-                                ldata->canon_column = ldata->column;
+                                tty->canon_column = tty->column;
                                 cp += 2;
                                 nr -= 2;
                                 break;
 
                         case ECHO_OP_MOVE_BACK_COL:
-                                if (ldata->column > 0)
-                                        ldata->column--;
+                                if (tty->column > 0)
+                                        tty->column--;
                                 cp += 2;
                                 nr -= 2;
                                 break;
@@ -624,7 +575,7 @@ static void process_echoes(struct tty_struct *tty)
                                         break;
                                 }
                                 tty_put_char(tty, ECHO_OP_START);
-                                ldata->column++;
+                                tty->column++;
                                 space--;
                                 cp += 2;
                                 nr -= 2;
@@ -646,7 +597,7 @@ static void process_echoes(struct tty_struct *tty)
                                 }
                                 tty_put_char(tty, '^');
                                 tty_put_char(tty, op ^ 0100);
-                                ldata->column += 2;
+                                tty->column += 2;
                                 space -= 2;
                                 cp += 2;
                                 nr -= 2;
@@ -677,20 +628,20 @@ static void process_echoes(struct tty_struct *tty)
         }
 
         if (nr == 0) {
-                ldata->echo_pos = 0;
-                ldata->echo_cnt = 0;
-                ldata->echo_overrun = 0;
+                tty->echo_pos = 0;
+                tty->echo_cnt = 0;
+                tty->echo_overrun = 0;
         } else {
-                int num_processed = ldata->echo_cnt - nr;
-                ldata->echo_pos += num_processed;
-                ldata->echo_pos &= N_TTY_BUF_SIZE - 1;
-                ldata->echo_cnt = nr;
+                int num_processed = tty->echo_cnt - nr;
+                tty->echo_pos += num_processed;
+                tty->echo_pos &= N_TTY_BUF_SIZE - 1;
+                tty->echo_cnt = nr;
                 if (num_processed > 0)
-                        ldata->echo_overrun = 0;
+                        tty->echo_overrun = 0;
         }
 
-        mutex_unlock(&ldata->echo_lock);
-        mutex_unlock(&ldata->output_lock);
+        mutex_unlock(&tty->echo_lock);
+        mutex_unlock(&tty->output_lock);
 
         if (tty->ops->flush_chars)
                 tty->ops->flush_chars(tty);
@@ -699,70 +650,72 @@ static void process_echoes(struct tty_struct *tty)
 /**
  *      add_echo_byte   -       add a byte to the echo buffer
  *      @c: unicode byte to echo
- *      @ldata: n_tty data
+ *      @tty: terminal device
  *
  *      Add a character or operation byte to the echo buffer.
  *
  *      Should be called under the echo lock to protect the echo buffer.
  */
 
-static void add_echo_byte(unsigned char c, struct n_tty_data *ldata)
+static void add_echo_byte(unsigned char c, struct tty_struct *tty)
 {
         int     new_byte_pos;
 
-        if (ldata->echo_cnt == N_TTY_BUF_SIZE) {
+        if (tty->echo_cnt == N_TTY_BUF_SIZE) {
                 /* Circular buffer is already at capacity */
-                new_byte_pos = ldata->echo_pos;
+                new_byte_pos = tty->echo_pos;
 
                 /*
                  * Since the buffer start position needs to be advanced,
                  * be sure to step by a whole operation byte group.
                  */
-                if (ldata->echo_buf[ldata->echo_pos] == ECHO_OP_START) {
-                        if (ldata->echo_buf[(ldata->echo_pos + 1) &
+                if (tty->echo_buf[tty->echo_pos] == ECHO_OP_START) {
+                        if (tty->echo_buf[(tty->echo_pos + 1) &
                                           (N_TTY_BUF_SIZE - 1)] ==
                                                 ECHO_OP_ERASE_TAB) {
-                                ldata->echo_pos += 3;
-                                ldata->echo_cnt -= 2;
+                                tty->echo_pos += 3;
+                                tty->echo_cnt -= 2;
                         } else {
-                                ldata->echo_pos += 2;
-                                ldata->echo_cnt -= 1;
+                                tty->echo_pos += 2;
+                                tty->echo_cnt -= 1;
                         }
                 } else {
-                        ldata->echo_pos++;
+                        tty->echo_pos++;
                 }
-                ldata->echo_pos &= N_TTY_BUF_SIZE - 1;
+                tty->echo_pos &= N_TTY_BUF_SIZE - 1;
 
-                ldata->echo_overrun = 1;
+                tty->echo_overrun = 1;
         } else {
-                new_byte_pos = ldata->echo_pos + ldata->echo_cnt;
+                new_byte_pos = tty->echo_pos + tty->echo_cnt;
                 new_byte_pos &= N_TTY_BUF_SIZE - 1;
-                ldata->echo_cnt++;
+                tty->echo_cnt++;
         }
 
-        ldata->echo_buf[new_byte_pos] = c;
+        tty->echo_buf[new_byte_pos] = c;
 }
 
 /**
  *      echo_move_back_col      -       add operation to move back a column
- *      @ldata: n_tty data
+ *      @tty: terminal device
  *
  *      Add an operation to the echo buffer to move back one column.
  *
  *      Locking: echo_lock to protect the echo buffer
  */
 
-static void echo_move_back_col(struct n_tty_data *ldata)
+static void echo_move_back_col(struct tty_struct *tty)
 {
-        mutex_lock(&ldata->echo_lock);
-        add_echo_byte(ECHO_OP_START, ldata);
-        add_echo_byte(ECHO_OP_MOVE_BACK_COL, ldata);
-        mutex_unlock(&ldata->echo_lock);
+        mutex_lock(&tty->echo_lock);
+
+        add_echo_byte(ECHO_OP_START, tty);
+        add_echo_byte(ECHO_OP_MOVE_BACK_COL, tty);
+
+        mutex_unlock(&tty->echo_lock);
 }
 
 /**
  *      echo_set_canon_col      -       add operation to set the canon column
- *      @ldata: n_tty data
+ *      @tty: terminal device
  *
  *      Add an operation to the echo buffer to set the canon column
  *      to the current column.
@@ -770,19 +723,21 @@ static void echo_move_back_col(struct n_tty_data *ldata)
  *      Locking: echo_lock to protect the echo buffer
  */
 
-static void echo_set_canon_col(struct n_tty_data *ldata)
+static void echo_set_canon_col(struct tty_struct *tty)
 {
-        mutex_lock(&ldata->echo_lock);
-        add_echo_byte(ECHO_OP_START, ldata);
-        add_echo_byte(ECHO_OP_SET_CANON_COL, ldata);
-        mutex_unlock(&ldata->echo_lock);
+        mutex_lock(&tty->echo_lock);
+
+        add_echo_byte(ECHO_OP_START, tty);
+        add_echo_byte(ECHO_OP_SET_CANON_COL, tty);
+
+        mutex_unlock(&tty->echo_lock);
 }
 
 /**
  *      echo_erase_tab  -       add operation to erase a tab
  *      @num_chars: number of character columns already used
  *      @after_tab: true if num_chars starts after a previous tab
- *      @ldata: n_tty data
+ *      @tty: terminal device
  *
  *      Add an operation to the echo buffer to erase a tab.
  *
@@ -796,12 +751,12 @@ static void echo_set_canon_col(struct n_tty_data *ldata)
  */
 
 static void echo_erase_tab(unsigned int num_chars, int after_tab,
-                           struct n_tty_data *ldata)
+                           struct tty_struct *tty)
 {
-        mutex_lock(&ldata->echo_lock);
+        mutex_lock(&tty->echo_lock);
 
-        add_echo_byte(ECHO_OP_START, ldata);
-        add_echo_byte(ECHO_OP_ERASE_TAB, ldata);
+        add_echo_byte(ECHO_OP_START, tty);
+        add_echo_byte(ECHO_OP_ERASE_TAB, tty);
 
         /* We only need to know this modulo 8 (tab spacing) */
         num_chars &= 7;
@@ -810,9 +765,9 @@ static void echo_erase_tab(unsigned int num_chars, int after_tab,
         if (after_tab)
                 num_chars |= 0x80;
 
-        add_echo_byte(num_chars, ldata);
+        add_echo_byte(num_chars, tty);
 
-        mutex_unlock(&ldata->echo_lock);
+        mutex_unlock(&tty->echo_lock);
 }
 
 /**
@@ -828,16 +783,18 @@ static void echo_erase_tab(unsigned int num_chars, int after_tab,
  *      Locking: echo_lock to protect the echo buffer
  */
 
-static void echo_char_raw(unsigned char c, struct n_tty_data *ldata)
+static void echo_char_raw(unsigned char c, struct tty_struct *tty)
 {
-        mutex_lock(&ldata->echo_lock);
+        mutex_lock(&tty->echo_lock);
+
         if (c == ECHO_OP_START) {
-                add_echo_byte(ECHO_OP_START, ldata);
-                add_echo_byte(ECHO_OP_START, ldata);
+                add_echo_byte(ECHO_OP_START, tty);
+                add_echo_byte(ECHO_OP_START, tty);
         } else {
-                add_echo_byte(c, ldata);
+                add_echo_byte(c, tty);
         }
-        mutex_unlock(&ldata->echo_lock);
+
+        mutex_unlock(&tty->echo_lock);
 }
 
 /**
@@ -856,32 +813,30 @@ static void echo_char_raw(unsigned char c, struct n_tty_data *ldata)
 
 static void echo_char(unsigned char c, struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-
-        mutex_lock(&ldata->echo_lock);
+        mutex_lock(&tty->echo_lock);
 
         if (c == ECHO_OP_START) {
-                add_echo_byte(ECHO_OP_START, ldata);
-                add_echo_byte(ECHO_OP_START, ldata);
+                add_echo_byte(ECHO_OP_START, tty);
+                add_echo_byte(ECHO_OP_START, tty);
         } else {
                 if (L_ECHOCTL(tty) && iscntrl(c) && c != '\t')
-                        add_echo_byte(ECHO_OP_START, ldata);
-                add_echo_byte(c, ldata);
+                        add_echo_byte(ECHO_OP_START, tty);
+                add_echo_byte(c, tty);
         }
 
-        mutex_unlock(&ldata->echo_lock);
+        mutex_unlock(&tty->echo_lock);
 }
 
 /**
  *      finish_erasing          -       complete erase
- *      @ldata: n_tty data
+ *      @tty: tty doing the erase
  */
 
-static inline void finish_erasing(struct n_tty_data *ldata)
+static inline void finish_erasing(struct tty_struct *tty)
 {
-        if (ldata->erasing) {
-                echo_char_raw('/', ldata);
-                ldata->erasing = 0;
+        if (tty->erasing) {
+                echo_char_raw('/', tty);
+                tty->erasing = 0;
         }
 }
 
@@ -899,13 +854,12 @@ static inline void finish_erasing(struct n_tty_data *ldata)
 
 static void eraser(unsigned char c, struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         enum { ERASE, WERASE, KILL } kill_type;
         int head, seen_alnums, cnt;
         unsigned long flags;
 
         /* FIXME: locking needed ? */
-        if (ldata->read_head == ldata->canon_head) {
+        if (tty->read_head == tty->canon_head) {
                 /* process_output('\a', tty); */ /* what do you think? */
                 return;
         }
@@ -915,24 +869,24 @@ static void eraser(unsigned char c, struct tty_struct *tty)
                 kill_type = WERASE;
         else {
                 if (!L_ECHO(tty)) {
-                        spin_lock_irqsave(&ldata->read_lock, flags);
-                        ldata->read_cnt -= ((ldata->read_head - ldata->canon_head) &
+                        spin_lock_irqsave(&tty->read_lock, flags);
+                        tty->read_cnt -= ((tty->read_head - tty->canon_head) &
                                           (N_TTY_BUF_SIZE - 1));
-                        ldata->read_head = ldata->canon_head;
-                        spin_unlock_irqrestore(&ldata->read_lock, flags);
+                        tty->read_head = tty->canon_head;
+                        spin_unlock_irqrestore(&tty->read_lock, flags);
                         return;
                 }
                 if (!L_ECHOK(tty) || !L_ECHOKE(tty) || !L_ECHOE(tty)) {
-                        spin_lock_irqsave(&ldata->read_lock, flags);
-                        ldata->read_cnt -= ((ldata->read_head - ldata->canon_head) &
+                        spin_lock_irqsave(&tty->read_lock, flags);
+                        tty->read_cnt -= ((tty->read_head - tty->canon_head) &
                                           (N_TTY_BUF_SIZE - 1));
-                        ldata->read_head = ldata->canon_head;
-                        spin_unlock_irqrestore(&ldata->read_lock, flags);
-                        finish_erasing(ldata);
+                        tty->read_head = tty->canon_head;
+                        spin_unlock_irqrestore(&tty->read_lock, flags);
+                        finish_erasing(tty);
                         echo_char(KILL_CHAR(tty), tty);
                         /* Add a newline if ECHOK is on and ECHOKE is off. */
                         if (L_ECHOK(tty))
-                                echo_char_raw('\n', ldata);
+                                echo_char_raw('\n', tty);
                         return;
                 }
                 kill_type = KILL;
@@ -940,14 +894,14 @@ static void eraser(unsigned char c, struct tty_struct *tty)
 
         seen_alnums = 0;
         /* FIXME: Locking ?? */
-        while (ldata->read_head != ldata->canon_head) {
-                head = ldata->read_head;
+        while (tty->read_head != tty->canon_head) {
+                head = tty->read_head;
 
                 /* erase a single possibly multibyte character */
                 do {
                         head = (head - 1) & (N_TTY_BUF_SIZE-1);
-                        c = ldata->read_buf[head];
-                } while (is_continuation(c, tty) && head != ldata->canon_head);
+                        c = tty->read_buf[head];
+                } while (is_continuation(c, tty) && head != tty->canon_head);
 
                 /* do not partially erase */
                 if (is_continuation(c, tty))
@@ -960,31 +914,30 @@ static void eraser(unsigned char c, struct tty_struct *tty)
                         else if (seen_alnums)
                                 break;
                 }
-                cnt = (ldata->read_head - head) & (N_TTY_BUF_SIZE-1);
-                spin_lock_irqsave(&ldata->read_lock, flags);
-                ldata->read_head = head;
-                ldata->read_cnt -= cnt;
-                spin_unlock_irqrestore(&ldata->read_lock, flags);
+                cnt = (tty->read_head - head) & (N_TTY_BUF_SIZE-1);
+                spin_lock_irqsave(&tty->read_lock, flags);
+                tty->read_head = head;
+                tty->read_cnt -= cnt;
+                spin_unlock_irqrestore(&tty->read_lock, flags);
                 if (L_ECHO(tty)) {
                         if (L_ECHOPRT(tty)) {
-                                if (!ldata->erasing) {
-                                        echo_char_raw('\\', ldata);
-                                        ldata->erasing = 1;
+                                if (!tty->erasing) {
+                                        echo_char_raw('\\', tty);
+                                        tty->erasing = 1;
                                 }
                                 /* if cnt > 1, output a multi-byte character */
                                 echo_char(c, tty);
                                 while (--cnt > 0) {
                                         head = (head+1) & (N_TTY_BUF_SIZE-1);
-                                        echo_char_raw(ldata->read_buf[head],
-                                                        ldata);
-                                        echo_move_back_col(ldata);
+                                        echo_char_raw(tty->read_buf[head], tty);
+                                        echo_move_back_col(tty);
                                 }
                         } else if (kill_type == ERASE && !L_ECHOE(tty)) {
                                 echo_char(ERASE_CHAR(tty), tty);
                         } else if (c == '\t') {
                                 unsigned int num_chars = 0;
                                 int after_tab = 0;
-                                unsigned long tail = ldata->read_head;
+                                unsigned long tail = tty->read_head;
 
                                 /*
                                  * Count the columns used for characters
@@ -993,9 +946,9 @@ static void eraser(unsigned char c, struct tty_struct *tty)
                                  * This info is used to go back the correct
                                  * number of columns.
                                  */
-                                while (tail != ldata->canon_head) {
+                                while (tail != tty->canon_head) {
                                         tail = (tail-1) & (N_TTY_BUF_SIZE-1);
-                                        c = ldata->read_buf[tail];
+                                        c = tty->read_buf[tail];
                                         if (c == '\t') {
                                                 after_tab = 1;
                                                 break;
@@ -1006,25 +959,25 @@ static void eraser(unsigned char c, struct tty_struct *tty)
                                                 num_chars++;
                                         }
                                 }
-                                echo_erase_tab(num_chars, after_tab, ldata);
+                                echo_erase_tab(num_chars, after_tab, tty);
                         } else {
                                 if (iscntrl(c) && L_ECHOCTL(tty)) {
-                                        echo_char_raw('\b', ldata);
-                                        echo_char_raw(' ', ldata);
-                                        echo_char_raw('\b', ldata);
+                                        echo_char_raw('\b', tty);
+                                        echo_char_raw(' ', tty);
+                                        echo_char_raw('\b', tty);
                                 }
                                 if (!iscntrl(c) || L_ECHOCTL(tty)) {
-                                        echo_char_raw('\b', ldata);
-                                        echo_char_raw(' ', ldata);
-                                        echo_char_raw('\b', ldata);
+                                        echo_char_raw('\b', tty);
+                                        echo_char_raw(' ', tty);
+                                        echo_char_raw('\b', tty);
                                 }
                         }
                 }
                 if (kill_type == ERASE)
                         break;
         }
-        if (ldata->read_head == ldata->canon_head && L_ECHO(tty))
-                finish_erasing(ldata);
+        if (tty->read_head == tty->canon_head && L_ECHO(tty))
+                finish_erasing(tty);
 }
 
 /**
@@ -1063,8 +1016,6 @@ static inline void isig(int sig, struct tty_struct *tty, int flush)
 
 static inline void n_tty_receive_break(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-
         if (I_IGNBRK(tty))
                 return;
         if (I_BRKINT(tty)) {
@@ -1072,10 +1023,10 @@ static inline void n_tty_receive_break(struct tty_struct *tty)
                 return;
         }
         if (I_PARMRK(tty)) {
-                put_tty_queue('\377', ldata);
-                put_tty_queue('\0', ldata);
+                put_tty_queue('\377', tty);
+                put_tty_queue('\0', tty);
         }
-        put_tty_queue('\0', ldata);
+        put_tty_queue('\0', tty);
         wake_up_interruptible(&tty->read_wait);
 }
 
@@ -1094,17 +1045,16 @@ static inline void n_tty_receive_break(struct tty_struct *tty)
 
 static inline void n_tty_receive_overrun(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         char buf[64];
 
-        ldata->num_overrun++;
-        if (time_after(jiffies, ldata->overrun_time + HZ) ||
-                        time_after(ldata->overrun_time, jiffies)) {
+        tty->num_overrun++;
+        if (time_before(tty->overrun_time, jiffies - HZ) ||
+                        time_after(tty->overrun_time, jiffies)) {
                 printk(KERN_WARNING "%s: %d input overrun(s)\n",
                         tty_name(tty, buf),
-                        ldata->num_overrun);
-                ldata->overrun_time = jiffies;
-                ldata->num_overrun = 0;
+                        tty->num_overrun);
+                tty->overrun_time = jiffies;
+                tty->num_overrun = 0;
         }
 }
 
@@ -1119,18 +1069,16 @@ static inline void n_tty_receive_overrun(struct tty_struct *tty)
 static inline void n_tty_receive_parity_error(struct tty_struct *tty,
                                               unsigned char c)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-
         if (I_IGNPAR(tty))
                 return;
         if (I_PARMRK(tty)) {
-                put_tty_queue('\377', ldata);
-                put_tty_queue('\0', ldata);
-                put_tty_queue(c, ldata);
+                put_tty_queue('\377', tty);
+                put_tty_queue('\0', tty);
+                put_tty_queue(c, tty);
         } else  if (I_INPCK(tty))
-                put_tty_queue('\0', ldata);
+                put_tty_queue('\0', tty);
         else
-                put_tty_queue(c, ldata);
+                put_tty_queue(c, tty);
         wake_up_interruptible(&tty->read_wait);
 }
 
@@ -1146,12 +1094,11 @@ static inline void n_tty_receive_parity_error(struct tty_struct *tty,
 
 static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         unsigned long flags;
         int parmrk;
 
-        if (ldata->raw) {
-                put_tty_queue(c, ldata);
+        if (tty->raw) {
+                put_tty_queue(c, tty);
                 return;
         }
 
@@ -1161,7 +1108,7 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
                 c = tolower(c);
 
         if (L_EXTPROC(tty)) {
-                put_tty_queue(c, ldata);
+                put_tty_queue(c, tty);
                 return;
         }
 
@@ -1189,26 +1136,26 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
          * handle specially, do shortcut processing to speed things
          * up.
          */
-        if (!test_bit(c, ldata->process_char_map) || ldata->lnext) {
-                ldata->lnext = 0;
+        if (!test_bit(c, tty->process_char_map) || tty->lnext) {
+                tty->lnext = 0;
                 parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty)) ? 1 : 0;
-                if (ldata->read_cnt >= (N_TTY_BUF_SIZE - parmrk - 1)) {
+                if (tty->read_cnt >= (N_TTY_BUF_SIZE - parmrk - 1)) {
                         /* beep if no space */
                         if (L_ECHO(tty))
                                 process_output('\a', tty);
                         return;
                 }
                 if (L_ECHO(tty)) {
-                        finish_erasing(ldata);
+                        finish_erasing(tty);
                         /* Record the column of first canon char. */
-                        if (ldata->canon_head == ldata->read_head)
-                                echo_set_canon_col(ldata);
+                        if (tty->canon_head == tty->read_head)
+                                echo_set_canon_col(tty);
                         echo_char(c, tty);
                         process_echoes(tty);
                 }
                 if (parmrk)
-                        put_tty_queue(c, ldata);
-                put_tty_queue(c, ldata);
+                        put_tty_queue(c, tty);
+                put_tty_queue(c, tty);
                 return;
         }
 
@@ -1264,7 +1211,7 @@ send_signal:
         } else if (c == '\n' && I_INLCR(tty))
                 c = '\r';
 
-        if (ldata->icanon) {
+        if (tty->icanon) {
                 if (c == ERASE_CHAR(tty) || c == KILL_CHAR(tty) ||
                     (c == WERASE_CHAR(tty) && L_IEXTEN(tty))) {
                         eraser(c, tty);
@@ -1272,12 +1219,12 @@ send_signal:
                         return;
                 }
                 if (c == LNEXT_CHAR(tty) && L_IEXTEN(tty)) {
-                        ldata->lnext = 1;
+                        tty->lnext = 1;
                         if (L_ECHO(tty)) {
-                                finish_erasing(ldata);
+                                finish_erasing(tty);
                                 if (L_ECHOCTL(tty)) {
-                                        echo_char_raw('^', ldata);
-                                        echo_char_raw('\b', ldata);
+                                        echo_char_raw('^', tty);
+                                        echo_char_raw('\b', tty);
                                         process_echoes(tty);
                                 }
                         }
@@ -1285,34 +1232,34 @@ send_signal:
                 }
                 if (c == REPRINT_CHAR(tty) && L_ECHO(tty) &&
                     L_IEXTEN(tty)) {
-                        unsigned long tail = ldata->canon_head;
+                        unsigned long tail = tty->canon_head;
 
-                        finish_erasing(ldata);
+                        finish_erasing(tty);
                         echo_char(c, tty);
-                        echo_char_raw('\n', ldata);
-                        while (tail != ldata->read_head) {
-                                echo_char(ldata->read_buf[tail], tty);
+                        echo_char_raw('\n', tty);
+                        while (tail != tty->read_head) {
+                                echo_char(tty->read_buf[tail], tty);
                                 tail = (tail+1) & (N_TTY_BUF_SIZE-1);
                         }
                         process_echoes(tty);
                         return;
                 }
                 if (c == '\n') {
-                        if (ldata->read_cnt >= N_TTY_BUF_SIZE) {
+                        if (tty->read_cnt >= N_TTY_BUF_SIZE) {
                                 if (L_ECHO(tty))
                                         process_output('\a', tty);
                                 return;
                         }
                         if (L_ECHO(tty) || L_ECHONL(tty)) {
-                                echo_char_raw('\n', ldata);
+                                echo_char_raw('\n', tty);
                                 process_echoes(tty);
                         }
                         goto handle_newline;
                 }
                 if (c == EOF_CHAR(tty)) {
-                        if (ldata->read_cnt >= N_TTY_BUF_SIZE)
+                        if (tty->read_cnt >= N_TTY_BUF_SIZE)
                                 return;
-                        if (ldata->canon_head != ldata->read_head)
+                        if (tty->canon_head != tty->read_head)
                                 set_bit(TTY_PUSH, &tty->flags);
                         c = __DISABLED_CHAR;
                         goto handle_newline;
@@ -1321,7 +1268,7 @@ send_signal:
                     (c == EOL2_CHAR(tty) && L_IEXTEN(tty))) {
                         parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty))
                                  ? 1 : 0;
-                        if (ldata->read_cnt >= (N_TTY_BUF_SIZE - parmrk)) {
+                        if (tty->read_cnt >= (N_TTY_BUF_SIZE - parmrk)) {
                                 if (L_ECHO(tty))
                                         process_output('\a', tty);
                                 return;
@@ -1331,8 +1278,8 @@ send_signal:
                          */
                         if (L_ECHO(tty)) {
                                 /* Record the column of first canon char. */
-                                if (ldata->canon_head == ldata->read_head)
-                                        echo_set_canon_col(ldata);
+                                if (tty->canon_head == tty->read_head)
+                                        echo_set_canon_col(tty);
                                 echo_char(c, tty);
                                 process_echoes(tty);
                         }
@@ -1341,15 +1288,15 @@ send_signal:
                          * EOL_CHAR and EOL2_CHAR?
                          */
                         if (parmrk)
-                                put_tty_queue(c, ldata);
+                                put_tty_queue(c, tty);
 
 handle_newline:
-                        spin_lock_irqsave(&ldata->read_lock, flags);
-                        set_bit(ldata->read_head, ldata->read_flags);
-                        put_tty_queue_nolock(c, ldata);
-                        ldata->canon_head = ldata->read_head;
-                        ldata->canon_data++;
-                        spin_unlock_irqrestore(&ldata->read_lock, flags);
+                        spin_lock_irqsave(&tty->read_lock, flags);
+                        set_bit(tty->read_head, tty->read_flags);
+                        put_tty_queue_nolock(c, tty);
+                        tty->canon_head = tty->read_head;
+                        tty->canon_data++;
+                        spin_unlock_irqrestore(&tty->read_lock, flags);
                         kill_fasync(&tty->fasync, SIGIO, POLL_IN);
                         if (waitqueue_active(&tty->read_wait))
                                 wake_up_interruptible(&tty->read_wait);
@@ -1358,29 +1305,29 @@ handle_newline:
         }
 
         parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty)) ? 1 : 0;
-        if (ldata->read_cnt >= (N_TTY_BUF_SIZE - parmrk - 1)) {
+        if (tty->read_cnt >= (N_TTY_BUF_SIZE - parmrk - 1)) {
                 /* beep if no space */
                 if (L_ECHO(tty))
                         process_output('\a', tty);
                 return;
         }
         if (L_ECHO(tty)) {
-                finish_erasing(ldata);
+                finish_erasing(tty);
                 if (c == '\n')
-                        echo_char_raw('\n', ldata);
+                        echo_char_raw('\n', tty);
                 else {
                         /* Record the column of first canon char. */
-                        if (ldata->canon_head == ldata->read_head)
-                                echo_set_canon_col(ldata);
+                        if (tty->canon_head == tty->read_head)
+                                echo_set_canon_col(tty);
                         echo_char(c, tty);
                 }
                 process_echoes(tty);
         }
 
         if (parmrk)
-                put_tty_queue(c, ldata);
+                put_tty_queue(c, tty);
 
-        put_tty_queue(c, ldata);
+        put_tty_queue(c, tty);
 }
 
 
@@ -1415,31 +1362,33 @@ static void n_tty_write_wakeup(struct tty_struct *tty)
 static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
                               char *fp, int count)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         const unsigned char *p;
         char *f, flags = TTY_NORMAL;
         int     i;
         char    buf[64];
         unsigned long cpuflags;
 
-        if (ldata->real_raw) {
-                spin_lock_irqsave(&ldata->read_lock, cpuflags);
-                i = min(N_TTY_BUF_SIZE - ldata->read_cnt,
-                        N_TTY_BUF_SIZE - ldata->read_head);
+        if (!tty->read_buf)
+                return;
+
+        if (tty->real_raw) {
+                spin_lock_irqsave(&tty->read_lock, cpuflags);
+                i = min(N_TTY_BUF_SIZE - tty->read_cnt,
+                        N_TTY_BUF_SIZE - tty->read_head);
                 i = min(count, i);
-                memcpy(ldata->read_buf + ldata->read_head, cp, i);
-                ldata->read_head = (ldata->read_head + i) & (N_TTY_BUF_SIZE-1);
-                ldata->read_cnt += i;
+                memcpy(tty->read_buf + tty->read_head, cp, i);
+                tty->read_head = (tty->read_head + i) & (N_TTY_BUF_SIZE-1);
+                tty->read_cnt += i;
                 cp += i;
                 count -= i;
 
-                i = min(N_TTY_BUF_SIZE - ldata->read_cnt,
-                        N_TTY_BUF_SIZE - ldata->read_head);
+                i = min(N_TTY_BUF_SIZE - tty->read_cnt,
+                        N_TTY_BUF_SIZE - tty->read_head);
                 i = min(count, i);
-                memcpy(ldata->read_buf + ldata->read_head, cp, i);
-                ldata->read_head = (ldata->read_head + i) & (N_TTY_BUF_SIZE-1);
-                ldata->read_cnt += i;
-                spin_unlock_irqrestore(&ldata->read_lock, cpuflags);
+                memcpy(tty->read_buf + tty->read_head, cp, i);
+                tty->read_head = (tty->read_head + i) & (N_TTY_BUF_SIZE-1);
+                tty->read_cnt += i;
+                spin_unlock_irqrestore(&tty->read_lock, cpuflags);
         } else {
                 for (i = count, p = cp, f = fp; i; i--, p++) {
                         if (f)
@@ -1470,7 +1419,7 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
 
         n_tty_set_room(tty);
 
-        if ((!ldata->icanon && (ldata->read_cnt >= tty->minimum_to_wake)) ||
+        if ((!tty->icanon && (tty->read_cnt >= tty->minimum_to_wake)) ||
                 L_EXTPROC(tty)) {
                 kill_fasync(&tty->fasync, SIGIO, POLL_IN);
                 if (waitqueue_active(&tty->read_wait))
@@ -1484,12 +1433,6 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
          */
         if (tty->receive_room < TTY_THRESHOLD_THROTTLE)
                 tty_throttle(tty);
-
-        /* FIXME: there is a tiny race here if the receive room check runs
-           before the other work executes and empties the buffer (upping
-           the receiving room and unthrottling. We then throttle and get
-           stuck. This has been observed and traced down by Vincent Pillet/
-           We need to address this when we sort out out the rx path locking */
 }
 
 int is_ignored(int sig)
@@ -1514,25 +1457,25 @@ int is_ignored(int sig)
 
 static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int canon_change = 1;
+        BUG_ON(!tty);
 
         if (old)
-                canon_change = (old->c_lflag ^ tty->termios.c_lflag) & ICANON;
+                canon_change = (old->c_lflag ^ tty->termios->c_lflag) & ICANON;
         if (canon_change) {
-                bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
-                ldata->canon_head = ldata->read_tail;
-                ldata->canon_data = 0;
-                ldata->erasing = 0;
+                memset(&tty->read_flags, 0, sizeof tty->read_flags);
+                tty->canon_head = tty->read_tail;
+                tty->canon_data = 0;
+                tty->erasing = 0;
         }
 
-        if (canon_change && !L_ICANON(tty) && ldata->read_cnt)
+        if (canon_change && !L_ICANON(tty) && tty->read_cnt)
                 wake_up_interruptible(&tty->read_wait);
 
-        ldata->icanon = (L_ICANON(tty) != 0);
+        tty->icanon = (L_ICANON(tty) != 0);
         if (test_bit(TTY_HW_COOK_IN, &tty->flags)) {
-                ldata->raw = 1;
-                ldata->real_raw = 1;
+                tty->raw = 1;
+                tty->real_raw = 1;
                 n_tty_set_room(tty);
                 return;
         }
@@ -1540,51 +1483,51 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
             I_ICRNL(tty) || I_INLCR(tty) || L_ICANON(tty) ||
             I_IXON(tty) || L_ISIG(tty) || L_ECHO(tty) ||
             I_PARMRK(tty)) {
-                bitmap_zero(ldata->process_char_map, 256);
+                memset(tty->process_char_map, 0, 256/8);
 
                 if (I_IGNCR(tty) || I_ICRNL(tty))
-                        set_bit('\r', ldata->process_char_map);
+                        set_bit('\r', tty->process_char_map);
                 if (I_INLCR(tty))
-                        set_bit('\n', ldata->process_char_map);
+                        set_bit('\n', tty->process_char_map);
 
                 if (L_ICANON(tty)) {
-                        set_bit(ERASE_CHAR(tty), ldata->process_char_map);
-                        set_bit(KILL_CHAR(tty), ldata->process_char_map);
-                        set_bit(EOF_CHAR(tty), ldata->process_char_map);
-                        set_bit('\n', ldata->process_char_map);
-                        set_bit(EOL_CHAR(tty), ldata->process_char_map);
+                        set_bit(ERASE_CHAR(tty), tty->process_char_map);
+                        set_bit(KILL_CHAR(tty), tty->process_char_map);
+                        set_bit(EOF_CHAR(tty), tty->process_char_map);
+                        set_bit('\n', tty->process_char_map);
+                        set_bit(EOL_CHAR(tty), tty->process_char_map);
                         if (L_IEXTEN(tty)) {
                                 set_bit(WERASE_CHAR(tty),
-                                        ldata->process_char_map);
+                                        tty->process_char_map);
                                 set_bit(LNEXT_CHAR(tty),
-                                        ldata->process_char_map);
+                                        tty->process_char_map);
                                 set_bit(EOL2_CHAR(tty),
-                                        ldata->process_char_map);
+                                        tty->process_char_map);
                                 if (L_ECHO(tty))
                                         set_bit(REPRINT_CHAR(tty),
-                                                ldata->process_char_map);
+                                                tty->process_char_map);
                         }
                 }
                 if (I_IXON(tty)) {
-                        set_bit(START_CHAR(tty), ldata->process_char_map);
-                        set_bit(STOP_CHAR(tty), ldata->process_char_map);
+                        set_bit(START_CHAR(tty), tty->process_char_map);
+                        set_bit(STOP_CHAR(tty), tty->process_char_map);
                 }
                 if (L_ISIG(tty)) {
-                        set_bit(INTR_CHAR(tty), ldata->process_char_map);
-                        set_bit(QUIT_CHAR(tty), ldata->process_char_map);
-                        set_bit(SUSP_CHAR(tty), ldata->process_char_map);
+                        set_bit(INTR_CHAR(tty), tty->process_char_map);
+                        set_bit(QUIT_CHAR(tty), tty->process_char_map);
+                        set_bit(SUSP_CHAR(tty), tty->process_char_map);
                 }
-                clear_bit(__DISABLED_CHAR, ldata->process_char_map);
-                ldata->raw = 0;
-                ldata->real_raw = 0;
+                clear_bit(__DISABLED_CHAR, tty->process_char_map);
+                tty->raw = 0;
+                tty->real_raw = 0;
         } else {
-                ldata->raw = 1;
+                tty->raw = 1;
                 if ((I_IGNBRK(tty) || (!I_BRKINT(tty) && !I_PARMRK(tty))) &&
                     (I_IGNPAR(tty) || !I_INPCK(tty)) &&
                     (tty->driver->flags & TTY_DRIVER_REAL_RAW))
-                        ldata->real_raw = 1;
+                        tty->real_raw = 1;
                 else
-                        ldata->real_raw = 0;
+                        tty->real_raw = 0;
         }
         n_tty_set_room(tty);
         /* The termios change make the tty ready for I/O */
@@ -1604,13 +1547,15 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 
 static void n_tty_close(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-
         n_tty_flush_buffer(tty);
-        kfree(ldata->read_buf);
-        kfree(ldata->echo_buf);
-        kfree(ldata);
-        tty->disc_data = NULL;
+        if (tty->read_buf) {
+                kfree(tty->read_buf);
+                tty->read_buf = NULL;
+        }
+        if (tty->echo_buf) {
+                kfree(tty->echo_buf);
+                tty->echo_buf = NULL;
+        }
 }
 
 /**
@@ -1625,57 +1570,44 @@ static void n_tty_close(struct tty_struct *tty)
 
 static int n_tty_open(struct tty_struct *tty)
 {
-        struct n_tty_data *ldata;
-
-        ldata = kzalloc(sizeof(*ldata), GFP_KERNEL);
-        if (!ldata)
-                goto err;
-
-        ldata->overrun_time = jiffies;
-        mutex_init(&ldata->atomic_read_lock);
-        mutex_init(&ldata->output_lock);
-        mutex_init(&ldata->echo_lock);
-        spin_lock_init(&ldata->read_lock);
+        if (!tty)
+                return -EINVAL;
 
         /* These are ugly. Currently a malloc failure here can panic */
-        ldata->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
-        ldata->echo_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
-        if (!ldata->read_buf || !ldata->echo_buf)
-                goto err_free_bufs;
+        if (!tty->read_buf) {
+                tty->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
+                if (!tty->read_buf)
+                        return -ENOMEM;
+        }
+        if (!tty->echo_buf) {
+                tty->echo_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
 
-        tty->disc_data = ldata;
+                if (!tty->echo_buf)
+                        return -ENOMEM;
+        }
         reset_buffer_flags(tty);
         tty_unthrottle(tty);
-        ldata->column = 0;
+        tty->column = 0;
         n_tty_set_termios(tty, NULL);
         tty->minimum_to_wake = 1;
         tty->closing = 0;
-
         return 0;
-err_free_bufs:
-        kfree(ldata->read_buf);
-        kfree(ldata->echo_buf);
-        kfree(ldata);
-err:
-        return -ENOMEM;
 }
 
 static inline int input_available_p(struct tty_struct *tty, int amt)
 {
-        struct n_tty_data *ldata = tty->disc_data;
-
         tty_flush_to_ldisc(tty);
-        if (ldata->icanon && !L_EXTPROC(tty)) {
-                if (ldata->canon_data)
+        if (tty->icanon && !L_EXTPROC(tty)) {
+                if (tty->canon_data)
                         return 1;
-        } else if (ldata->read_cnt >= (amt ? amt : 1))
+        } else if (tty->read_cnt >= (amt ? amt : 1))
                 return 1;
 
         return 0;
 }
 
 /**
- *      copy_from_read_buf      -       copy read data directly
+ *      copy_from_read_buf      -       copy read data directly
  *      @tty: terminal device
  *      @b: user data
  *      @nr: size of data
@@ -1687,7 +1619,7 @@ static inline int input_available_p(struct tty_struct *tty, int amt)
  *      buffer, and once to drain the space from the (physical) beginning of
  *      the buffer to head pointer.
  *
- *      Called under the ldata->atomic_read_lock sem
+ *      Called under the tty->atomic_read_lock sem
  *
  */
 
@@ -1696,31 +1628,28 @@ static int copy_from_read_buf(struct tty_struct *tty,
                                       size_t *nr)
 
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int retval;
         size_t n;
         unsigned long flags;
-        bool is_eof;
 
         retval = 0;
-        spin_lock_irqsave(&ldata->read_lock, flags);
-        n = min(ldata->read_cnt, N_TTY_BUF_SIZE - ldata->read_tail);
+        spin_lock_irqsave(&tty->read_lock, flags);
+        n = min(tty->read_cnt, N_TTY_BUF_SIZE - tty->read_tail);
         n = min(*nr, n);
-        spin_unlock_irqrestore(&ldata->read_lock, flags);
+        spin_unlock_irqrestore(&tty->read_lock, flags);
         if (n) {
-                retval = copy_to_user(*b, &ldata->read_buf[ldata->read_tail], n);
+                retval = copy_to_user(*b, &tty->read_buf[tty->read_tail], n);
                 n -= retval;
-                is_eof = n == 1 &&
-                        ldata->read_buf[ldata->read_tail] == EOF_CHAR(tty);
-                tty_audit_add_data(tty, &ldata->read_buf[ldata->read_tail], n,
-                                ldata->icanon);
-                spin_lock_irqsave(&ldata->read_lock, flags);
-                ldata->read_tail = (ldata->read_tail + n) & (N_TTY_BUF_SIZE-1);
-                ldata->read_cnt -= n;
+                tty_audit_add_data(tty, &tty->read_buf[tty->read_tail], n);
+                spin_lock_irqsave(&tty->read_lock, flags);
+                tty->read_tail = (tty->read_tail + n) & (N_TTY_BUF_SIZE-1);
+                tty->read_cnt -= n;
                 /* Turn single EOF into zero-length read */
-                if (L_EXTPROC(tty) && ldata->icanon && is_eof && !ldata->read_cnt)
-                        n = 0;
-                spin_unlock_irqrestore(&ldata->read_lock, flags);
+                if (L_EXTPROC(tty) && tty->icanon && n == 1) {
+                        if (!tty->read_cnt && (*b)[n-1] == EOF_CHAR(tty))
+                                n--;
+                }
+                spin_unlock_irqrestore(&tty->read_lock, flags);
                 *b += n;
                 *nr -= n;
         }
@@ -1787,7 +1716,6 @@ static int job_control(struct tty_struct *tty, struct file *file)
 static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
                          unsigned char __user *buf, size_t nr)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         unsigned char __user *b = buf;
         DECLARE_WAITQUEUE(wait, current);
         int c;
@@ -1799,13 +1727,16 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
         int packet;
 
 do_it_again:
+
+        BUG_ON(!tty->read_buf);
+
         c = job_control(tty, file);
         if (c < 0)
                 return c;
 
         minimum = time = 0;
         timeout = MAX_SCHEDULE_TIMEOUT;
-        if (!ldata->icanon) {
+        if (!tty->icanon) {
                 time = (HZ / 10) * TIME_CHAR(tty);
                 minimum = MIN_CHAR(tty);
                 if (minimum) {
@@ -1828,10 +1759,10 @@ do_it_again:
          *      Internal serialization of reads.
          */
         if (file->f_flags & O_NONBLOCK) {
-                if (!mutex_trylock(&ldata->atomic_read_lock))
+                if (!mutex_trylock(&tty->atomic_read_lock))
                         return -EAGAIN;
         } else {
-                if (mutex_lock_interruptible(&ldata->atomic_read_lock))
+                if (mutex_lock_interruptible(&tty->atomic_read_lock))
                         return -ERESTARTSYS;
         }
         packet = tty->packet;
@@ -1884,6 +1815,7 @@ do_it_again:
                         /* FIXME: does n_tty_set_room need locking ? */
                         n_tty_set_room(tty);
                         timeout = schedule_timeout(timeout);
+                        BUG_ON(!tty->read_buf);
                         continue;
                 }
                 __set_current_state(TASK_RUNNING);
@@ -1898,45 +1830,41 @@ do_it_again:
                         nr--;
                 }
 
-                if (ldata->icanon && !L_EXTPROC(tty)) {
+                if (tty->icanon && !L_EXTPROC(tty)) {
                         /* N.B. avoid overrun if nr == 0 */
-                        spin_lock_irqsave(&ldata->read_lock, flags);
-                        while (nr && ldata->read_cnt) {
+                        while (nr && tty->read_cnt) {
                                 int eol;
 
-                                eol = test_and_clear_bit(ldata->read_tail,
-                                                ldata->read_flags);
-                                c = ldata->read_buf[ldata->read_tail];
-                                ldata->read_tail = ((ldata->read_tail+1) &
+                                eol = test_and_clear_bit(tty->read_tail,
+                                                tty->read_flags);
+                                c = tty->read_buf[tty->read_tail];
+                                spin_lock_irqsave(&tty->read_lock, flags);
+                                tty->read_tail = ((tty->read_tail+1) &
                                                   (N_TTY_BUF_SIZE-1));
-                                ldata->read_cnt--;
+                                tty->read_cnt--;
                                 if (eol) {
                                         /* this test should be redundant:
                                          * we shouldn't be reading data if
                                          * canon_data is 0
                                          */
-                                        if (--ldata->canon_data < 0)
-                                                ldata->canon_data = 0;
+                                        if (--tty->canon_data < 0)
+                                                tty->canon_data = 0;
                                 }
-                                spin_unlock_irqrestore(&ldata->read_lock, flags);
+                                spin_unlock_irqrestore(&tty->read_lock, flags);
 
                                 if (!eol || (c != __DISABLED_CHAR)) {
                                         if (tty_put_user(tty, c, b++)) {
                                                 retval = -EFAULT;
                                                 b--;
-                                                spin_lock_irqsave(&ldata->read_lock, flags);
                                                 break;
                                         }
                                         nr--;
                                 }
                                 if (eol) {
                                         tty_audit_push(tty);
-                                        spin_lock_irqsave(&ldata->read_lock, flags);
                                         break;
                                 }
-                                spin_lock_irqsave(&ldata->read_lock, flags);
                         }
-                        spin_unlock_irqrestore(&ldata->read_lock, flags);
                         if (retval)
                                 break;
                 } else {
@@ -1968,7 +1896,7 @@ do_it_again:
                 if (time)
                         timeout = time;
         }
-        mutex_unlock(&ldata->atomic_read_lock);
+        mutex_unlock(&tty->atomic_read_lock);
         remove_wait_queue(&tty->read_wait, &wait);
 
         if (!waitqueue_active(&tty->read_wait))
@@ -1981,7 +1909,7 @@ do_it_again:
                 if (nr)
                         clear_bit(TTY_PUSH, &tty->flags);
         } else if (test_and_clear_bit(TTY_PUSH, &tty->flags))
-                goto do_it_again;
+                 goto do_it_again;
 
         n_tty_set_room(tty);
         return retval;
@@ -2129,19 +2057,19 @@ static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
         return mask;
 }
 
-static unsigned long inq_canon(struct n_tty_data *ldata)
+static unsigned long inq_canon(struct tty_struct *tty)
 {
         int nr, head, tail;
 
-        if (!ldata->canon_data)
+        if (!tty->canon_data)
                 return 0;
-        head = ldata->canon_head;
-        tail = ldata->read_tail;
+        head = tty->canon_head;
+        tail = tty->read_tail;
         nr = (head - tail) & (N_TTY_BUF_SIZE-1);
         /* Skip EOF-chars.. */
         while (head != tail) {
-                if (test_bit(tail, ldata->read_flags) &&
-                    ldata->read_buf[tail] == __DISABLED_CHAR)
+                if (test_bit(tail, tty->read_flags) &&
+                    tty->read_buf[tail] == __DISABLED_CHAR)
                         nr--;
                 tail = (tail+1) & (N_TTY_BUF_SIZE-1);
         }
@@ -2151,7 +2079,6 @@ static unsigned long inq_canon(struct n_tty_data *ldata)
 static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
-        struct n_tty_data *ldata = tty->disc_data;
         int retval;
 
         switch (cmd) {
@@ -2159,9 +2086,9 @@ static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
                 return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
         case TIOCINQ:
                 /* FIXME: Locking */
-                retval = ldata->read_cnt;
+                retval = tty->read_cnt;
                 if (L_ICANON(tty))
-                        retval = inq_canon(ldata);
+                        retval = inq_canon(tty);
                 return put_user(retval, (unsigned int __user *) arg);
         default:
                 return n_tty_ioctl_helper(tty, file, cmd, arg);
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index a0c69ab0439..fd347ff34d0 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -400,7 +400,7 @@ struct buffer {
 } __attribute__ ((packed));
 
 /*    Global variables */
-static const struct pci_device_id nozomi_pci_tbl[] = {
+static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = {
         {PCI_DEVICE(0x1931, 0x000c)},   /* Nozomi HSDPA */
         {},
 };
@@ -1360,7 +1360,7 @@ static void remove_sysfs_files(struct nozomi *dc)
 }
 
 /* Allocate memory for one device */
-static int nozomi_card_init(struct pci_dev *pdev,
+static int __devinit nozomi_card_init(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
 {
         resource_size_t start;
@@ -1473,13 +1473,12 @@ static int nozomi_card_init(struct pci_dev *pdev,
                 port->dc = dc;
                 tty_port_init(&port->port);
                 port->port.ops = &noz_tty_port_ops;
-                tty_dev = tty_port_register_device(&port->port, ntty_driver,
-                                dc->index_start + i, &pdev->dev);
+                tty_dev = tty_register_device(ntty_driver, dc->index_start + i,
+                                                        &pdev->dev);
 
                 if (IS_ERR(tty_dev)) {
                         ret = PTR_ERR(tty_dev);
                         dev_err(&pdev->dev, "Could not allocate tty?\n");
-                        tty_port_destroy(&port->port);
                         goto err_free_tty;
                 }
         }
@@ -1487,10 +1486,8 @@ static int nozomi_card_init(struct pci_dev *pdev,
         return 0;
 
 err_free_tty:
-        for (i = 0; i < MAX_PORT; ++i) {
-                tty_unregister_device(ntty_driver, dc->index_start + i);
-                tty_port_destroy(&dc->port[i].port);
-        }
+        for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)
+                tty_unregister_device(ntty_driver, i);
 err_free_kfifo:
         for (i = 0; i < MAX_PORT; i++)
                 kfifo_free(&dc->port[i].fifo_ul);
@@ -1507,7 +1504,7 @@ err:
         return ret;
 }
 
-static void tty_exit(struct nozomi *dc)
+static void __devexit tty_exit(struct nozomi *dc)
 {
         unsigned int i;
 
@@ -1523,14 +1520,12 @@ static void tty_exit(struct nozomi *dc)
            complete off a hangup method ? */
         while (dc->open_ttys)
                 msleep(1);
-        for (i = 0; i < MAX_PORT; ++i) {
-                tty_unregister_device(ntty_driver, dc->index_start + i);
-                tty_port_destroy(&dc->port[i].port);
-        }
+        for (i = dc->index_start; i < dc->index_start + MAX_PORT; ++i)
+                tty_unregister_device(ntty_driver, i);
 }
 
 /* Deallocate memory for one device */
-static void nozomi_card_exit(struct pci_dev *pdev)
+static void __devexit nozomi_card_exit(struct pci_dev *pdev)
 {
         int i;
         struct ctrl_ul ctrl;
@@ -1607,9 +1602,13 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
         int ret;
         if (!port || !dc || dc->state != NOZOMI_STATE_READY)
                 return -ENODEV;
-        ret = tty_standard_install(driver, tty);
-        if (ret == 0)
+        ret = tty_init_termios(tty);
+        if (ret == 0) {
+                tty_driver_kref_get(driver);
+                tty->count++;
                 tty->driver_data = port;
+                driver->ttys[tty->index] = tty;
+        }
         return ret;
 }
 
@@ -1908,7 +1907,7 @@ static struct pci_driver nozomi_driver = {
         .name = NOZOMI_NAME,
         .id_table = nozomi_pci_tbl,
         .probe = nozomi_card_init,
-        .remove = nozomi_card_exit,
+        .remove = __devexit_p(nozomi_card_exit),
 };
 
 static __init int nozomi_init(void)
@@ -1921,6 +1920,7 @@ static __init int nozomi_init(void)
         if (!ntty_driver)
                 return -ENOMEM;
 
+        ntty_driver->owner = THIS_MODULE;
         ntty_driver->driver_name = NOZOMI_NAME_TTY;
         ntty_driver->name = "noz";
         ntty_driver->major = 0;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index be6a373601b..e18604b3fc7 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -4,6 +4,9 @@
  *  Added support for a Unix98-style ptmx device.
  *    -- C. Scott Ananian <cananian@alumni.princeton.edu>, 14-Jan-1998
  *
+ *  When reading this code see also fs/devpts. In particular note that the
+ *  driver_data field is used by the devpts side as a binding to the devpts
+ *  inode.
  */
 
 #include <linux/module.h>
@@ -18,18 +21,18 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/sysctl.h>
 #include <linux/device.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/devpts_fs.h>
 #include <linux/slab.h>
-#include <linux/mutex.h>
 
+#include <asm/system.h>
 
 #ifdef CONFIG_UNIX98_PTYS
 static struct tty_driver *ptm_driver;
 static struct tty_driver *pts_driver;
-static DEFINE_MUTEX(devpts_mutex);
 #endif
 
 static void pty_close(struct tty_struct *tty, struct file *filp)
@@ -44,7 +47,6 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
         wake_up_interruptible(&tty->read_wait);
         wake_up_interruptible(&tty->write_wait);
         tty->packet = 0;
-        /* Review - krefs on tty_link ?? */
         if (!tty->link)
                 return;
         tty->link->packet = 0;
@@ -54,15 +56,12 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
         if (tty->driver->subtype == PTY_TYPE_MASTER) {
                 set_bit(TTY_OTHER_CLOSED, &tty->flags);
 #ifdef CONFIG_UNIX98_PTYS
-                if (tty->driver == ptm_driver) {
-                        mutex_lock(&devpts_mutex);
-                        devpts_pty_kill(tty->link->driver_data);
-                        mutex_unlock(&devpts_mutex);
-                }
+                if (tty->driver == ptm_driver)
+                        devpts_pty_kill(tty->link);
 #endif
-                tty_unlock(tty);
+                tty_unlock();
                 tty_vhangup(tty->link);
-                tty_lock(tty);
+                tty_lock();
         }
 }
 
@@ -93,7 +92,7 @@ static void pty_unthrottle(struct tty_struct *tty)
 
 static int pty_space(struct tty_struct *to)
 {
-        int n = 8192 - to->port->buf.memory_used;
+        int n = 8192 - to->buf.memory_used;
         if (n < 0)
                 return 0;
         return n;
@@ -171,41 +170,6 @@ static int pty_set_lock(struct tty_struct *tty, int __user *arg)
         return 0;
 }
 
-static int pty_get_lock(struct tty_struct *tty, int __user *arg)
-{
-        int locked = test_bit(TTY_PTY_LOCK, &tty->flags);
-        return put_user(locked, arg);
-}
-
-/* Set the packet mode on a pty */
-static int pty_set_pktmode(struct tty_struct *tty, int __user *arg)
-{
-        unsigned long flags;
-        int pktmode;
-
-        if (get_user(pktmode, arg))
-                return -EFAULT;
-
-        spin_lock_irqsave(&tty->ctrl_lock, flags);
-        if (pktmode) {
-                if (!tty->packet) {
-                        tty->packet = 1;
-                        tty->link->ctrl_status = 0;
-                }
-        } else
-                tty->packet = 0;
-        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-
-        return 0;
-}
-
-/* Get the packet mode of a pty */
-static int pty_get_pktmode(struct tty_struct *tty, int __user *arg)
-{
-        int pktmode = tty->packet;
-        return put_user(pktmode, arg);
-}
-
 /* Send a signal to the slave */
 static int pty_signal(struct tty_struct *tty, int sig)
 {
@@ -264,8 +228,8 @@ out:
 static void pty_set_termios(struct tty_struct *tty,
                                         struct ktermios *old_termios)
 {
-        tty->termios.c_cflag &= ~(CSIZE | PARENB);
-        tty->termios.c_cflag |= (CS8 | CREAD);
+        tty->termios->c_cflag &= ~(CSIZE | PARENB);
+        tty->termios->c_cflag |= (CS8 | CREAD);
 }
 
 /**
@@ -277,7 +241,7 @@ static void pty_set_termios(struct tty_struct *tty,
  *      peform a terminal resize correctly
  */
 
-static int pty_resize(struct tty_struct *tty,  struct winsize *ws)
+int pty_resize(struct tty_struct *tty,  struct winsize *ws)
 {
         struct pid *pgrp, *rpgrp;
         unsigned long flags;
@@ -315,130 +279,66 @@ done:
         return 0;
 }
 
-/**
- *      pty_common_install              -       set up the pty pair
- *      @driver: the pty driver
- *      @tty: the tty being instantiated
- *      @bool: legacy, true if this is BSD style
- *
- *      Perform the initial set up for the tty/pty pair. Called from the
- *      tty layer when the port is first opened.
- *
- *      Locking: the caller must hold the tty_mutex
- */
-static int pty_common_install(struct tty_driver *driver, struct tty_struct *tty,
-                bool legacy)
+/* Traditional BSD devices */
+#ifdef CONFIG_LEGACY_PTYS
+
+static int pty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         struct tty_struct *o_tty;
-        struct tty_port *ports[2];
         int idx = tty->index;
-        int retval = -ENOMEM;
+        int retval;
 
         o_tty = alloc_tty_struct();
         if (!o_tty)
-                goto err;
-        ports[0] = kmalloc(sizeof **ports, GFP_KERNEL);
-        ports[1] = kmalloc(sizeof **ports, GFP_KERNEL);
-        if (!ports[0] || !ports[1])
-                goto err_free_tty;
+                return -ENOMEM;
         if (!try_module_get(driver->other->owner)) {
                 /* This cannot in fact currently happen */
+                retval = -ENOMEM;
                 goto err_free_tty;
         }
         initialize_tty_struct(o_tty, driver->other, idx);
 
-        if (legacy) {
-                /* We always use new tty termios data so we can do this
-                   the easy way .. */
-                retval = tty_init_termios(tty);
-                if (retval)
-                        goto err_deinit_tty;
-
-                retval = tty_init_termios(o_tty);
-                if (retval)
-                        goto err_free_termios;
-
-                driver->other->ttys[idx] = o_tty;
-                driver->ttys[idx] = tty;
-        } else {
-                memset(&tty->termios_locked, 0, sizeof(tty->termios_locked));
-                tty->termios = driver->init_termios;
-                memset(&o_tty->termios_locked, 0, sizeof(tty->termios_locked));
-                o_tty->termios = driver->other->init_termios;
-        }
+        /* We always use new tty termios data so we can do this
+           the easy way .. */
+        retval = tty_init_termios(tty);
+        if (retval)
+                goto err_deinit_tty;
+
+        retval = tty_init_termios(o_tty);
+        if (retval)
+                goto err_free_termios;
 
         /*
          * Everything allocated ... set up the o_tty structure.
          */
+        driver->other->ttys[idx] = o_tty;
         tty_driver_kref_get(driver->other);
         if (driver->subtype == PTY_TYPE_MASTER)
                 o_tty->count++;
         /* Establish the links in both directions */
         tty->link   = o_tty;
         o_tty->link = tty;
-        tty_port_init(ports[0]);
-        tty_port_init(ports[1]);
-        o_tty->port = ports[0];
-        tty->port = ports[1];
-        o_tty->port->itty = o_tty;
 
         tty_driver_kref_get(driver);
         tty->count++;
+        driver->ttys[idx] = tty;
         return 0;
 err_free_termios:
-        if (legacy)
-                tty_free_termios(tty);
+        tty_free_termios(tty);
 err_deinit_tty:
         deinitialize_tty_struct(o_tty);
         module_put(o_tty->driver->owner);
 err_free_tty:
-        kfree(ports[0]);
-        kfree(ports[1]);
         free_tty_struct(o_tty);
-err:
         return retval;
 }
 
-/* this is called once with whichever end is closed last */
-static void pty_unix98_shutdown(struct tty_struct *tty)
-{
-        devpts_kill_index(tty->driver_data, tty->index);
-}
-
-static void pty_cleanup(struct tty_struct *tty)
-{
-        tty->port->itty = NULL;
-        tty_port_put(tty->port);
-}
-
-/* Traditional BSD devices */
-#ifdef CONFIG_LEGACY_PTYS
-
-static int pty_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        return pty_common_install(driver, tty, true);
-}
-
-static void pty_remove(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct tty_struct *pair = tty->link;
-        driver->ttys[tty->index] = NULL;
-        if (pair)
-                pair->driver->ttys[pair->index] = NULL;
-}
-
 static int pty_bsd_ioctl(struct tty_struct *tty,
                          unsigned int cmd, unsigned long arg)
 {
         switch (cmd) {
         case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
                 return pty_set_lock(tty, (int __user *) arg);
-        case TIOCGPTLCK: /* Get PT Lock status */
-                return pty_get_lock(tty, (int __user *)arg);
-        case TIOCPKT: /* Set PT packet mode */
-                return pty_set_pktmode(tty, (int __user *)arg);
-        case TIOCGPKT: /* Get PT packet mode */
-                return pty_get_pktmode(tty, (int __user *)arg);
         case TIOCSIG:    /* Send signal to other side of pty */
                 return pty_signal(tty, (int) arg);
         }
@@ -463,9 +363,7 @@ static const struct tty_operations master_pty_ops_bsd = {
         .unthrottle = pty_unthrottle,
         .set_termios = pty_set_termios,
         .ioctl = pty_bsd_ioctl,
-        .cleanup = pty_cleanup,
-        .resize = pty_resize,
-        .remove = pty_remove
+        .resize = pty_resize
 };
 
 static const struct tty_operations slave_pty_ops_bsd = {
@@ -478,9 +376,7 @@ static const struct tty_operations slave_pty_ops_bsd = {
         .chars_in_buffer = pty_chars_in_buffer,
         .unthrottle = pty_unthrottle,
         .set_termios = pty_set_termios,
-        .cleanup = pty_cleanup,
-        .resize = pty_resize,
-        .remove = pty_remove
+        .resize = pty_resize
 };
 
 static void __init legacy_pty_init(void)
@@ -490,20 +386,15 @@ static void __init legacy_pty_init(void)
         if (legacy_count <= 0)
                 return;
 
-        pty_driver = tty_alloc_driver(legacy_count,
-                        TTY_DRIVER_RESET_TERMIOS |
-                        TTY_DRIVER_REAL_RAW |
-                        TTY_DRIVER_DYNAMIC_ALLOC);
-        if (IS_ERR(pty_driver))
+        pty_driver = alloc_tty_driver(legacy_count);
+        if (!pty_driver)
                 panic("Couldn't allocate pty driver");
 
-        pty_slave_driver = tty_alloc_driver(legacy_count,
-                        TTY_DRIVER_RESET_TERMIOS |
-                        TTY_DRIVER_REAL_RAW |
-                        TTY_DRIVER_DYNAMIC_ALLOC);
-        if (IS_ERR(pty_slave_driver))
+        pty_slave_driver = alloc_tty_driver(legacy_count);
+        if (!pty_slave_driver)
                 panic("Couldn't allocate pty slave driver");
 
+        pty_driver->owner = THIS_MODULE;
         pty_driver->driver_name = "pty_master";
         pty_driver->name = "pty";
         pty_driver->major = PTY_MASTER_MAJOR;
@@ -517,9 +408,11 @@ static void __init legacy_pty_init(void)
         pty_driver->init_termios.c_lflag = 0;
         pty_driver->init_termios.c_ispeed = 38400;
         pty_driver->init_termios.c_ospeed = 38400;
+        pty_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW;
         pty_driver->other = pty_slave_driver;
         tty_set_operations(pty_driver, &master_pty_ops_bsd);
 
+        pty_slave_driver->owner = THIS_MODULE;
         pty_slave_driver->driver_name = "pty_slave";
         pty_slave_driver->name = "ttyp";
         pty_slave_driver->major = PTY_SLAVE_MAJOR;
@@ -530,6 +423,8 @@ static void __init legacy_pty_init(void)
         pty_slave_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
         pty_slave_driver->init_termios.c_ispeed = 38400;
         pty_slave_driver->init_termios.c_ospeed = 38400;
+        pty_slave_driver->flags = TTY_DRIVER_RESET_TERMIOS |
+                                        TTY_DRIVER_REAL_RAW;
         pty_slave_driver->other = pty_driver;
         tty_set_operations(pty_slave_driver, &slave_pty_ops_bsd);
 
@@ -544,21 +439,72 @@ static inline void legacy_pty_init(void) { }
 
 /* Unix98 devices */
 #ifdef CONFIG_UNIX98_PTYS
+/*
+ * sysctl support for setting limits on the number of Unix98 ptys allocated.
+ * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
+ */
+int pty_limit = NR_UNIX98_PTY_DEFAULT;
+static int pty_limit_min;
+static int pty_limit_max = NR_UNIX98_PTY_MAX;
+static int tty_count;
+static int pty_count;
+
+static inline void pty_inc_count(void)
+{
+        pty_count = (++tty_count) / 2;
+}
+
+static inline void pty_dec_count(void)
+{
+        pty_count = (--tty_count) / 2;
+}
 
 static struct cdev ptmx_cdev;
 
+static struct ctl_table pty_table[] = {
+        {
+                .procname       = "max",
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .data           = &pty_limit,
+                .proc_handler   = proc_dointvec_minmax,
+                .extra1         = &pty_limit_min,
+                .extra2         = &pty_limit_max,
+        }, {
+                .procname       = "nr",
+                .maxlen         = sizeof(int),
+                .mode           = 0444,
+                .data           = &pty_count,
+                .proc_handler   = proc_dointvec,
+        }, 
+        {}
+};
+
+static struct ctl_table pty_kern_table[] = {
+        {
+                .procname       = "pty",
+                .mode           = 0555,
+                .child          = pty_table,
+        },
+        {}
+};
+
+static struct ctl_table pty_root_table[] = {
+        {
+                .procname       = "kernel",
+                .mode           = 0555,
+                .child          = pty_kern_table,
+        },
+        {}
+};
+
+
 static int pty_unix98_ioctl(struct tty_struct *tty,
                             unsigned int cmd, unsigned long arg)
 {
         switch (cmd) {
         case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */
                 return pty_set_lock(tty, (int __user *)arg);
-        case TIOCGPTLCK: /* Get PT Lock status */
-                return pty_get_lock(tty, (int __user *)arg);
-        case TIOCPKT: /* Set PT packet mode */
-                return pty_set_pktmode(tty, (int __user *)arg);
-        case TIOCGPKT: /* Get PT packet mode */
-                return pty_get_pktmode(tty, (int __user *)arg);
         case TIOCGPTN: /* Get PT Number */
                 return put_user(tty->index, (unsigned int __user *)arg);
         case TIOCSIG:    /* Send signal to other side of pty */
@@ -580,8 +526,10 @@ static int pty_unix98_ioctl(struct tty_struct *tty,
 static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,
                 struct inode *ptm_inode, int idx)
 {
-        /* Master must be open via /dev/ptmx */
-        return ERR_PTR(-EIO);
+        struct tty_struct *tty = devpts_get_tty(ptm_inode, idx);
+        if (tty)
+                tty = tty->link;
+        return tty;
 }
 
 /**
@@ -590,33 +538,84 @@ static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,
  *      @idx: tty index
  *
  *      Look up a pty master device. Called under the tty_mutex for now.
- *      This provides our locking for the tty pointer.
+ *      This provides our locking.
  */
 
 static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,
                 struct inode *pts_inode, int idx)
 {
-        struct tty_struct *tty;
-
-        mutex_lock(&devpts_mutex);
-        tty = devpts_get_priv(pts_inode);
-        mutex_unlock(&devpts_mutex);
+        struct tty_struct *tty = devpts_get_tty(pts_inode, idx);
         /* Master must be open before slave */
         if (!tty)
                 return ERR_PTR(-EIO);
         return tty;
 }
 
+static void pty_unix98_shutdown(struct tty_struct *tty)
+{
+        tty_driver_remove_tty(tty->driver, tty);
+        /* We have our own method as we don't use the tty index */
+        kfree(tty->termios);
+}
+
 /* We have no need to install and remove our tty objects as devpts does all
    the work for us */
 
 static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)
 {
-        return pty_common_install(driver, tty, false);
+        struct tty_struct *o_tty;
+        int idx = tty->index;
+
+        o_tty = alloc_tty_struct();
+        if (!o_tty)
+                return -ENOMEM;
+        if (!try_module_get(driver->other->owner)) {
+                /* This cannot in fact currently happen */
+                goto err_free_tty;
+        }
+        initialize_tty_struct(o_tty, driver->other, idx);
+
+        tty->termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+        if (tty->termios == NULL)
+                goto err_free_mem;
+        *tty->termios = driver->init_termios;
+        tty->termios_locked = tty->termios + 1;
+
+        o_tty->termios = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+        if (o_tty->termios == NULL)
+                goto err_free_mem;
+        *o_tty->termios = driver->other->init_termios;
+        o_tty->termios_locked = o_tty->termios + 1;
+
+        tty_driver_kref_get(driver->other);
+        if (driver->subtype == PTY_TYPE_MASTER)
+                o_tty->count++;
+        /* Establish the links in both directions */
+        tty->link   = o_tty;
+        o_tty->link = tty;
+        /*
+         * All structures have been allocated, so now we install them.
+         * Failures after this point use release_tty to clean up, so
+         * there's no need to null out the local pointers.
+         */
+        tty_driver_kref_get(driver);
+        tty->count++;
+        pty_inc_count(); /* tty */
+        pty_inc_count(); /* tty->link */
+        return 0;
+err_free_mem:
+        deinitialize_tty_struct(o_tty);
+        kfree(o_tty->termios);
+        kfree(tty->termios);
+        module_put(o_tty->driver->owner);
+err_free_tty:
+        free_tty_struct(o_tty);
+        return -ENOMEM;
 }
 
 static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
 {
+        pty_dec_count();
 }
 
 static const struct tty_operations ptm_unix98_ops = {
@@ -632,9 +631,8 @@ static const struct tty_operations ptm_unix98_ops = {
         .unthrottle = pty_unthrottle,
         .set_termios = pty_set_termios,
         .ioctl = pty_unix98_ioctl,
-        .resize = pty_resize,
         .shutdown = pty_unix98_shutdown,
-        .cleanup = pty_cleanup
+        .resize = pty_resize
 };
 
 static const struct tty_operations pty_unix98_ops = {
@@ -649,8 +647,7 @@ static const struct tty_operations pty_unix98_ops = {
         .chars_in_buffer = pty_chars_in_buffer,
         .unthrottle = pty_unthrottle,
         .set_termios = pty_set_termios,
-        .shutdown = pty_unix98_shutdown,
-        .cleanup = pty_cleanup,
+        .shutdown = pty_unix98_shutdown
 };
 
 /**
@@ -668,7 +665,6 @@ static const struct tty_operations pty_unix98_ops = {
 static int ptmx_open(struct inode *inode, struct file *filp)
 {
         struct tty_struct *tty;
-        struct inode *slave_inode;
         int retval;
         int index;
 
@@ -679,55 +675,45 @@ static int ptmx_open(struct inode *inode, struct file *filp)
                 return retval;
 
         /* find a device that is not in use. */
-        mutex_lock(&devpts_mutex);
+        tty_lock();
         index = devpts_new_index(inode);
+        tty_unlock();
         if (index < 0) {
                 retval = index;
-                mutex_unlock(&devpts_mutex);
                 goto err_file;
         }
 
-        mutex_unlock(&devpts_mutex);
-
         mutex_lock(&tty_mutex);
-        tty = tty_init_dev(ptm_driver, index);
+        tty_lock();
+        tty = tty_init_dev(ptm_driver, index, 1);
+        mutex_unlock(&tty_mutex);
 
         if (IS_ERR(tty)) {
                 retval = PTR_ERR(tty);
                 goto out;
         }
 
-        /* The tty returned here is locked so we can safely
-           drop the mutex */
-        mutex_unlock(&tty_mutex);
-
         set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
 
         tty_add_file(tty, filp);
 
-        slave_inode = devpts_pty_new(inode,
-                        MKDEV(UNIX98_PTY_SLAVE_MAJOR, index), index,
-                        tty->link);
-        if (IS_ERR(slave_inode)) {
-                retval = PTR_ERR(slave_inode);
+        retval = devpts_pty_new(inode, tty->link);
+        if (retval)
                 goto err_release;
-        }
 
         retval = ptm_driver->ops->open(tty, filp);
         if (retval)
                 goto err_release;
 
-        tty_unlock(tty);
-        tty->driver_data = inode;
-        tty->link->driver_data = slave_inode;
+        tty_unlock();
         return 0;
 err_release:
-        tty_unlock(tty);
+        tty_unlock();
         tty_release(inode, filp);
         return retval;
 out:
-        mutex_unlock(&tty_mutex);
         devpts_kill_index(inode, index);
+        tty_unlock();
 err_file:
         tty_free_file(filp);
         return retval;
@@ -737,23 +723,14 @@ static struct file_operations ptmx_fops;
 
 static void __init unix98_pty_init(void)
 {
-        ptm_driver = tty_alloc_driver(NR_UNIX98_PTY_MAX,
-                        TTY_DRIVER_RESET_TERMIOS |
-                        TTY_DRIVER_REAL_RAW |
-                        TTY_DRIVER_DYNAMIC_DEV |
-                        TTY_DRIVER_DEVPTS_MEM |
-                        TTY_DRIVER_DYNAMIC_ALLOC);
-        if (IS_ERR(ptm_driver))
+        ptm_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
+        if (!ptm_driver)
                 panic("Couldn't allocate Unix98 ptm driver");
-        pts_driver = tty_alloc_driver(NR_UNIX98_PTY_MAX,
-                        TTY_DRIVER_RESET_TERMIOS |
-                        TTY_DRIVER_REAL_RAW |
-                        TTY_DRIVER_DYNAMIC_DEV |
-                        TTY_DRIVER_DEVPTS_MEM |
-                        TTY_DRIVER_DYNAMIC_ALLOC);
-        if (IS_ERR(pts_driver))
+        pts_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
+        if (!pts_driver)
                 panic("Couldn't allocate Unix98 pts driver");
 
+        ptm_driver->owner = THIS_MODULE;
         ptm_driver->driver_name = "pty_master";
         ptm_driver->name = "ptm";
         ptm_driver->major = UNIX98_PTY_MASTER_MAJOR;
@@ -767,9 +744,12 @@ static void __init unix98_pty_init(void)
         ptm_driver->init_termios.c_lflag = 0;
         ptm_driver->init_termios.c_ispeed = 38400;
         ptm_driver->init_termios.c_ospeed = 38400;
+        ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
+                TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;
         ptm_driver->other = pts_driver;
         tty_set_operations(ptm_driver, &ptm_unix98_ops);
 
+        pts_driver->owner = THIS_MODULE;
         pts_driver->driver_name = "pty_slave";
         pts_driver->name = "pts";
         pts_driver->major = UNIX98_PTY_SLAVE_MAJOR;
@@ -780,6 +760,8 @@ static void __init unix98_pty_init(void)
         pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
         pts_driver->init_termios.c_ispeed = 38400;
         pts_driver->init_termios.c_ospeed = 38400;
+        pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |
+                TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;
         pts_driver->other = ptm_driver;
         tty_set_operations(pts_driver, &pty_unix98_ops);
 
@@ -788,6 +770,8 @@ static void __init unix98_pty_init(void)
         if (tty_register_driver(pts_driver))
                 panic("Couldn't register Unix98 pts driver");
 
+        register_sysctl_table(pty_root_table);
+
         /* Now create the /dev/ptmx special device */
         tty_default_fops(&ptmx_fops);
         ptmx_fops.open = ptmx_open;
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index e42009a0052..6a1241c7f84 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -118,7 +118,7 @@ static unsigned long board2;
 static unsigned long board3;
 static unsigned long board4;
 static unsigned long controller;
-static bool support_low_speed;
+static int support_low_speed;
 static unsigned long modem1;
 static unsigned long modem2;
 static unsigned long modem3;
@@ -673,7 +673,6 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         if (sInitChan(ctlp, &info->channel, aiop, chan) == 0) {
                 printk(KERN_ERR "RocketPort sInitChan(%d, %d, %d) failed!\n",
                                 board, aiop, chan);
-                tty_port_destroy(&info->port);
                 kfree(info);
                 return;
         }
@@ -705,8 +704,8 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         spin_lock_init(&info->slock);
         mutex_init(&info->write_mtx);
         rp_table[line] = info;
-        tty_port_register_device(&info->port, rocket_driver, line,
-                        pci_dev ? &pci_dev->dev : NULL);
+        tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
+                        NULL);
 }
 
 /*
@@ -721,7 +720,7 @@ static void configure_r_port(struct tty_struct *tty, struct r_port *info,
         unsigned rocketMode;
         int bits, baud, divisor;
         CHANNEL_t *cp;
-        struct ktermios *t = &tty->termios;
+        struct ktermios *t = tty->termios;
 
         cp = &info->channel;
         cflag = t->c_cflag;
@@ -893,12 +892,12 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
 {
         struct r_port *info;
         struct tty_port *port;
-        int retval;
+        int line = 0, retval;
         CHANNEL_t *cp;
         unsigned long page;
 
-        info = rp_table[tty->index];
-        if (info == NULL)
+        line = tty->index;
+        if (line < 0 || line >= MAX_RP_PORTS || ((info = rp_table[line]) == NULL))
                 return -ENXIO;
         port = &info->port;
         
@@ -979,7 +978,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                         tty->alt_speed = 460800;
 
                 configure_r_port(tty, info, NULL);
-                if (tty->termios.c_cflag & CBAUD) {
+                if (tty->termios->c_cflag & CBAUD) {
                         sSetDTR(cp);
                         sSetRTS(cp);
                 }
@@ -1090,35 +1089,35 @@ static void rp_set_termios(struct tty_struct *tty,
         if (rocket_paranoia_check(info, "rp_set_termios"))
                 return;
 
-        cflag = tty->termios.c_cflag;
+        cflag = tty->termios->c_cflag;
 
         /*
          * This driver doesn't support CS5 or CS6
          */
         if (((cflag & CSIZE) == CS5) || ((cflag & CSIZE) == CS6))
-                tty->termios.c_cflag =
+                tty->termios->c_cflag =
                     ((cflag & ~CSIZE) | (old_termios->c_cflag & CSIZE));
         /* Or CMSPAR */
-        tty->termios.c_cflag &= ~CMSPAR;
+        tty->termios->c_cflag &= ~CMSPAR;
 
         configure_r_port(tty, info, old_termios);
 
         cp = &info->channel;
 
         /* Handle transition to B0 status */
-        if ((old_termios->c_cflag & CBAUD) && !(tty->termios.c_cflag & CBAUD)) {
+        if ((old_termios->c_cflag & CBAUD) && !(tty->termios->c_cflag & CBAUD)) {
                 sClrDTR(cp);
                 sClrRTS(cp);
         }
 
         /* Handle transition away from B0 status */
-        if (!(old_termios->c_cflag & CBAUD) && (tty->termios.c_cflag & CBAUD)) {
-                if (!tty->hw_stopped || !(tty->termios.c_cflag & CRTSCTS))
+        if (!(old_termios->c_cflag & CBAUD) && (tty->termios->c_cflag & CBAUD)) {
+                if (!tty->hw_stopped || !(tty->termios->c_cflag & CRTSCTS))
                         sSetRTS(cp);
                 sSetDTR(cp);
         }
 
-        if ((old_termios->c_cflag & CRTSCTS) && !(tty->termios.c_cflag & CRTSCTS)) {
+        if ((old_termios->c_cflag & CRTSCTS) && !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 rp_start(tty);
         }
@@ -1758,7 +1757,7 @@ static void rp_flush_buffer(struct tty_struct *tty)
 
 #ifdef CONFIG_PCI
 
-static struct pci_device_id __used rocket_pci_ids[] = {
+static struct pci_device_id __devinitdata __used rocket_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
         { }
 };
@@ -2278,6 +2277,7 @@ static int __init rp_init(void)
          * driver with the tty layer.
          */
 
+        rocket_driver->owner = THIS_MODULE;
         rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
         rocket_driver->name = "ttyR";
         rocket_driver->driver_name = "Comtrol RocketPort";
@@ -2358,7 +2358,6 @@ static void rp_cleanup_module(void)
         for (i = 0; i < MAX_RP_PORTS; i++)
                 if (rp_table[i]) {
                         tty_unregister_device(rocket_driver, i);
-                        tty_port_destroy(&rp_table[i]->port);
                         kfree(rp_table[i]);
                 }
 
diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c
index a44345a2dbb..1b37626e8f1 100644
--- a/drivers/tty/serial/21285.c
+++ b/drivers/tty/serial/21285.c
@@ -16,7 +16,6 @@
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/system_info.h>
 #include <asm/hardware/dec21285.h>
 #include <mach/hardware.h>
 
@@ -332,7 +331,7 @@ static int serial21285_verify_port(struct uart_port *port, struct serial_struct
         int ret = 0;
         if (ser->type != PORT_UNKNOWN && ser->type != PORT_21285)
                 ret = -EINVAL;
-        if (ser->irq <= 0)
+        if (ser->irq != NO_IRQ)
                 ret = -EINVAL;
         if (ser->baud_base != port->uartclk / 16)
                 ret = -EINVAL;
@@ -361,7 +360,7 @@ static struct uart_ops serial21285_ops = {
 static struct uart_port serial21285_port = {
         .mapbase        = 0x42000160,
         .iotype         = UPIO_MEM,
-        .irq            = 0,
+        .irq            = NO_IRQ,
         .fifosize       = 16,
         .ops            = &serial21285_ops,
         .flags          = UPF_BOOT_AUTOCONF,
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index f99a84526f8..e0a77540b8c 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -17,7 +17,6 @@
 #include <asm/dbg.h>
 #include <linux/module.h>
 #include <linux/errno.h>
-#include <linux/serial.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
@@ -40,6 +39,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/system.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 
@@ -57,6 +57,8 @@
 #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
@@ -64,82 +66,33 @@
 #define USE_INTS
 #endif
 
-/*
- * 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
- */
+static struct m68k_serial m68k_soft[NR_PORTS];
 
-/* (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) */
+static unsigned int uart_irqs[NR_PORTS] = UART_IRQ_DEFNS;
 
-/*
- * This is our internal structure for each serial port's state.
- */
-struct m68k_serial {
-        struct tty_port         tport;
-        char                    is_cons;        /* Is this our console. */
-        int                     magic;
-        int                     baud_base;
-        int                     port;
-        int                     irq;
-        int                     type;           /* UART type */
-        int                     custom_divisor;
-        int                     x_char;         /* xon/xoff character */
-        int                     line;
-        unsigned char           *xmit_buf;
-        int                     xmit_head;
-        int                     xmit_tail;
-        int                     xmit_cnt;
-};
+/* multiple ports are contiguous in memory */
+m68328_uart *uart_addr = (m68328_uart *)USTCNT_ADDR;
 
-#define SERIAL_MAGIC 0x5301
+struct tty_struct m68k_ttys;
+struct m68k_serial *m68k_consinfo = 0;
 
-/*
- * Define the number of ports supported and their irqs.
- */
-#define NR_PORTS 1
+#define M68K_CLOCK (16667000) /* FIXME: 16MHz is likely wrong */
 
-static struct m68k_serial m68k_soft[NR_PORTS];
+struct tty_driver *serial_driver;
 
-static unsigned int uart_irqs[NR_PORTS] = { UART_IRQ_NUM };
+/* number of characters left in xmit buffer before we ask for more */
+#define WAKEUP_CHARS 256
 
-/* multiple ports are contiguous in memory */
-m68328_uart *uart_addr = (m68328_uart *)USTCNT_ADDR;
+/* 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
 
-struct tty_driver *serial_driver;
+#define RS_ISR_PASS_LIMIT 256
 
-static void change_speed(struct m68k_serial *info, struct tty_struct *tty);
+static void change_speed(struct m68k_serial *info);
 
 /*
  *      Setup for console. Argument comes from the boot command line.
@@ -191,6 +144,17 @@ static int baud_table[] = {
         0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
         9600, 19200, 38400, 57600, 115200, 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)
 {
@@ -226,8 +190,7 @@ static void rs_stop(struct tty_struct *tty)
 
 static int rs_put_char(char ch)
 {
-        unsigned long flags;
-        int loops = 0;
+        int flags, loops = 0;
 
         local_irq_save(flags);
 
@@ -262,9 +225,44 @@ static void rs_start(struct tty_struct *tty)
         local_irq_restore(flags);
 }
 
-static void receive_chars(struct m68k_serial *info, struct tty_struct *tty,
-                unsigned short rx)
+/* 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 void status_handle(struct m68k_serial *info, unsigned short status)
+{
+#if 0
+        if(status & DCD) {
+                if((info->port.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 void receive_chars(struct m68k_serial *info, unsigned short rx)
 {
+        struct tty_struct *tty = info->tty;
         m68328_uart *uart = &uart_addr[info->line];
         unsigned char ch, flag;
 
@@ -278,6 +276,7 @@ static void receive_chars(struct m68k_serial *info, struct tty_struct *tty,
         
                 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 */
@@ -298,13 +297,16 @@ static void receive_chars(struct m68k_serial *info, struct tty_struct *tty,
                 
                 flag = TTY_NORMAL;
 
-                if (rx & URX_PARITY_ERROR)
+                if(rx & URX_PARITY_ERROR) {
                         flag = TTY_PARITY;
-                else if (rx & URX_OVRUN)
+                        status_handle(info, rx);
+                } else if(rx & URX_OVRUN) {
                         flag = TTY_OVERRUN;
-                else if (rx & URX_FRAME_ERROR)
+                        status_handle(info, rx);
+                } else if(rx & URX_FRAME_ERROR) {
                         flag = TTY_FRAME;
-
+                        status_handle(info, rx);
+                }
                 tty_insert_flip_char(tty, ch, flag);
 #ifndef CONFIG_XCOPILOT_BUGS
         } while((rx = uart->urx.w) & URX_DATA_READY);
@@ -316,7 +318,7 @@ clear_and_exit:
         return;
 }
 
-static void transmit_chars(struct m68k_serial *info, struct tty_struct *tty)
+static void transmit_chars(struct m68k_serial *info)
 {
         m68328_uart *uart = &uart_addr[info->line];
 
@@ -327,7 +329,7 @@ static void transmit_chars(struct m68k_serial *info, struct tty_struct *tty)
                 goto clear_and_return;
         }
 
-        if ((info->xmit_cnt <= 0) || !tty || tty->stopped) {
+        if((info->xmit_cnt <= 0) || info->tty->stopped) {
                 /* That's peculiar... TX ints off */
                 uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
                 goto clear_and_return;
@@ -338,6 +340,9 @@ static void transmit_chars(struct m68k_serial *info, struct tty_struct *tty)
         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;
@@ -355,7 +360,6 @@ clear_and_return:
 irqreturn_t rs_interrupt(int irq, void *dev_id)
 {
         struct m68k_serial *info = dev_id;
-        struct tty_struct *tty = tty_port_tty_get(&info->tport);
         m68328_uart *uart;
         unsigned short rx;
         unsigned short tx;
@@ -366,24 +370,35 @@ irqreturn_t rs_interrupt(int irq, void *dev_id)
 #ifdef USE_INTS
         tx = uart->utx.w;
 
-        if (rx & URX_DATA_READY)
-                receive_chars(info, tty, rx);
-        if (tx & UTX_TX_AVAIL)
-                transmit_chars(info, tty);
+        if (rx & URX_DATA_READY) receive_chars(info, rx);
+        if (tx & UTX_TX_AVAIL)   transmit_chars(info);
 #else
-        receive_chars(info, tty, rx);
+        receive_chars(info, rx);                
 #endif
-        tty_kref_put(tty);
-
         return IRQ_HANDLED;
 }
 
-static int startup(struct m68k_serial *info, struct tty_struct *tty)
+static void do_softint(struct work_struct *work)
+{
+        struct m68k_serial      *info = container_of(work, struct m68k_serial, tqueue);
+        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   
+}
+
+static int startup(struct m68k_serial * info)
 {
         m68328_uart *uart = &uart_addr[info->line];
         unsigned long flags;
         
-        if (info->tport.flags & ASYNC_INITIALIZED)
+        if (info->flags & S_INITIALIZED)
                 return 0;
 
         if (!info->xmit_buf) {
@@ -400,6 +415,7 @@ static int startup(struct m68k_serial *info, struct tty_struct *tty)
          */
 
         uart->ustcnt = USTCNT_UEN;
+        info->xmit_fifo_size = 1;
         uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_TXEN;
         (void)uart->urx.w;
 
@@ -413,17 +429,17 @@ static int startup(struct m68k_serial *info, struct tty_struct *tty)
         uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_RX_INTR_MASK;
 #endif
 
-        if (tty)
-                clear_bit(TTY_IO_ERROR, &tty->flags);
+        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, tty);
+        change_speed(info);
 
-        info->tport.flags |= ASYNC_INITIALIZED;
+        info->flags |= S_INITIALIZED;
         local_irq_restore(flags);
         return 0;
 }
@@ -432,13 +448,13 @@ static int startup(struct m68k_serial *info, struct tty_struct *tty)
  * 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, struct tty_struct *tty)
+static void shutdown(struct m68k_serial * info)
 {
         m68328_uart *uart = &uart_addr[info->line];
         unsigned long   flags;
 
         uart->ustcnt = 0; /* All off! */
-        if (!(info->tport.flags & ASYNC_INITIALIZED))
+        if (!(info->flags & S_INITIALIZED))
                 return;
 
         local_irq_save(flags);
@@ -448,10 +464,10 @@ static void shutdown(struct m68k_serial *info, struct tty_struct *tty)
                 info->xmit_buf = 0;
         }
 
-        if (tty)
-                set_bit(TTY_IO_ERROR, &tty->flags);
+        if (info->tty)
+                set_bit(TTY_IO_ERROR, &info->tty->flags);
         
-        info->tport.flags &= ~ASYNC_INITIALIZED;
+        info->flags &= ~S_INITIALIZED;
         local_irq_restore(flags);
 }
 
@@ -507,7 +523,7 @@ struct {
  * 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, struct tty_struct *tty)
+static void change_speed(struct m68k_serial *info)
 {
         m68328_uart *uart = &uart_addr[info->line];
         unsigned short port;
@@ -515,7 +531,9 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty)
         unsigned cflag;
         int     i;
 
-        cflag = tty->termios.c_cflag;
+        if (!info->tty || !info->tty->termios)
+                return;
+        cflag = info->tty->termios->c_cflag;
         if (!(port = info->port))
                 return;
 
@@ -527,6 +545,7 @@ static void change_speed(struct m68k_serial *info, struct tty_struct *tty)
                 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);
 
@@ -617,7 +636,7 @@ static void rs_set_ldisc(struct tty_struct *tty)
         if (serial_paranoia_check(info, tty->name, "rs_set_ldisc"))
                 return;
 
-        info->is_cons = (tty->termios.c_line == N_TTY);
+        info->is_cons = (tty->termios->c_line == N_TTY);
         
         printk("ttyS%d console mode %s\n", info->line, info->is_cons ? "on" : "off");
 }
@@ -823,10 +842,10 @@ static int get_serial_info(struct m68k_serial * info,
         tmp.line = info->line;
         tmp.port = info->port;
         tmp.irq = info->irq;
-        tmp.flags = info->tport.flags;
+        tmp.flags = info->flags;
         tmp.baud_base = info->baud_base;
-        tmp.close_delay = info->tport.close_delay;
-        tmp.closing_wait = info->tport.closing_wait;
+        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;
@@ -834,10 +853,9 @@ static int get_serial_info(struct m68k_serial * info,
         return 0;
 }
 
-static int set_serial_info(struct m68k_serial *info, struct tty_struct *tty,
+static int set_serial_info(struct m68k_serial * info,
                            struct serial_struct * new_info)
 {
-        struct tty_port *port = &info->tport;
         struct serial_struct new_serial;
         struct m68k_serial old_info;
         int                     retval = 0;
@@ -851,17 +869,17 @@ static int set_serial_info(struct m68k_serial *info, struct tty_struct *tty,
         if (!capable(CAP_SYS_ADMIN)) {
                 if ((new_serial.baud_base != info->baud_base) ||
                     (new_serial.type != info->type) ||
-                    (new_serial.close_delay != port->close_delay) ||
-                    ((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (port->flags & ~ASYNC_USR_MASK)))
+                    (new_serial.close_delay != info->close_delay) ||
+                    ((new_serial.flags & ~S_USR_MASK) !=
+                     (info->flags & ~S_USR_MASK)))
                         return -EPERM;
-                port->flags = ((port->flags & ~ASYNC_USR_MASK) |
-                               (new_serial.flags & ASYNC_USR_MASK));
+                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 (port->count > 1)
+        if (info->count > 1)
                 return -EBUSY;
 
         /*
@@ -870,14 +888,14 @@ static int set_serial_info(struct m68k_serial *info, struct tty_struct *tty,
          */
 
         info->baud_base = new_serial.baud_base;
-        port->flags = ((port->flags & ~ASYNC_FLAGS) |
-                        (new_serial.flags & ASYNC_FLAGS));
+        info->flags = ((info->flags & ~S_FLAGS) |
+                        (new_serial.flags & S_FLAGS));
         info->type = new_serial.type;
-        port->close_delay = new_serial.close_delay;
-        port->closing_wait = new_serial.closing_wait;
+        info->close_delay = new_serial.close_delay;
+        info->closing_wait = new_serial.closing_wait;
 
 check_and_exit:
-        retval = startup(info, tty);
+        retval = startup(info);
         return retval;
 }
 
@@ -963,7 +981,7 @@ static int rs_ioctl(struct tty_struct *tty,
                         return get_serial_info(info,
                                        (struct serial_struct *) arg);
                 case TIOCSSERIAL:
-                        return set_serial_info(info, tty,
+                        return set_serial_info(info,
                                                (struct serial_struct *) arg);
                 case TIOCSERGETLSR: /* Get line status register */
                         return get_lsr_info(info, (unsigned int *) arg);
@@ -982,10 +1000,10 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
         struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
 
-        change_speed(info, tty);
+        change_speed(info);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
+            !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 rs_start(tty);
         }
@@ -1005,7 +1023,6 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 static void rs_close(struct tty_struct *tty, struct file * filp)
 {
         struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
-        struct tty_port *port = &info->tport;
         m68328_uart *uart = &uart_addr[info->line];
         unsigned long flags;
 
@@ -1019,7 +1036,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
                 return;
         }
         
-        if ((tty->count == 1) && (port->count != 1)) {
+        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
@@ -1028,26 +1045,26 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
                  * serial port won't be shutdown.
                  */
                 printk("rs_close: bad serial port count; tty->count is 1, "
-                       "port->count is %d\n", port->count);
-                port->count = 1;
+                       "info->count is %d\n", info->count);
+                info->count = 1;
         }
-        if (--port->count < 0) {
+        if (--info->count < 0) {
                 printk("rs_close: bad serial port count for ttyS%d: %d\n",
-                       info->line, port->count);
-                port->count = 0;
+                       info->line, info->count);
+                info->count = 0;
         }
-        if (port->count) {
+        if (info->count) {
                 local_irq_restore(flags);
                 return;
         }
-        port->flags |= ASYNC_CLOSING;
+        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 (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, port->closing_wait);
+        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
@@ -1058,30 +1075,32 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         uart->ustcnt &= ~USTCNT_RXEN;
         uart->ustcnt &= ~(USTCNT_RXEN | USTCNT_RX_INTR_MASK);
 
-        shutdown(info, tty);
+        shutdown(info);
         rs_flush_buffer(tty);
                 
         tty_ldisc_flush(tty);
         tty->closing = 0;
-        tty_port_tty_set(&info->tport, NULL);
+        info->event = 0;
+        info->tty = NULL;
 #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;
+                tty->termios->c_line = N_TTY;
                 if (tty->ldisc.open)
                         (tty->ldisc.open)(tty);
         }
 #endif  
-        if (port->blocked_open) {
-                if (port->close_delay)
-                        msleep_interruptible(jiffies_to_msecs(port->close_delay));
-                wake_up_interruptible(&port->open_wait);
+        if (info->blocked_open) {
+                if (info->close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+                }
+                wake_up_interruptible(&info->open_wait);
         }
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&port->close_wait);
+        info->flags &= ~(S_NORMAL_ACTIVE|S_CLOSING);
+        wake_up_interruptible(&info->close_wait);
         local_irq_restore(flags);
 }
 
@@ -1096,14 +1115,107 @@ void rs_hangup(struct tty_struct *tty)
                 return;
         
         rs_flush_buffer(tty);
-        shutdown(info, tty);
-        info->tport.count = 0;
-        info->tport.flags &= ~ASYNC_NORMAL_ACTIVE;
-        tty_port_tty_set(&info->tport, NULL);
-        wake_up_interruptible(&info->tport.open_wait);
+        shutdown(info);
+        info->event = 0;
+        info->count = 0;
+        info->flags &= ~S_NORMAL_ACTIVE;
+        info->tty = NULL;
+        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) {
+                local_irq_disable();
+                m68k_rtsdtr(info, 1);
+                local_irq_enable();
+                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;
+                }
+                tty_unlock();
+                schedule();
+                tty_lock();
+        }
+        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
@@ -1112,25 +1224,30 @@ void rs_hangup(struct tty_struct *tty)
 int rs_open(struct tty_struct *tty, struct file * filp)
 {
         struct m68k_serial      *info;
-        int retval;
+        int                     retval, line;
+
+        line = tty->index;
+        
+        if (line >= NR_PORTS || line < 0) /* we have exactly one */
+                return -ENODEV;
 
-        info = &m68k_soft[tty->index];
+        info = &m68k_soft[line];
 
         if (serial_paranoia_check(info, tty->name, "rs_open"))
                 return -ENODEV;
 
-        info->tport.count++;
+        info->count++;
         tty->driver_data = info;
-        tty_port_tty_set(&info->tport, tty);
+        info->tty = tty;
 
         /*
          * Start up serial port
          */
-        retval = startup(info, tty);
+        retval = startup(info);
         if (retval)
                 return retval;
 
-        return tty_port_block_til_ready(&info->tport, tty, filp);
+        return block_til_ready(tty, filp, info);
 }
 
 /* Finally, routines used to initialize the serial driver. */
@@ -1158,15 +1275,11 @@ static const struct tty_operations rs_ops = {
         .set_ldisc = rs_set_ldisc,
 };
 
-static const struct tty_port_operations rs_port_ops = {
-};
-
 /* rs_init inits the driver */
 static int __init
 rs68328_init(void)
 {
-        unsigned long flags;
-        int i;
+        int flags, i;
         struct m68k_serial *info;
 
         serial_driver = alloc_tty_driver(NR_PORTS);
@@ -1189,18 +1302,31 @@ rs68328_init(void)
         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;
+        }
+
         local_irq_save(flags);
 
         for(i=0;i<NR_PORTS;i++) {
 
             info = &m68k_soft[i];
-            tty_port_init(&info->tport);
-            info->tport.ops = &rs_port_ops;
             info->magic = SERIAL_MAGIC;
             info->port = (int) &uart_addr[i];
+            info->tty = NULL;
             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);
+            init_waitqueue_head(&info->open_wait);
+            init_waitqueue_head(&info->close_wait);
             info->line = i;
             info->is_cons = 1; /* Means shortcuts work */
             
@@ -1215,22 +1341,11 @@ rs68328_init(void)
 
             if (request_irq(uart_irqs[i],
                             rs_interrupt,
-                            0,
+                            IRQF_DISABLED,
                             "M68328_UART", info))
                 panic("Unable to attach 68328 serial interrupt\n");
-
-            tty_port_link_device(&info->tport, serial_driver, i);
         }
         local_irq_restore(flags);
-
-        if (tty_register_driver(serial_driver)) {
-                put_tty_driver(serial_driver);
-                for (i = 0; i < NR_PORTS; i++)
-                        tty_port_destroy(&m68k_soft[i].tport);
-                printk(KERN_ERR "Couldn't register serial driver\n");
-                return -ENOMEM;
-        }
-
         return 0;
 }
 
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
deleted file mode 100644
index d085e3a8ec0..00000000000
--- a/drivers/tty/serial/8250/8250.c
+++ /dev/null
@@ -1,3421 +0,0 @@
-/*
- *  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.
- *  membase is an 'ioremapped' cookie.
- */
-
-#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/delay.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/ratelimit.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 <linux/nmi.h>
-#include <linux/mutex.h>
-#include <linux/slab.h>
-#ifdef CONFIG_SPARC
-#include <linux/sunserialcore.h>
-#endif
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include "8250.h"
-
-/*
- * Configuration:
- *   share_irqs - whether we pass IRQF_SHARED to request_irq().  This option
- *                is unsafe when used on edge-triggered interrupts.
- */
-static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
-
-static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
-
-static struct uart_driver serial8250_reg;
-
-static int serial_index(struct uart_port *port)
-{
-        return (serial8250_reg.minor - 64) + port->line;
-}
-
-static unsigned int skip_txen_test; /* force skip of txen test at init time */
-
-/*
- * 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      512
-
-#define BOTH_EMPTY      (UART_LSR_TEMT | UART_LSR_THRE)
-
-
-#ifdef CONFIG_SERIAL_8250_DETECT_IRQ
-#define CONFIG_SERIAL_DETECT_IRQ 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 const struct old_serial_port old_serial_port[] = {
-        SERIAL_PORT_DFNS /* defined in asm/serial.h */
-};
-
-#define UART_NR 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 irq_info {
-        struct                  hlist_node node;
-        int                     irq;
-        spinlock_t              lock;   /* Protects list not the hash */
-        struct list_head        *head;
-};
-
-#define NR_IRQ_HASH             32      /* Can be adjusted later */
-static struct hlist_head irq_lists[NR_IRQ_HASH];
-static DEFINE_MUTEX(hash_mutex);        /* Used to walk the hash */
-
-/*
- * 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,
-                /* UART_CAP_EFR breaks billionon CF bluetooth card. */
-                .flags          = UART_CAP_FIFO | UART_CAP_SLEEP,
-        },
-        [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 | UART_CAP_RTOIE,
-        },
-        [PORT_RM9000] = {
-                .name           = "RM9000",
-                .fifo_size      = 16,
-                .tx_loadsz      = 16,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-                .flags          = UART_CAP_FIFO,
-        },
-        [PORT_OCTEON] = {
-                .name           = "OCTEON",
-                .fifo_size      = 64,
-                .tx_loadsz      = 64,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-                .flags          = UART_CAP_FIFO,
-        },
-        [PORT_AR7] = {
-                .name           = "AR7",
-                .fifo_size      = 16,
-                .tx_loadsz      = 16,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
-                .flags          = UART_CAP_FIFO | UART_CAP_AFE,
-        },
-        [PORT_U6_16550A] = {
-                .name           = "U6_16550A",
-                .fifo_size      = 64,
-                .tx_loadsz      = 64,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-                .flags          = UART_CAP_FIFO | UART_CAP_AFE,
-        },
-        [PORT_TEGRA] = {
-                .name           = "Tegra",
-                .fifo_size      = 32,
-                .tx_loadsz      = 8,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 |
-                                  UART_FCR_T_TRIG_01,
-                .flags          = UART_CAP_FIFO | UART_CAP_RTOIE,
-        },
-        [PORT_XR17D15X] = {
-                .name           = "XR17D15X",
-                .fifo_size      = 64,
-                .tx_loadsz      = 64,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-                .flags          = UART_CAP_FIFO | UART_CAP_AFE | UART_CAP_EFR |
-                                  UART_CAP_SLEEP,
-        },
-        [PORT_XR17V35X] = {
-                .name           = "XR17V35X",
-                .fifo_size      = 256,
-                .tx_loadsz      = 256,
-                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_11 |
-                                  UART_FCR_T_TRIG_11,
-                .flags          = UART_CAP_FIFO | UART_CAP_AFE | UART_CAP_EFR |
-                                  UART_CAP_SLEEP,
-        },
-        [PORT_LPC3220] = {
-                .name           = "LPC3220",
-                .fifo_size      = 64,
-                .tx_loadsz      = 32,
-                .fcr            = UART_FCR_DMA_SELECT | UART_FCR_ENABLE_FIFO |
-                                  UART_FCR_R_TRIG_00 | UART_FCR_T_TRIG_00,
-                .flags          = UART_CAP_FIFO,
-        },
-        [PORT_8250_CIR] = {
-                .name           = "CIR port"
-        }
-};
-
-/* Uart divisor latch read */
-static int default_serial_dl_read(struct uart_8250_port *up)
-{
-        return serial_in(up, UART_DLL) | serial_in(up, UART_DLM) << 8;
-}
-
-/* Uart divisor latch write */
-static void default_serial_dl_write(struct uart_8250_port *up, int value)
-{
-        serial_out(up, UART_DLL, value & 0xff);
-        serial_out(up, UART_DLM, value >> 8 & 0xff);
-}
-
-#ifdef CONFIG_MIPS_ALCHEMY
-
-/* Au1x00 UART hardware has a weird register layout */
-static const u8 au_io_in_map[] = {
-        [UART_RX]  = 0,
-        [UART_IER] = 2,
-        [UART_IIR] = 3,
-        [UART_LCR] = 5,
-        [UART_MCR] = 6,
-        [UART_LSR] = 7,
-        [UART_MSR] = 8,
-};
-
-static const u8 au_io_out_map[] = {
-        [UART_TX]  = 1,
-        [UART_IER] = 2,
-        [UART_FCR] = 4,
-        [UART_LCR] = 5,
-        [UART_MCR] = 6,
-};
-
-static unsigned int au_serial_in(struct uart_port *p, int offset)
-{
-        offset = au_io_in_map[offset] << p->regshift;
-        return __raw_readl(p->membase + offset);
-}
-
-static void au_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = au_io_out_map[offset] << p->regshift;
-        __raw_writel(value, p->membase + offset);
-}
-
-/* Au1x00 haven't got a standard divisor latch */
-static int au_serial_dl_read(struct uart_8250_port *up)
-{
-        return __raw_readl(up->port.membase + 0x28);
-}
-
-static void au_serial_dl_write(struct uart_8250_port *up, int value)
-{
-        __raw_writel(value, up->port.membase + 0x28);
-}
-
-#endif
-
-#ifdef CONFIG_SERIAL_8250_RM9K
-
-static const u8
-        regmap_in[8] = {
-                [UART_RX]       = 0x00,
-                [UART_IER]      = 0x0c,
-                [UART_IIR]      = 0x14,
-                [UART_LCR]      = 0x1c,
-                [UART_MCR]      = 0x20,
-                [UART_LSR]      = 0x24,
-                [UART_MSR]      = 0x28,
-                [UART_SCR]      = 0x2c
-        },
-        regmap_out[8] = {
-                [UART_TX]       = 0x04,
-                [UART_IER]      = 0x0c,
-                [UART_FCR]      = 0x18,
-                [UART_LCR]      = 0x1c,
-                [UART_MCR]      = 0x20,
-                [UART_LSR]      = 0x24,
-                [UART_MSR]      = 0x28,
-                [UART_SCR]      = 0x2c
-        };
-
-static unsigned int rm9k_serial_in(struct uart_port *p, int offset)
-{
-        offset = regmap_in[offset] << p->regshift;
-        return readl(p->membase + offset);
-}
-
-static void rm9k_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = regmap_out[offset] << p->regshift;
-        writel(value, p->membase + offset);
-}
-
-static int rm9k_serial_dl_read(struct uart_8250_port *up)
-{
-        return ((__raw_readl(up->port.membase + 0x10) << 8) |
-                (__raw_readl(up->port.membase + 0x08) & 0xff)) & 0xffff;
-}
-
-static void rm9k_serial_dl_write(struct uart_8250_port *up, int value)
-{
-        __raw_writel(value, up->port.membase + 0x08);
-        __raw_writel(value >> 8, up->port.membase + 0x10);
-}
-
-#endif
-
-static unsigned int hub6_serial_in(struct uart_port *p, int offset)
-{
-        offset = offset << p->regshift;
-        outb(p->hub6 - 1 + offset, p->iobase);
-        return inb(p->iobase + 1);
-}
-
-static void hub6_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = offset << p->regshift;
-        outb(p->hub6 - 1 + offset, p->iobase);
-        outb(value, p->iobase + 1);
-}
-
-static unsigned int mem_serial_in(struct uart_port *p, int offset)
-{
-        offset = offset << p->regshift;
-        return readb(p->membase + offset);
-}
-
-static void mem_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = offset << p->regshift;
-        writeb(value, p->membase + offset);
-}
-
-static void mem32_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = offset << p->regshift;
-        writel(value, p->membase + offset);
-}
-
-static unsigned int mem32_serial_in(struct uart_port *p, int offset)
-{
-        offset = offset << p->regshift;
-        return readl(p->membase + offset);
-}
-
-static unsigned int io_serial_in(struct uart_port *p, int offset)
-{
-        offset = offset << p->regshift;
-        return inb(p->iobase + offset);
-}
-
-static void io_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = offset << p->regshift;
-        outb(value, p->iobase + offset);
-}
-
-static int serial8250_default_handle_irq(struct uart_port *port);
-static int exar_handle_irq(struct uart_port *port);
-
-static void set_io_from_upio(struct uart_port *p)
-{
-        struct uart_8250_port *up =
-                container_of(p, struct uart_8250_port, port);
-
-        up->dl_read = default_serial_dl_read;
-        up->dl_write = default_serial_dl_write;
-
-        switch (p->iotype) {
-        case UPIO_HUB6:
-                p->serial_in = hub6_serial_in;
-                p->serial_out = hub6_serial_out;
-                break;
-
-        case UPIO_MEM:
-                p->serial_in = mem_serial_in;
-                p->serial_out = mem_serial_out;
-                break;
-
-        case UPIO_MEM32:
-                p->serial_in = mem32_serial_in;
-                p->serial_out = mem32_serial_out;
-                break;
-
-#ifdef CONFIG_SERIAL_8250_RM9K
-        case UPIO_RM9000:
-                p->serial_in = rm9k_serial_in;
-                p->serial_out = rm9k_serial_out;
-                up->dl_read = rm9k_serial_dl_read;
-                up->dl_write = rm9k_serial_dl_write;
-                break;
-#endif
-
-#ifdef CONFIG_MIPS_ALCHEMY
-        case UPIO_AU:
-                p->serial_in = au_serial_in;
-                p->serial_out = au_serial_out;
-                up->dl_read = au_serial_dl_read;
-                up->dl_write = au_serial_dl_write;
-                break;
-#endif
-
-        default:
-                p->serial_in = io_serial_in;
-                p->serial_out = io_serial_out;
-                break;
-        }
-        /* Remember loaded iotype */
-        up->cur_iotype = p->iotype;
-        p->handle_irq = serial8250_default_handle_irq;
-}
-
-static void
-serial_port_out_sync(struct uart_port *p, int offset, int value)
-{
-        switch (p->iotype) {
-        case UPIO_MEM:
-        case UPIO_MEM32:
-        case UPIO_AU:
-                p->serial_out(p, offset, value);
-                p->serial_in(p, UART_LCR);      /* safe, no side-effects */
-                break;
-        default:
-                p->serial_out(p, 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 void serial8250_clear_fifos(struct uart_8250_port *p)
-{
-        if (p->capabilities & UART_CAP_FIFO) {
-                serial_out(p, UART_FCR, UART_FCR_ENABLE_FIFO);
-                serial_out(p, UART_FCR, UART_FCR_ENABLE_FIFO |
-                               UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
-                serial_out(p, UART_FCR, 0);
-        }
-}
-
-void serial8250_clear_and_reinit_fifos(struct uart_8250_port *p)
-{
-        unsigned char fcr;
-
-        serial8250_clear_fifos(p);
-        fcr = uart_config[p->port.type].fcr;
-        serial_out(p, UART_FCR, fcr);
-}
-EXPORT_SYMBOL_GPL(serial8250_clear_and_reinit_fifos);
-
-/*
- * 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 void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
-{
-        /*
-         * Exar UARTs have a SLEEP register that enables or disables
-         * each UART to enter sleep mode separately.  On the XR17V35x the
-         * register is accessible to each UART at the UART_EXAR_SLEEP
-         * offset but the UART channel may only write to the corresponding
-         * bit.
-         */
-        if ((p->port.type == PORT_XR17V35X) ||
-           (p->port.type == PORT_XR17D15X)) {
-                serial_out(p, UART_EXAR_SLEEP, 0xff);
-                return;
-        }
-
-        if (p->capabilities & UART_CAP_SLEEP) {
-                if (p->capabilities & UART_CAP_EFR) {
-                        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_B);
-                        serial_out(p, UART_EFR, UART_EFR_ECB);
-                        serial_out(p, UART_LCR, 0);
-                }
-                serial_out(p, UART_IER, sleep ? UART_IERX_SLEEP : 0);
-                if (p->capabilities & UART_CAP_EFR) {
-                        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_B);
-                        serial_out(p, UART_EFR, 0);
-                        serial_out(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_in(up, UART_RSA_MSR);
-        result = mode & UART_RSA_MSR_FIFO;
-
-        if (!result) {
-                serial_out(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
-                mode = serial_in(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_out(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_in(up, UART_RSA_MSR);
-                result = !(mode & UART_RSA_MSR_FIFO);
-
-                if (!result) {
-                        serial_out(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
-                        mode = serial_in(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_lcr;
-        unsigned short old_dl;
-        int count;
-
-        old_lcr = serial_in(up, UART_LCR);
-        serial_out(up, UART_LCR, 0);
-        old_fcr = serial_in(up, UART_FCR);
-        old_mcr = serial_in(up, UART_MCR);
-        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO |
-                    UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
-        serial_out(up, UART_MCR, UART_MCR_LOOP);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        old_dl = serial_dl_read(up);
-        serial_dl_write(up, 0x0001);
-        serial_out(up, UART_LCR, 0x03);
-        for (count = 0; count < 256; count++)
-                serial_out(up, UART_TX, count);
-        mdelay(20);/* FIXME - schedule_timeout */
-        for (count = 0; (serial_in(up, UART_LSR) & UART_LSR_DR) &&
-             (count < 256); count++)
-                serial_in(up, UART_RX);
-        serial_out(up, UART_FCR, old_fcr);
-        serial_out(up, UART_MCR, old_mcr);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_dl_write(up, old_dl);
-        serial_out(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_in(p, UART_LCR);
-        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_A);
-
-        old_dll = serial_in(p, UART_DLL);
-        old_dlm = serial_in(p, UART_DLM);
-
-        serial_out(p, UART_DLL, 0);
-        serial_out(p, UART_DLM, 0);
-
-        id = serial_in(p, UART_DLL) | serial_in(p, UART_DLM) << 8;
-
-        serial_out(p, UART_DLL, old_dll);
-        serial_out(p, UART_DLM, old_dlm);
-        serial_out(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, UART_LCR_CONF_MODE_B);
-        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;
-
-                /*
-                 * Enable work around for the Oxford Semiconductor 952 rev B
-                 * chip which causes it to seriously miscalculate baud rates
-                 * when DLL is 0.
-                 */
-                if (id3 == 0x52 && rev == 0x01)
-                        up->bugs |= UART_BUG_QUOT;
-                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) {
-                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_out(up, UART_SCR, 0xa5);
-        status1 = serial_in(up, UART_SCR);
-        serial_out(up, UART_SCR, 0x5a);
-        status2 = serial_in(up, UART_SCR);
-        serial_out(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://linux.derkeiler.com/Mailing-Lists/Kernel/2004-11/4812.html 
-         */
-        if (autoconfig_read_divisor_id(up) == 0x0201 && size_fifo(up) == 16)
-                return 1;
-
-        return 0;
-}
-
-static inline int ns16550a_goto_highspeed(struct uart_8250_port *up)
-{
-        unsigned char status;
-
-        status = serial_in(up, 0x04); /* EXCR2 */
-#define PRESL(x) ((x) & 0x30)
-        if (PRESL(status) == 0x10) {
-                /* already in high speed mode */
-                return 0;
-        } else {
-                status &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
-                status |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
-                serial_out(up, 0x04, status);
-        }
-        return 1;
-}
-
-/*
- * 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;
-
-        /*
-         * XR17V35x UARTs have an extra divisor register, DLD
-         * that gets enabled with when DLAB is set which will
-         * cause the device to incorrectly match and assign
-         * port type to PORT_16650.  The EFR for this UART is
-         * found at offset 0x09. Instead check the Deice ID (DVID)
-         * register for a 2, 4 or 8 port UART.
-         */
-        if (up->port.flags & UPF_EXAR_EFR) {
-                status1 = serial_in(up, UART_EXAR_DVID);
-                if (status1 == 0x82 || status1 == 0x84 || status1 == 0x88) {
-                        DEBUG_AUTOCONF("Exar XR17V35x ");
-                        up->port.type = PORT_XR17V35X;
-                        up->capabilities |= UART_CAP_AFE | UART_CAP_EFR |
-                                                UART_CAP_SLEEP;
-
-                        return;
-                }
-
-        }
-
-        /*
-         * Check for presence of the EFR when DLAB is set.
-         * Only ST16C650V1 UARTs pass this test.
-         */
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        if (serial_in(up, UART_EFR) == 0) {
-                serial_out(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_out(up, UART_EFR, 0);
-                return;
-        }
-
-        /*
-         * Maybe it requires 0xbf to be written to the LCR.
-         * (other ST16C650V2 UARTs, TI16C752A, etc)
-         */
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
-        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
-         */
-        serial_out(up, UART_LCR, 0);
-        status1 = serial_in(up, UART_MCR);
-        serial_out(up, UART_LCR, 0xE0);
-        status2 = serial_in(up, 0x02); /* EXCR1 */
-
-        if (!((status2 ^ status1) & UART_MCR_LOOP)) {
-                serial_out(up, UART_LCR, 0);
-                serial_out(up, UART_MCR, status1 ^ UART_MCR_LOOP);
-                serial_out(up, UART_LCR, 0xE0);
-                status2 = serial_in(up, 0x02); /* EXCR1 */
-                serial_out(up, UART_LCR, 0);
-                serial_out(up, UART_MCR, status1);
-
-                if ((status2 ^ status1) & UART_MCR_LOOP) {
-                        unsigned short quot;
-
-                        serial_out(up, UART_LCR, 0xE0);
-
-                        quot = serial_dl_read(up);
-                        quot <<= 3;
-
-                        if (ns16550a_goto_highspeed(up))
-                                serial_dl_write(up, quot);
-
-                        serial_out(up, UART_LCR, 0);
-
-                        up->port.uartclk = 921600*16;
-                        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_out(up, UART_LCR, 0);
-        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
-        status1 = serial_in(up, UART_IIR) >> 5;
-        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
-        status2 = serial_in(up, UART_IIR) >> 5;
-        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-        serial_out(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_out(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_out(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 | UART_CAP_RTOIE;
-                        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_out(up, UART_IER, iersave);
-
-        /*
-         * Exar uarts have EFR in a weird location
-         */
-        if (up->port.flags & UPF_EXAR_EFR) {
-                DEBUG_AUTOCONF("Exar XR17D15x ");
-                up->port.type = PORT_XR17D15X;
-                up->capabilities |= UART_CAP_AFE | UART_CAP_EFR |
-                                    UART_CAP_SLEEP;
-
-                return;
-        }
-
-        /*
-         * We distinguish between 16550A and U6 16550A by counting
-         * how many bytes are in the FIFO.
-         */
-        if (up->port.type == PORT_16550A && size_fifo(up) == 64) {
-                up->port.type = PORT_U6_16550A;
-                up->capabilities |= UART_CAP_AFE;
-        }
-}
-
-/*
- * 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;
-        struct uart_port *port = &up->port;
-        unsigned long flags;
-        unsigned int old_capabilities;
-
-        if (!port->iobase && !port->mapbase && !port->membase)
-                return;
-
-        DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04lx, 0x%p): ",
-                       serial_index(port), port->iobase, 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(&port->lock, flags);
-
-        up->capabilities = 0;
-        up->bugs = 0;
-
-        if (!(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_in(up, UART_IER);
-                serial_out(up, UART_IER, 0);
-#ifdef __i386__
-                outb(0xff, 0x080);
-#endif
-                /*
-                 * Mask out IER[7:4] bits for test as some UARTs (e.g. TL
-                 * 16C754B) allow only to modify them if an EFR bit is set.
-                 */
-                scratch2 = serial_in(up, UART_IER) & 0x0f;
-                serial_out(up, UART_IER, 0x0F);
-#ifdef __i386__
-                outb(0, 0x080);
-#endif
-                scratch3 = serial_in(up, UART_IER) & 0x0f;
-                serial_out(up, UART_IER, scratch);
-                if (scratch2 != 0 || scratch3 != 0x0F) {
-                        /*
-                         * We failed; there's nothing here
-                         */
-                        spin_unlock_irqrestore(&port->lock, flags);
-                        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 (!(port->flags & UPF_SKIP_TEST)) {
-                serial_out(up, UART_MCR, UART_MCR_LOOP | 0x0A);
-                status1 = serial_in(up, UART_MSR) & 0xF0;
-                serial_out(up, UART_MCR, save_mcr);
-                if (status1 != 0x90) {
-                        spin_unlock_irqrestore(&port->lock, flags);
-                        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 it's 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_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
-        serial_out(up, UART_EFR, 0);
-        serial_out(up, UART_LCR, 0);
-
-        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-        scratch = serial_in(up, UART_IIR) >> 6;
-
-        switch (scratch) {
-        case 0:
-                autoconfig_8250(up);
-                break;
-        case 1:
-                port->type = PORT_UNKNOWN;
-                break;
-        case 2:
-                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 (port->type == PORT_16550A && probeflags & PROBE_RSA) {
-                int i;
-
-                for (i = 0 ; i < probe_rsa_count; ++i) {
-                        if (probe_rsa[i] == port->iobase && __enable_rsa(up)) {
-                                port->type = PORT_RSA;
-                                break;
-                        }
-                }
-        }
-#endif
-
-        serial_out(up, UART_LCR, save_lcr);
-
-        port->fifosize = uart_config[up->port.type].fifo_size;
-        old_capabilities = up->capabilities; 
-        up->capabilities = uart_config[port->type].flags;
-        up->tx_loadsz = uart_config[port->type].tx_loadsz;
-
-        if (port->type == PORT_UNKNOWN)
-                goto out_lock;
-
-        /*
-         * Reset the UART.
-         */
-#ifdef CONFIG_SERIAL_8250_RSA
-        if (port->type == PORT_RSA)
-                serial_out(up, UART_RSA_FRR, 0);
-#endif
-        serial_out(up, UART_MCR, save_mcr);
-        serial8250_clear_fifos(up);
-        serial_in(up, UART_RX);
-        if (up->capabilities & UART_CAP_UUE)
-                serial_out(up, UART_IER, UART_IER_UUE);
-        else
-                serial_out(up, UART_IER, 0);
-
-out_lock:
-        spin_unlock_irqrestore(&port->lock, flags);
-        if (up->capabilities != old_capabilities) {
-                printk(KERN_WARNING
-                       "ttyS%d: detected caps %08x should be %08x\n",
-                       serial_index(port), old_capabilities,
-                       up->capabilities);
-        }
-out:
-        DEBUG_AUTOCONF("iir=%d ", scratch);
-        DEBUG_AUTOCONF("type=%s\n", uart_config[port->type].name);
-}
-
-static void autoconfig_irq(struct uart_8250_port *up)
-{
-        struct uart_port *port = &up->port;
-        unsigned char save_mcr, save_ier;
-        unsigned char save_ICP = 0;
-        unsigned int ICP = 0;
-        unsigned long irqs;
-        int irq;
-
-        if (port->flags & UPF_FOURPORT) {
-                ICP = (port->iobase & 0xfe0) | 0x1f;
-                save_ICP = inb_p(ICP);
-                outb_p(0x80, ICP);
-                inb_p(ICP);
-        }
-
-        /* forget possible initially masked and pending IRQ */
-        probe_irq_off(probe_irq_on());
-        save_mcr = serial_in(up, UART_MCR);
-        save_ier = serial_in(up, UART_IER);
-        serial_out(up, UART_MCR, UART_MCR_OUT1 | UART_MCR_OUT2);
-
-        irqs = probe_irq_on();
-        serial_out(up, UART_MCR, 0);
-        udelay(10);
-        if (port->flags & UPF_FOURPORT) {
-                serial_out(up, UART_MCR,
-                            UART_MCR_DTR | UART_MCR_RTS);
-        } else {
-                serial_out(up, UART_MCR,
-                            UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2);
-        }
-        serial_out(up, UART_IER, 0x0f); /* enable all intrs */
-        serial_in(up, UART_LSR);
-        serial_in(up, UART_RX);
-        serial_in(up, UART_IIR);
-        serial_in(up, UART_MSR);
-        serial_out(up, UART_TX, 0xFF);
-        udelay(20);
-        irq = probe_irq_off(irqs);
-
-        serial_out(up, UART_MCR, save_mcr);
-        serial_out(up, UART_IER, save_ier);
-
-        if (port->flags & UPF_FOURPORT)
-                outb_p(save_ICP, ICP);
-
-        port->irq = (irq > 0) ? irq : 0;
-}
-
-static inline void __stop_tx(struct uart_8250_port *p)
-{
-        if (p->ier & UART_IER_THRI) {
-                p->ier &= ~UART_IER_THRI;
-                serial_out(p, UART_IER, p->ier);
-        }
-}
-
-static void serial8250_stop_tx(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        __stop_tx(up);
-
-        /*
-         * We really want to stop the transmitter from sending.
-         */
-        if (port->type == PORT_16C950) {
-                up->acr |= UART_ACR_TXDIS;
-                serial_icr_write(up, UART_ACR, up->acr);
-        }
-}
-
-static void serial8250_start_tx(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        if (!(up->ier & UART_IER_THRI)) {
-                up->ier |= UART_IER_THRI;
-                serial_port_out(port, UART_IER, up->ier);
-
-                if (up->bugs & UART_BUG_TXEN) {
-                        unsigned char lsr;
-                        lsr = serial_in(up, UART_LSR);
-                        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
-                        if ((port->type == PORT_RM9000) ?
-                                (lsr & UART_LSR_THRE) :
-                                (lsr & UART_LSR_TEMT))
-                                serial8250_tx_chars(up);
-                }
-        }
-
-        /*
-         * Re-enable the transmitter if we disabled it.
-         */
-        if (port->type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
-                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 =
-                container_of(port, struct uart_8250_port, port);
-
-        up->ier &= ~UART_IER_RLSI;
-        up->port.read_status_mask &= ~UART_LSR_DR;
-        serial_port_out(port, UART_IER, up->ier);
-}
-
-static void serial8250_enable_ms(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        /* no MSR capabilities */
-        if (up->bugs & UART_BUG_NOMSR)
-                return;
-
-        up->ier |= UART_IER_MSI;
-        serial_port_out(port, UART_IER, up->ier);
-}
-
-/*
- * serial8250_rx_chars: processes according to the passed in LSR
- * value, and returns the remaining LSR bits not handled
- * by this Rx routine.
- */
-unsigned char
-serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
-{
-        struct uart_port *port = &up->port;
-        struct tty_struct *tty = port->state->port.tty;
-        unsigned char ch;
-        int max_count = 256;
-        char flag;
-
-        do {
-                if (likely(lsr & UART_LSR_DR))
-                        ch = serial_in(up, UART_RX);
-                else
-                        /*
-                         * Intel 82571 has a Serial Over Lan device that will
-                         * set UART_LSR_BI without setting UART_LSR_DR when
-                         * it receives a break. To avoid reading from the
-                         * receive buffer without UART_LSR_DR bit set, we
-                         * just force the read character to be 0
-                         */
-                        ch = 0;
-
-                flag = TTY_NORMAL;
-                port->icount.rx++;
-
-                lsr |= up->lsr_saved_flags;
-                up->lsr_saved_flags = 0;
-
-                if (unlikely(lsr & UART_LSR_BRK_ERROR_BITS)) {
-                        if (lsr & UART_LSR_BI) {
-                                lsr &= ~(UART_LSR_FE | UART_LSR_PE);
-                                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(port))
-                                        goto ignore_char;
-                        } else if (lsr & UART_LSR_PE)
-                                port->icount.parity++;
-                        else if (lsr & UART_LSR_FE)
-                                port->icount.frame++;
-                        if (lsr & UART_LSR_OE)
-                                port->icount.overrun++;
-
-                        /*
-                         * Mask off conditions which should be ignored.
-                         */
-                        lsr &= 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(port, ch))
-                        goto ignore_char;
-
-                uart_insert_char(port, lsr, UART_LSR_OE, ch, flag);
-
-ignore_char:
-                lsr = serial_in(up, UART_LSR);
-        } while ((lsr & (UART_LSR_DR | UART_LSR_BI)) && (max_count-- > 0));
-        spin_unlock(&port->lock);
-        tty_flip_buffer_push(tty);
-        spin_lock(&port->lock);
-        return lsr;
-}
-EXPORT_SYMBOL_GPL(serial8250_rx_chars);
-
-void serial8250_tx_chars(struct uart_8250_port *up)
-{
-        struct uart_port *port = &up->port;
-        struct circ_buf *xmit = &port->state->xmit;
-        int count;
-
-        if (port->x_char) {
-                serial_out(up, UART_TX, port->x_char);
-                port->icount.tx++;
-                port->x_char = 0;
-                return;
-        }
-        if (uart_tx_stopped(port)) {
-                serial8250_stop_tx(port);
-                return;
-        }
-        if (uart_circ_empty(xmit)) {
-                __stop_tx(up);
-                return;
-        }
-
-        count = up->tx_loadsz;
-        do {
-                serial_out(up, 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 (--count > 0);
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(port);
-
-        DEBUG_INTR("THRE...");
-
-        if (uart_circ_empty(xmit))
-                __stop_tx(up);
-}
-EXPORT_SYMBOL_GPL(serial8250_tx_chars);
-
-unsigned int serial8250_modem_status(struct uart_8250_port *up)
-{
-        struct uart_port *port = &up->port;
-        unsigned int status = serial_in(up, UART_MSR);
-
-        status |= up->msr_saved_flags;
-        up->msr_saved_flags = 0;
-        if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI &&
-            port->state != NULL) {
-                if (status & UART_MSR_TERI)
-                        port->icount.rng++;
-                if (status & UART_MSR_DDSR)
-                        port->icount.dsr++;
-                if (status & UART_MSR_DDCD)
-                        uart_handle_dcd_change(port, status & UART_MSR_DCD);
-                if (status & UART_MSR_DCTS)
-                        uart_handle_cts_change(port, status & UART_MSR_CTS);
-
-                wake_up_interruptible(&port->state->port.delta_msr_wait);
-        }
-
-        return status;
-}
-EXPORT_SYMBOL_GPL(serial8250_modem_status);
-
-/*
- * This handles the interrupt from one port.
- */
-int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
-{
-        unsigned char status;
-        unsigned long flags;
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        if (iir & UART_IIR_NO_INT)
-                return 0;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        status = serial_port_in(port, UART_LSR);
-
-        DEBUG_INTR("status = %x...", status);
-
-        if (status & (UART_LSR_DR | UART_LSR_BI))
-                status = serial8250_rx_chars(up, status);
-        serial8250_modem_status(up);
-        if (status & UART_LSR_THRE)
-                serial8250_tx_chars(up);
-
-        spin_unlock_irqrestore(&port->lock, flags);
-        return 1;
-}
-EXPORT_SYMBOL_GPL(serial8250_handle_irq);
-
-static int serial8250_default_handle_irq(struct uart_port *port)
-{
-        unsigned int iir = serial_port_in(port, UART_IIR);
-
-        return serial8250_handle_irq(port, iir);
-}
-
-/*
- * These Exar UARTs have an extra interrupt indicator that could
- * fire for a few unimplemented interrupts.  One of which is a
- * wakeup event when coming out of sleep.  Put this here just
- * to be on the safe side that these interrupts don't go unhandled.
- */
-static int exar_handle_irq(struct uart_port *port)
-{
-        unsigned char int0, int1, int2, int3;
-        unsigned int iir = serial_port_in(port, UART_IIR);
-        int ret;
-
-        ret = serial8250_handle_irq(port, iir);
-
-        if ((port->type == PORT_XR17V35X) ||
-           (port->type == PORT_XR17D15X)) {
-                int0 = serial_port_in(port, 0x80);
-                int1 = serial_port_in(port, 0x81);
-                int2 = serial_port_in(port, 0x82);
-                int3 = serial_port_in(port, 0x83);
-        }
-
-        return ret;
-}
-
-/*
- * 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 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;
-                struct uart_port *port;
-
-                up = list_entry(l, struct uart_8250_port, list);
-                port = &up->port;
-
-                if (port->handle_irq(port)) {
-                        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_ratelimited(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);
-        /* List empty so throw away the hash node */
-        if (i->head == NULL) {
-                hlist_del(&i->node);
-                kfree(i);
-        }
-}
-
-static int serial_link_irq_chain(struct uart_8250_port *up)
-{
-        struct hlist_head *h;
-        struct hlist_node *n;
-        struct irq_info *i;
-        int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0;
-
-        mutex_lock(&hash_mutex);
-
-        h = &irq_lists[up->port.irq % NR_IRQ_HASH];
-
-        hlist_for_each(n, h) {
-                i = hlist_entry(n, struct irq_info, node);
-                if (i->irq == up->port.irq)
-                        break;
-        }
-
-        if (n == NULL) {
-                i = kzalloc(sizeof(struct irq_info), GFP_KERNEL);
-                if (i == NULL) {
-                        mutex_unlock(&hash_mutex);
-                        return -ENOMEM;
-                }
-                spin_lock_init(&i->lock);
-                i->irq = up->port.irq;
-                hlist_add_head(&i->node, h);
-        }
-        mutex_unlock(&hash_mutex);
-
-        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);
-                irq_flags |= up->port.irqflags;
-                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;
-        struct hlist_node *n;
-        struct hlist_head *h;
-
-        mutex_lock(&hash_mutex);
-
-        h = &irq_lists[up->port.irq % NR_IRQ_HASH];
-
-        hlist_for_each(n, h) {
-                i = hlist_entry(n, struct irq_info, node);
-                if (i->irq == up->port.irq)
-                        break;
-        }
-
-        BUG_ON(n == NULL);
-        BUG_ON(i->head == NULL);
-
-        if (list_empty(i->head))
-                free_irq(up->port.irq, i);
-
-        serial_do_unlink(i, up);
-        mutex_unlock(&hash_mutex);
-}
-
-/*
- * 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;
-
-        up->port.handle_irq(&up->port);
-        mod_timer(&up->timer, jiffies + uart_poll_timeout(&up->port));
-}
-
-static void serial8250_backup_timeout(unsigned long data)
-{
-        struct uart_8250_port *up = (struct uart_8250_port *)data;
-        unsigned int iir, ier = 0, lsr;
-        unsigned long flags;
-
-        spin_lock_irqsave(&up->port.lock, flags);
-
-        /*
-         * Must disable interrupts or else we risk racing with the interrupt
-         * based handler.
-         */
-        if (up->port.irq) {
-                ier = serial_in(up, UART_IER);
-                serial_out(up, UART_IER, 0);
-        }
-
-        iir = serial_in(up, UART_IIR);
-
-        /*
-         * This should be a safe test for anyone who doesn't trust the
-         * IIR bits on their UART, but it's specifically designed for
-         * the "Diva" UART used on the management processor on many HP
-         * ia64 and parisc boxes.
-         */
-        lsr = serial_in(up, UART_LSR);
-        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
-        if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&
-            (!uart_circ_empty(&up->port.state->xmit) || up->port.x_char) &&
-            (lsr & UART_LSR_THRE)) {
-                iir &= ~(UART_IIR_ID | UART_IIR_NO_INT);
-                iir |= UART_IIR_THRI;
-        }
-
-        if (!(iir & UART_IIR_NO_INT))
-                serial8250_tx_chars(up);
-
-        if (up->port.irq)
-                serial_out(up, UART_IER, ier);
-
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        /* Standard timer interval plus 0.2s to keep the port running */
-        mod_timer(&up->timer,
-                jiffies + uart_poll_timeout(&up->port) + HZ / 5);
-}
-
-static unsigned int serial8250_tx_empty(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        unsigned long flags;
-        unsigned int lsr;
-
-        spin_lock_irqsave(&port->lock, flags);
-        lsr = serial_port_in(port, UART_LSR);
-        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        return (lsr & BOTH_EMPTY) == BOTH_EMPTY ? TIOCSER_TEMT : 0;
-}
-
-static unsigned int serial8250_get_mctrl(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        unsigned int status;
-        unsigned int ret;
-
-        status = serial8250_modem_status(up);
-
-        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 =
-                container_of(port, 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_port_out(port, UART_MCR, mcr);
-}
-
-static void serial8250_break_ctl(struct uart_port *port, int break_state)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (break_state == -1)
-                up->lcr |= UART_LCR_SBC;
-        else
-                up->lcr &= ~UART_LCR_SBC;
-        serial_port_out(port, UART_LCR, up->lcr);
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-/*
- *      Wait for transmitter & holding register to empty
- */
-static void wait_for_xmitr(struct uart_8250_port *up, int bits)
-{
-        unsigned int status, tmout = 10000;
-
-        /* Wait up to 10ms for the character(s) to be sent. */
-        for (;;) {
-                status = serial_in(up, UART_LSR);
-
-                up->lsr_saved_flags |= status & LSR_SAVE_FLAGS;
-
-                if ((status & bits) == bits)
-                        break;
-                if (--tmout == 0)
-                        break;
-                udelay(1);
-        }
-
-        /* Wait up to 1s for flow control if necessary */
-        if (up->port.flags & UPF_CONS_FLOW) {
-                unsigned int tmout;
-                for (tmout = 1000000; tmout; tmout--) {
-                        unsigned int msr = serial_in(up, UART_MSR);
-                        up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;
-                        if (msr & UART_MSR_CTS)
-                                break;
-                        udelay(1);
-                        touch_nmi_watchdog();
-                }
-        }
-}
-
-#ifdef CONFIG_CONSOLE_POLL
-/*
- * Console polling routines for writing and reading from the uart while
- * in an interrupt or debug context.
- */
-
-static int serial8250_get_poll_char(struct uart_port *port)
-{
-        unsigned char lsr = serial_port_in(port, UART_LSR);
-
-        if (!(lsr & UART_LSR_DR))
-                return NO_POLL_CHAR;
-
-        return serial_port_in(port, UART_RX);
-}
-
-
-static void serial8250_put_poll_char(struct uart_port *port,
-                         unsigned char c)
-{
-        unsigned int ier;
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        /*
-         *      First save the IER then disable the interrupts
-         */
-        ier = serial_port_in(port, UART_IER);
-        if (up->capabilities & UART_CAP_UUE)
-                serial_port_out(port, UART_IER, UART_IER_UUE);
-        else
-                serial_port_out(port, UART_IER, 0);
-
-        wait_for_xmitr(up, BOTH_EMPTY);
-        /*
-         *      Send the character out.
-         *      If a LF, also do CR...
-         */
-        serial_port_out(port, UART_TX, c);
-        if (c == 10) {
-                wait_for_xmitr(up, BOTH_EMPTY);
-                serial_port_out(port, UART_TX, 13);
-        }
-
-        /*
-         *      Finally, wait for transmitter to become empty
-         *      and restore the IER
-         */
-        wait_for_xmitr(up, BOTH_EMPTY);
-        serial_port_out(port, UART_IER, ier);
-}
-
-#endif /* CONFIG_CONSOLE_POLL */
-
-static int serial8250_startup(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        unsigned long flags;
-        unsigned char lsr, iir;
-        int retval;
-
-        if (port->type == PORT_8250_CIR)
-                return -ENODEV;
-
-        port->fifosize = uart_config[up->port.type].fifo_size;
-        up->tx_loadsz = uart_config[up->port.type].tx_loadsz;
-        up->capabilities = uart_config[up->port.type].flags;
-        up->mcr = 0;
-
-        if (port->iotype != up->cur_iotype)
-                set_io_from_upio(port);
-
-        if (port->type == PORT_16C950) {
-                /* Wake up and initialize UART */
-                up->acr = 0;
-                serial_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B);
-                serial_port_out(port, UART_EFR, UART_EFR_ECB);
-                serial_port_out(port, UART_IER, 0);
-                serial_port_out(port, UART_LCR, 0);
-                serial_icr_write(up, UART_CSR, 0); /* Reset the UART */
-                serial_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B);
-                serial_port_out(port, UART_EFR, UART_EFR_ECB);
-                serial_port_out(port, 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 reenabled in set_termios())
-         */
-        serial8250_clear_fifos(up);
-
-        /*
-         * Clear the interrupt registers.
-         */
-        serial_port_in(port, UART_LSR);
-        serial_port_in(port, UART_RX);
-        serial_port_in(port, UART_IIR);
-        serial_port_in(port, 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 (!(port->flags & UPF_BUGGY_UART) &&
-            (serial_port_in(port, UART_LSR) == 0xff)) {
-                printk_ratelimited(KERN_INFO "ttyS%d: LSR safety check engaged!\n",
-                                   serial_index(port));
-                return -ENODEV;
-        }
-
-        /*
-         * For a XR16C850, we need to set the trigger levels
-         */
-        if (port->type == PORT_16850) {
-                unsigned char fctr;
-
-                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
-
-                fctr = serial_in(up, UART_FCTR) & ~(UART_FCTR_RX|UART_FCTR_TX);
-                serial_port_out(port, UART_FCTR,
-                                fctr | UART_FCTR_TRGD | UART_FCTR_RX);
-                serial_port_out(port, UART_TRG, UART_TRG_96);
-                serial_port_out(port, UART_FCTR,
-                                fctr | UART_FCTR_TRGD | UART_FCTR_TX);
-                serial_port_out(port, UART_TRG, UART_TRG_96);
-
-                serial_port_out(port, UART_LCR, 0);
-        }
-
-        if (port->irq) {
-                unsigned char iir1;
-                /*
-                 * Test for UARTs that do not reassert THRE when the
-                 * transmitter is idle and the interrupt has already
-                 * been cleared.  Real 16550s should always reassert
-                 * this interrupt whenever the transmitter is idle and
-                 * the interrupt is enabled.  Delays are necessary to
-                 * allow register changes to become visible.
-                 */
-                spin_lock_irqsave(&port->lock, flags);
-                if (up->port.irqflags & IRQF_SHARED)
-                        disable_irq_nosync(port->irq);
-
-                wait_for_xmitr(up, UART_LSR_THRE);
-                serial_port_out_sync(port, UART_IER, UART_IER_THRI);
-                udelay(1); /* allow THRE to set */
-                iir1 = serial_port_in(port, UART_IIR);
-                serial_port_out(port, UART_IER, 0);
-                serial_port_out_sync(port, UART_IER, UART_IER_THRI);
-                udelay(1); /* allow a working UART time to re-assert THRE */
-                iir = serial_port_in(port, UART_IIR);
-                serial_port_out(port, UART_IER, 0);
-
-                if (port->irqflags & IRQF_SHARED)
-                        enable_irq(port->irq);
-                spin_unlock_irqrestore(&port->lock, flags);
-
-                /*
-                 * If the interrupt is not reasserted, or we otherwise
-                 * don't trust the iir, setup a timer to kick the UART
-                 * on a regular basis.
-                 */
-                if ((!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) ||
-                    up->port.flags & UPF_BUG_THRE) {
-                        up->bugs |= UART_BUG_THRE;
-                        pr_debug("ttyS%d - using backup timer\n",
-                                 serial_index(port));
-                }
-        }
-
-        /*
-         * The above check will only give an accurate result the first time
-         * the port is opened so this value needs to be preserved.
-         */
-        if (up->bugs & UART_BUG_THRE) {
-                up->timer.function = serial8250_backup_timeout;
-                up->timer.data = (unsigned long)up;
-                mod_timer(&up->timer, jiffies +
-                        uart_poll_timeout(port) + HZ / 5);
-        }
-
-        /*
-         * 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 (!port->irq) {
-                up->timer.data = (unsigned long)up;
-                mod_timer(&up->timer, jiffies + uart_poll_timeout(port));
-        } else {
-                retval = serial_link_irq_chain(up);
-                if (retval)
-                        return retval;
-        }
-
-        /*
-         * Now, initialize the UART
-         */
-        serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (up->port.flags & UPF_FOURPORT) {
-                if (!up->port.irq)
-                        up->port.mctrl |= TIOCM_OUT1;
-        } else
-                /*
-                 * Most PC uarts need OUT2 raised to enable interrupts.
-                 */
-                if (port->irq)
-                        up->port.mctrl |= TIOCM_OUT2;
-
-        serial8250_set_mctrl(port, port->mctrl);
-
-        /* Serial over Lan (SoL) hack:
-           Intel 8257x Gigabit ethernet chips have a
-           16550 emulation, to be used for Serial Over Lan.
-           Those chips take a longer time than a normal
-           serial device to signalize that a transmission
-           data was queued. Due to that, the above test generally
-           fails. One solution would be to delay the reading of
-           iir. However, this is not reliable, since the timeout
-           is variable. So, let's just don't test if we receive
-           TX irq. This way, we'll never enable UART_BUG_TXEN.
-         */
-        if (skip_txen_test || up->port.flags & UPF_NO_TXEN_TEST)
-                goto dont_test_tx_en;
-
-        /*
-         * Do a quick test to see if we receive an
-         * interrupt when we enable the TX irq.
-         */
-        serial_port_out(port, UART_IER, UART_IER_THRI);
-        lsr = serial_port_in(port, UART_LSR);
-        iir = serial_port_in(port, UART_IIR);
-        serial_port_out(port, UART_IER, 0);
-
-        if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) {
-                if (!(up->bugs & UART_BUG_TXEN)) {
-                        up->bugs |= UART_BUG_TXEN;
-                        pr_debug("ttyS%d - enabling bad tx status workarounds\n",
-                                 serial_index(port));
-                }
-        } else {
-                up->bugs &= ~UART_BUG_TXEN;
-        }
-
-dont_test_tx_en:
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        /*
-         * Clear the interrupt registers again for luck, and clear the
-         * saved flags to avoid getting false values from polling
-         * routines or the previous session.
-         */
-        serial_port_in(port, UART_LSR);
-        serial_port_in(port, UART_RX);
-        serial_port_in(port, UART_IIR);
-        serial_port_in(port, UART_MSR);
-        up->lsr_saved_flags = 0;
-        up->msr_saved_flags = 0;
-
-        /*
-         * 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_port_out(port, UART_IER, up->ier);
-
-        if (port->flags & UPF_FOURPORT) {
-                unsigned int icp;
-                /*
-                 * Enable interrupts on the AST Fourport board
-                 */
-                icp = (port->iobase & 0xfe0) | 0x01f;
-                outb_p(0x80, icp);
-                inb_p(icp);
-        }
-
-        return 0;
-}
-
-static void serial8250_shutdown(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        unsigned long flags;
-
-        /*
-         * Disable interrupts from this port
-         */
-        up->ier = 0;
-        serial_port_out(port, UART_IER, 0);
-
-        spin_lock_irqsave(&port->lock, flags);
-        if (port->flags & UPF_FOURPORT) {
-                /* reset interrupts on the AST Fourport board */
-                inb((port->iobase & 0xfe0) | 0x1f);
-                port->mctrl |= TIOCM_OUT1;
-        } else
-                port->mctrl &= ~TIOCM_OUT2;
-
-        serial8250_set_mctrl(port, port->mctrl);
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        /*
-         * Disable break condition and FIFOs
-         */
-        serial_port_out(port, UART_LCR,
-                        serial_port_in(port, 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.
-         */
-        serial_port_in(port, UART_RX);
-
-        del_timer_sync(&up->timer);
-        up->timer.function = serial8250_timeout;
-        if (port->irq)
-                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;
-}
-
-void
-serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
-                          struct ktermios *old)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        unsigned char cval, fcr = 0;
-        unsigned long flags;
-        unsigned int baud, quot;
-        int fifo_bug = 0;
-
-        switch (termios->c_cflag & CSIZE) {
-        case CS5:
-                cval = UART_LCR_WLEN5;
-                break;
-        case CS6:
-                cval = UART_LCR_WLEN6;
-                break;
-        case CS7:
-                cval = UART_LCR_WLEN7;
-                break;
-        default:
-        case CS8:
-                cval = UART_LCR_WLEN8;
-                break;
-        }
-
-        if (termios->c_cflag & CSTOPB)
-                cval |= UART_LCR_STOP;
-        if (termios->c_cflag & PARENB) {
-                cval |= UART_LCR_PARITY;
-                if (up->bugs & UART_BUG_PARITY)
-                        fifo_bug = 1;
-        }
-        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,
-                                  port->uartclk / 16 / 0xffff,
-                                  port->uartclk / 16);
-        quot = serial8250_get_divisor(port, baud);
-
-        /*
-         * Oxford Semi 952 rev B workaround
-         */
-        if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
-                quot++;
-
-        if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) {
-                fcr = uart_config[port->type].fcr;
-                if (baud < 2400 || fifo_bug) {
-                        fcr &= ~UART_FCR_TRIGGER_MASK;
-                        fcr |= UART_FCR_TRIGGER_1;
-                }
-        }
-
-        /*
-         * 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 && 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(&port->lock, flags);
-
-        /*
-         * Update the per-port timeout.
-         */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        port->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
-        if (termios->c_iflag & INPCK)
-                port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= UART_LSR_BI;
-
-        /*
-         * Characteres to ignore
-         */
-        port->ignore_status_mask = 0;
-        if (termios->c_iflag & IGNPAR)
-                port->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
-        if (termios->c_iflag & IGNBRK) {
-                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)
-                        port->ignore_status_mask |= UART_LSR_OE;
-        }
-
-        /*
-         * ignore all characters if CREAD is not set
-         */
-        if ((termios->c_cflag & CREAD) == 0)
-                port->ignore_status_mask |= UART_LSR_DR;
-
-        /*
-         * CTS flow control flag and modem status interrupts
-         */
-        up->ier &= ~UART_IER_MSI;
-        if (!(up->bugs & UART_BUG_NOMSR) &&
-                        UART_ENABLE_MS(&up->port, termios->c_cflag))
-                up->ier |= UART_IER_MSI;
-        if (up->capabilities & UART_CAP_UUE)
-                up->ier |= UART_IER_UUE;
-        if (up->capabilities & UART_CAP_RTOIE)
-                up->ier |= UART_IER_RTOIE;
-
-        serial_port_out(port, 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_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B);
-                if (port->flags & UPF_EXAR_EFR)
-                        serial_port_out(port, UART_XR_EFR, efr);
-                else
-                        serial_port_out(port, UART_EFR, efr);
-        }
-
-        /* Workaround to enable 115200 baud on OMAP1510 internal ports */
-        if (is_omap1510_8250(up)) {
-                if (baud == 115200) {
-                        quot = 1;
-                        serial_port_out(port, UART_OMAP_OSC_12M_SEL, 1);
-                } else
-                        serial_port_out(port, UART_OMAP_OSC_12M_SEL, 0);
-        }
-
-        /*
-         * For NatSemi, switch to bank 2 not bank 1, to avoid resetting EXCR2,
-         * otherwise just set DLAB
-         */
-        if (up->capabilities & UART_NATSEMI)
-                serial_port_out(port, UART_LCR, 0xe0);
-        else
-                serial_port_out(port, UART_LCR, cval | UART_LCR_DLAB);
-
-        serial_dl_write(up, quot);
-
-        /*
-         * 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 (port->type == PORT_16750)
-                serial_port_out(port, UART_FCR, fcr);
-
-        serial_port_out(port, UART_LCR, cval);          /* reset DLAB */
-        up->lcr = cval;                                 /* Save LCR */
-        if (port->type != PORT_16750) {
-                /* emulated UARTs (Lucent Venus 167x) need two steps */
-                if (fcr & UART_FCR_ENABLE_FIFO)
-                        serial_port_out(port, UART_FCR, UART_FCR_ENABLE_FIFO);
-                serial_port_out(port, UART_FCR, fcr);           /* set fcr */
-        }
-        serial8250_set_mctrl(port, port->mctrl);
-        spin_unlock_irqrestore(&port->lock, flags);
-        /* Don't rewrite B0 */
-        if (tty_termios_baud_rate(termios))
-                tty_termios_encode_baud_rate(termios, baud, baud);
-}
-EXPORT_SYMBOL(serial8250_do_set_termios);
-
-static void
-serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
-                       struct ktermios *old)
-{
-        if (port->set_termios)
-                port->set_termios(port, termios, old);
-        else
-                serial8250_do_set_termios(port, termios, old);
-}
-
-static void
-serial8250_set_ldisc(struct uart_port *port, int new)
-{
-        if (new == N_PPS) {
-                port->flags |= UPF_HARDPPS_CD;
-                serial8250_enable_ms(port);
-        } else
-                port->flags &= ~UPF_HARDPPS_CD;
-}
-
-
-void serial8250_do_pm(struct uart_port *port, unsigned int state,
-                      unsigned int oldstate)
-{
-        struct uart_8250_port *p =
-                container_of(port, struct uart_8250_port, port);
-
-        serial8250_set_sleep(p, state != 0);
-}
-EXPORT_SYMBOL(serial8250_do_pm);
-
-static void
-serial8250_pm(struct uart_port *port, unsigned int state,
-              unsigned int oldstate)
-{
-        if (port->pm)
-                port->pm(port, state, oldstate);
-        else
-                serial8250_do_pm(port, state, oldstate);
-}
-
-static unsigned int serial8250_port_size(struct uart_8250_port *pt)
-{
-        if (pt->port.iotype == UPIO_AU)
-                return 0x1000;
-        if (is_omap1_8250(pt))
-                return 0x16 << pt->port.regshift;
-
-        return 8 << pt->port.regshift;
-}
-
-/*
- * Resource handling.
- */
-static int serial8250_request_std_resource(struct uart_8250_port *up)
-{
-        unsigned int size = serial8250_port_size(up);
-        struct uart_port *port = &up->port;
-        int ret = 0;
-
-        switch (port->iotype) {
-        case UPIO_AU:
-        case UPIO_TSI:
-        case UPIO_MEM32:
-        case UPIO_MEM:
-                if (!port->mapbase)
-                        break;
-
-                if (!request_mem_region(port->mapbase, size, "serial")) {
-                        ret = -EBUSY;
-                        break;
-                }
-
-                if (port->flags & UPF_IOREMAP) {
-                        port->membase = ioremap_nocache(port->mapbase, size);
-                        if (!port->membase) {
-                                release_mem_region(port->mapbase, size);
-                                ret = -ENOMEM;
-                        }
-                }
-                break;
-
-        case UPIO_HUB6:
-        case UPIO_PORT:
-                if (!request_region(port->iobase, size, "serial"))
-                        ret = -EBUSY;
-                break;
-        }
-        return ret;
-}
-
-static void serial8250_release_std_resource(struct uart_8250_port *up)
-{
-        unsigned int size = serial8250_port_size(up);
-        struct uart_port *port = &up->port;
-
-        switch (port->iotype) {
-        case UPIO_AU:
-        case UPIO_TSI:
-        case UPIO_MEM32:
-        case UPIO_MEM:
-                if (!port->mapbase)
-                        break;
-
-                if (port->flags & UPF_IOREMAP) {
-                        iounmap(port->membase);
-                        port->membase = NULL;
-                }
-
-                release_mem_region(port->mapbase, size);
-                break;
-
-        case UPIO_HUB6:
-        case UPIO_PORT:
-                release_region(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;
-        struct uart_port *port = &up->port;
-        int ret = -EINVAL;
-
-        switch (port->iotype) {
-        case UPIO_HUB6:
-        case UPIO_PORT:
-                start += port->iobase;
-                if (request_region(start, size, "serial-rsa"))
-                        ret = 0;
-                else
-                        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;
-        struct uart_port *port = &up->port;
-
-        switch (port->iotype) {
-        case UPIO_HUB6:
-        case UPIO_PORT:
-                release_region(port->iobase + offset, size);
-                break;
-        }
-}
-
-static void serial8250_release_port(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        serial8250_release_std_resource(up);
-        if (port->type == PORT_RSA)
-                serial8250_release_rsa_resource(up);
-}
-
-static int serial8250_request_port(struct uart_port *port)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-        int ret;
-
-        if (port->type == PORT_8250_CIR)
-                return -ENODEV;
-
-        ret = serial8250_request_std_resource(up);
-        if (ret == 0 && 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 =
-                container_of(port, struct uart_8250_port, port);
-        int probeflags = PROBE_ANY;
-        int ret;
-
-        if (port->type == PORT_8250_CIR)
-                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 (port->iotype != up->cur_iotype)
-                set_io_from_upio(port);
-
-        if (flags & UART_CONFIG_TYPE)
-                autoconfig(up, probeflags);
-
-        /* if access method is AU, it is a 16550 with a quirk */
-        if (port->type == PORT_16550A && port->iotype == UPIO_AU)
-                up->bugs |= UART_BUG_NOMSR;
-
-        if (port->type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
-                autoconfig_irq(up);
-
-        if (port->type != PORT_RSA && probeflags & PROBE_RSA)
-                serial8250_release_rsa_resource(up);
-        if (port->type == PORT_UNKNOWN)
-                serial8250_release_std_resource(up);
-
-        /* Fixme: probably not the best place for this */
-        if ((port->type == PORT_XR17V35X) ||
-           (port->type == PORT_XR17D15X))
-                port->handle_irq = exar_handle_irq;
-}
-
-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,
-        .set_ldisc      = serial8250_set_ldisc,
-        .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,
-#ifdef CONFIG_CONSOLE_POLL
-        .poll_get_char = serial8250_get_poll_char,
-        .poll_put_char = serial8250_put_poll_char,
-#endif
-};
-
-static struct uart_8250_port serial8250_ports[UART_NR];
-
-static void (*serial8250_isa_config)(int port, struct uart_port *up,
-        unsigned short *capabilities);
-
-void serial8250_set_isa_configurator(
-        void (*v)(int port, struct uart_port *up, unsigned short *capabilities))
-{
-        serial8250_isa_config = v;
-}
-EXPORT_SYMBOL(serial8250_set_isa_configurator);
-
-static void __init serial8250_isa_init_ports(void)
-{
-        struct uart_8250_port *up;
-        static int first = 1;
-        int i, irqflag = 0;
-
-        if (!first)
-                return;
-        first = 0;
-
-        if (nr_uarts > UART_NR)
-                nr_uarts = UART_NR;
-
-        for (i = 0; i < nr_uarts; i++) {
-                struct uart_8250_port *up = &serial8250_ports[i];
-                struct uart_port *port = &up->port;
-
-                port->line = i;
-                spin_lock_init(&port->lock);
-
-                init_timer(&up->timer);
-                up->timer.function = serial8250_timeout;
-                up->cur_iotype = 0xFF;
-
-                /*
-                 * ALPHA_KLUDGE_MCR needs to be killed.
-                 */
-                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
-                up->mcr_force = ALPHA_KLUDGE_MCR;
-
-                port->ops = &serial8250_pops;
-        }
-
-        if (share_irqs)
-                irqflag = IRQF_SHARED;
-
-        for (i = 0, up = serial8250_ports;
-             i < ARRAY_SIZE(old_serial_port) && i < nr_uarts;
-             i++, up++) {
-                struct uart_port *port = &up->port;
-
-                port->iobase   = old_serial_port[i].port;
-                port->irq      = irq_canonicalize(old_serial_port[i].irq);
-                port->irqflags = old_serial_port[i].irqflags;
-                port->uartclk  = old_serial_port[i].baud_base * 16;
-                port->flags    = old_serial_port[i].flags;
-                port->hub6     = old_serial_port[i].hub6;
-                port->membase  = old_serial_port[i].iomem_base;
-                port->iotype   = old_serial_port[i].io_type;
-                port->regshift = old_serial_port[i].iomem_reg_shift;
-                set_io_from_upio(port);
-                port->irqflags |= irqflag;
-                if (serial8250_isa_config != NULL)
-                        serial8250_isa_config(i, &up->port, &up->capabilities);
-
-        }
-}
-
-static void
-serial8250_init_fixed_type_port(struct uart_8250_port *up, unsigned int type)
-{
-        up->port.type = type;
-        up->port.fifosize = uart_config[type].fifo_size;
-        up->capabilities = uart_config[type].flags;
-        up->tx_loadsz = uart_config[type].tx_loadsz;
-}
-
-static void __init
-serial8250_register_ports(struct uart_driver *drv, struct device *dev)
-{
-        int i;
-
-        for (i = 0; i < nr_uarts; i++) {
-                struct uart_8250_port *up = &serial8250_ports[i];
-
-                if (up->port.dev)
-                        continue;
-
-                up->port.dev = dev;
-
-                if (up->port.flags & UPF_FIXED_TYPE)
-                        serial8250_init_fixed_type_port(up, up->port.type);
-
-                uart_add_one_port(drv, &up->port);
-        }
-}
-
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-
-static void serial8250_console_putchar(struct uart_port *port, int ch)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        wait_for_xmitr(up, UART_LSR_THRE);
-        serial_port_out(port, UART_TX, ch);
-}
-
-/*
- *      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];
-        struct uart_port *port = &up->port;
-        unsigned long flags;
-        unsigned int ier;
-        int locked = 1;
-
-        touch_nmi_watchdog();
-
-        local_irq_save(flags);
-        if (port->sysrq) {
-                /* serial8250_handle_irq() already took the lock */
-                locked = 0;
-        } else if (oops_in_progress) {
-                locked = spin_trylock(&port->lock);
-        } else
-                spin_lock(&port->lock);
-
-        /*
-         *      First save the IER then disable the interrupts
-         */
-        ier = serial_port_in(port, UART_IER);
-
-        if (up->capabilities & UART_CAP_UUE)
-                serial_port_out(port, UART_IER, UART_IER_UUE);
-        else
-                serial_port_out(port, UART_IER, 0);
-
-        uart_console_write(port, s, count, serial8250_console_putchar);
-
-        /*
-         *      Finally, wait for transmitter to become empty
-         *      and restore the IER
-         */
-        wait_for_xmitr(up, BOTH_EMPTY);
-        serial_port_out(port, UART_IER, ier);
-
-        /*
-         *      The receive handling will happen properly because the
-         *      receive ready bit will still be set; it is not cleared
-         *      on read.  However, modem control will not, we must
-         *      call it if we have saved something in the saved flags
-         *      while processing with interrupts off.
-         */
-        if (up->msr_saved_flags)
-                serial8250_modem_status(up);
-
-        if (locked)
-                spin_unlock(&port->lock);
-        local_irq_restore(flags);
-}
-
-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 >= nr_uarts)
-                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 int serial8250_console_early_setup(void)
-{
-        return serial8250_find_port_for_earlycon();
-}
-
-static struct console serial8250_console = {
-        .name           = "ttyS",
-        .write          = serial8250_console_write,
-        .device         = uart_console_device,
-        .setup          = serial8250_console_setup,
-        .early_setup    = serial8250_console_early_setup,
-        .flags          = CON_PRINTBUFFER | CON_ANYTIME,
-        .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);
-
-int serial8250_find_port(struct uart_port *p)
-{
-        int line;
-        struct uart_port *port;
-
-        for (line = 0; line < nr_uarts; line++) {
-                port = &serial8250_ports[line].port;
-                if (uart_match_port(p, port))
-                        return line;
-        }
-        return -ENODEV;
-}
-
-#define SERIAL8250_CONSOLE      &serial8250_console
-#else
-#define SERIAL8250_CONSOLE      NULL
-#endif
-
-static struct uart_driver serial8250_reg = {
-        .owner                  = THIS_MODULE,
-        .driver_name            = "serial",
-        .dev_name               = "ttyS",
-        .major                  = TTY_MAJOR,
-        .minor                  = 64,
-        .cons                   = SERIAL8250_CONSOLE,
-};
-
-/*
- * early_serial_setup - early registration for 8250 ports
- *
- * Setup an 8250 port structure prior to console initialisation.  Use
- * after console initialisation will cause undefined behaviour.
- */
-int __init early_serial_setup(struct uart_port *port)
-{
-        struct uart_port *p;
-
-        if (port->line >= ARRAY_SIZE(serial8250_ports))
-                return -ENODEV;
-
-        serial8250_isa_init_ports();
-        p = &serial8250_ports[port->line].port;
-        p->iobase       = port->iobase;
-        p->membase      = port->membase;
-        p->irq          = port->irq;
-        p->irqflags     = port->irqflags;
-        p->uartclk      = port->uartclk;
-        p->fifosize     = port->fifosize;
-        p->regshift     = port->regshift;
-        p->iotype       = port->iotype;
-        p->flags        = port->flags;
-        p->mapbase      = port->mapbase;
-        p->private_data = port->private_data;
-        p->type         = port->type;
-        p->line         = port->line;
-
-        set_io_from_upio(p);
-        if (port->serial_in)
-                p->serial_in = port->serial_in;
-        if (port->serial_out)
-                p->serial_out = port->serial_out;
-        if (port->handle_irq)
-                p->handle_irq = port->handle_irq;
-        else
-                p->handle_irq = serial8250_default_handle_irq;
-
-        return 0;
-}
-
-/**
- *      serial8250_suspend_port - suspend one serial port
- *      @line:  serial line number
- *
- *      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
- *
- *      Resume one serial port.
- */
-void serial8250_resume_port(int line)
-{
-        struct uart_8250_port *up = &serial8250_ports[line];
-        struct uart_port *port = &up->port;
-
-        if (up->capabilities & UART_NATSEMI) {
-                /* Ensure it's still in high speed mode */
-                serial_port_out(port, UART_LCR, 0xE0);
-
-                ns16550a_goto_highspeed(up);
-
-                serial_port_out(port, UART_LCR, 0);
-                port->uartclk = 921600*16;
-        }
-        uart_resume_port(&serial8250_reg, 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 serial8250_probe(struct platform_device *dev)
-{
-        struct plat_serial8250_port *p = dev->dev.platform_data;
-        struct uart_8250_port uart;
-        int ret, i, irqflag = 0;
-
-        memset(&uart, 0, sizeof(uart));
-
-        if (share_irqs)
-                irqflag = IRQF_SHARED;
-
-        for (i = 0; p && p->flags != 0; p++, i++) {
-                uart.port.iobase        = p->iobase;
-                uart.port.membase       = p->membase;
-                uart.port.irq           = p->irq;
-                uart.port.irqflags      = p->irqflags;
-                uart.port.uartclk       = p->uartclk;
-                uart.port.regshift      = p->regshift;
-                uart.port.iotype        = p->iotype;
-                uart.port.flags         = p->flags;
-                uart.port.mapbase       = p->mapbase;
-                uart.port.hub6          = p->hub6;
-                uart.port.private_data  = p->private_data;
-                uart.port.type          = p->type;
-                uart.port.serial_in     = p->serial_in;
-                uart.port.serial_out    = p->serial_out;
-                uart.port.handle_irq    = p->handle_irq;
-                uart.port.handle_break  = p->handle_break;
-                uart.port.set_termios   = p->set_termios;
-                uart.port.pm            = p->pm;
-                uart.port.dev           = &dev->dev;
-                uart.port.irqflags      |= irqflag;
-                ret = serial8250_register_8250_port(&uart);
-                if (ret < 0) {
-                        dev_err(&dev->dev, "unable to register port at index %d "
-                                "(IO%lx MEM%llx IRQ%d): %d\n", i,
-                                p->iobase, (unsigned long long)p->mapbase,
-                                p->irq, ret);
-                }
-        }
-        return 0;
-}
-
-/*
- * Remove serial ports registered against a platform device.
- */
-static int serial8250_remove(struct platform_device *dev)
-{
-        int i;
-
-        for (i = 0; i < nr_uarts; i++) {
-                struct uart_8250_port *up = &serial8250_ports[i];
-
-                if (up->port.dev == &dev->dev)
-                        serial8250_unregister_port(i);
-        }
-        return 0;
-}
-
-static int serial8250_suspend(struct platform_device *dev, pm_message_t state)
-{
-        int i;
-
-        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->dev)
-                        uart_suspend_port(&serial8250_reg, &up->port);
-        }
-
-        return 0;
-}
-
-static int serial8250_resume(struct platform_device *dev)
-{
-        int i;
-
-        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->dev)
-                        serial8250_resume_port(i);
-        }
-
-        return 0;
-}
-
-static struct platform_driver serial8250_isa_driver = {
-        .probe          = serial8250_probe,
-        .remove         = serial8250_remove,
-        .suspend        = serial8250_suspend,
-        .resume         = serial8250_resume,
-        .driver         = {
-                .name   = "serial8250",
-                .owner  = THIS_MODULE,
-        },
-};
-
-/*
- * 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_8250_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 DEFINE_MUTEX(serial_mutex);
-
-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 < nr_uarts; 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 < nr_uarts; 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 < nr_uarts; i++)
-                if (serial8250_ports[i].port.type == PORT_UNKNOWN)
-                        return &serial8250_ports[i];
-
-        return NULL;
-}
-
-/**
- *      serial8250_register_8250_port - register a serial port
- *      @up: 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_8250_port(struct uart_8250_port *up)
-{
-        struct uart_8250_port *uart;
-        int ret = -ENOSPC;
-
-        if (up->port.uartclk == 0)
-                return -EINVAL;
-
-        mutex_lock(&serial_mutex);
-
-        uart = serial8250_find_match_or_unused(&up->port);
-        if (uart && uart->port.type != PORT_8250_CIR) {
-                if (uart->port.dev)
-                        uart_remove_one_port(&serial8250_reg, &uart->port);
-
-                uart->port.iobase       = up->port.iobase;
-                uart->port.membase      = up->port.membase;
-                uart->port.irq          = up->port.irq;
-                uart->port.irqflags     = up->port.irqflags;
-                uart->port.uartclk      = up->port.uartclk;
-                uart->port.fifosize     = up->port.fifosize;
-                uart->port.regshift     = up->port.regshift;
-                uart->port.iotype       = up->port.iotype;
-                uart->port.flags        = up->port.flags | UPF_BOOT_AUTOCONF;
-                uart->bugs              = up->bugs;
-                uart->port.mapbase      = up->port.mapbase;
-                uart->port.private_data = up->port.private_data;
-                if (up->port.dev)
-                        uart->port.dev = up->port.dev;
-
-                if (up->port.flags & UPF_FIXED_TYPE)
-                        serial8250_init_fixed_type_port(uart, up->port.type);
-
-                set_io_from_upio(&uart->port);
-                /* Possibly override default I/O functions.  */
-                if (up->port.serial_in)
-                        uart->port.serial_in = up->port.serial_in;
-                if (up->port.serial_out)
-                        uart->port.serial_out = up->port.serial_out;
-                if (up->port.handle_irq)
-                        uart->port.handle_irq = up->port.handle_irq;
-                /*  Possibly override set_termios call */
-                if (up->port.set_termios)
-                        uart->port.set_termios = up->port.set_termios;
-                if (up->port.pm)
-                        uart->port.pm = up->port.pm;
-                if (up->port.handle_break)
-                        uart->port.handle_break = up->port.handle_break;
-                if (up->dl_read)
-                        uart->dl_read = up->dl_read;
-                if (up->dl_write)
-                        uart->dl_write = up->dl_write;
-
-                if (serial8250_isa_config != NULL)
-                        serial8250_isa_config(0, &uart->port,
-                                        &uart->capabilities);
-
-                ret = uart_add_one_port(&serial8250_reg, &uart->port);
-                if (ret == 0)
-                        ret = uart->port.line;
-        }
-        mutex_unlock(&serial_mutex);
-
-        return ret;
-}
-EXPORT_SYMBOL(serial8250_register_8250_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];
-
-        mutex_lock(&serial_mutex);
-        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->capabilities = uart_config[uart->port.type].flags;
-                uart_add_one_port(&serial8250_reg, &uart->port);
-        } else {
-                uart->port.dev = NULL;
-        }
-        mutex_unlock(&serial_mutex);
-}
-EXPORT_SYMBOL(serial8250_unregister_port);
-
-static int __init serial8250_init(void)
-{
-        int ret;
-
-        serial8250_isa_init_ports();
-
-        printk(KERN_INFO "Serial: 8250/16550 driver, "
-                "%d ports, IRQ sharing %sabled\n", nr_uarts,
-                share_irqs ? "en" : "dis");
-
-#ifdef CONFIG_SPARC
-        ret = sunserial_register_minors(&serial8250_reg, UART_NR);
-#else
-        serial8250_reg.nr = UART_NR;
-        ret = uart_register_driver(&serial8250_reg);
-#endif
-        if (ret)
-                goto out;
-
-        ret = serial8250_pnp_init();
-        if (ret)
-                goto unreg_uart_drv;
-
-        serial8250_isa_devs = platform_device_alloc("serial8250",
-                                                    PLAT8250_DEV_LEGACY);
-        if (!serial8250_isa_devs) {
-                ret = -ENOMEM;
-                goto unreg_pnp;
-        }
-
-        ret = platform_device_add(serial8250_isa_devs);
-        if (ret)
-                goto put_dev;
-
-        serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev);
-
-        ret = platform_driver_register(&serial8250_isa_driver);
-        if (ret == 0)
-                goto out;
-
-        platform_device_del(serial8250_isa_devs);
-put_dev:
-        platform_device_put(serial8250_isa_devs);
-unreg_pnp:
-        serial8250_pnp_exit();
-unreg_uart_drv:
-#ifdef CONFIG_SPARC
-        sunserial_unregister_minors(&serial8250_reg, UART_NR);
-#else
-        uart_unregister_driver(&serial8250_reg);
-#endif
-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;
-
-        platform_driver_unregister(&serial8250_isa_driver);
-        platform_device_unregister(isa_dev);
-
-        serial8250_pnp_exit();
-
-#ifdef CONFIG_SPARC
-        sunserial_unregister_minors(&serial8250_reg, UART_NR);
-#else
-        uart_unregister_driver(&serial8250_reg);
-#endif
-}
-
-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");
-
-module_param(share_irqs, uint, 0644);
-MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
-        " (unsafe)");
-
-module_param(nr_uarts, uint, 0644);
-MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
-
-module_param(skip_txen_test, uint, 0644);
-MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
-
-#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);
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
deleted file mode 100644
index 3b4ea84898c..00000000000
--- a/drivers/tty/serial/8250/8250.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  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.
- */
-
-#include <linux/serial_8250.h>
-
-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;
-        unsigned long irqflags;
-};
-
-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) */
-#define UART_CAP_RTOIE  (1 << 13)       /* UART needs IER bit 4 set (Xscale, Tegra) */
-
-#define UART_BUG_QUOT   (1 << 0)        /* UART has buggy quot LSB */
-#define UART_BUG_TXEN   (1 << 1)        /* UART has buggy TX IIR status */
-#define UART_BUG_NOMSR  (1 << 2)        /* UART has buggy MSR status bits (Au1x00) */
-#define UART_BUG_THRE   (1 << 3)        /* UART has buggy THRE reassertion */
-#define UART_BUG_PARITY (1 << 4)        /* UART mishandles parity if FIFO enabled */
-
-#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
-
-static inline int serial_in(struct uart_8250_port *up, int offset)
-{
-        return up->port.serial_in(&up->port, offset);
-}
-
-static inline void serial_out(struct uart_8250_port *up, int offset, int value)
-{
-        up->port.serial_out(&up->port, offset, value);
-}
-
-void serial8250_clear_and_reinit_fifos(struct uart_8250_port *p);
-
-static inline int serial_dl_read(struct uart_8250_port *up)
-{
-        return up->dl_read(up);
-}
-
-static inline void serial_dl_write(struct uart_8250_port *up, int value)
-{
-        up->dl_write(up, value);
-}
-
-#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
-
-#ifdef CONFIG_SERIAL_8250_PNP
-int serial8250_pnp_init(void);
-void serial8250_pnp_exit(void);
-#else
-static inline int serial8250_pnp_init(void) { return 0; }
-static inline void serial8250_pnp_exit(void) { }
-#endif
-
-#ifdef CONFIG_ARCH_OMAP1
-static inline int is_omap1_8250(struct uart_8250_port *pt)
-{
-        int res;
-
-        switch (pt->port.mapbase) {
-        case OMAP1_UART1_BASE:
-        case OMAP1_UART2_BASE:
-        case OMAP1_UART3_BASE:
-                res = 1;
-                break;
-        default:
-                res = 0;
-                break;
-        }
-
-        return res;
-}
-
-static inline int is_omap1510_8250(struct uart_8250_port *pt)
-{
-        if (!cpu_is_omap1510())
-                return 0;
-
-        return is_omap1_8250(pt);
-}
-#else
-static inline int is_omap1_8250(struct uart_8250_port *pt)
-{
-        return 0;
-}
-static inline int is_omap1510_8250(struct uart_8250_port *pt)
-{
-        return 0;
-}
-#endif
diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
deleted file mode 100644
index 34b51c65119..00000000000
--- a/drivers/tty/serial/8250/8250_accent.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (C) 2005 Russell King.
- *  Data taken from include/asm-i386/serial.h
- *
- * 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/init.h>
-#include <linux/serial_8250.h>
-
-#define PORT(_base,_irq)                                \
-        {                                               \
-                .iobase         = _base,                \
-                .irq            = _irq,                 \
-                .uartclk        = 1843200,              \
-                .iotype         = UPIO_PORT,            \
-                .flags          = UPF_BOOT_AUTOCONF,    \
-        }
-
-static struct plat_serial8250_port accent_data[] = {
-        PORT(0x330, 4),
-        PORT(0x338, 4),
-        { },
-};
-
-static struct platform_device accent_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_ACCENT,
-        .dev                    = {
-                .platform_data  = accent_data,
-        },
-};
-
-static int __init accent_init(void)
-{
-        return platform_device_register(&accent_device);
-}
-
-module_init(accent_init);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("8250 serial probe module for Accent Async cards");
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
deleted file mode 100644
index 549aa07c0d2..00000000000
--- a/drivers/tty/serial/8250/8250_acorn.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  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];
-        void __iomem *vaddr;
-};
-
-static int
-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_8250_port uart;
-        unsigned long bus_addr;
-        unsigned int i;
-
-        info = kzalloc(sizeof(struct serial_card_info), GFP_KERNEL);
-        if (!info)
-                return -ENOMEM;
-
-        info->num_ports = type->num_ports;
-
-        bus_addr = ecard_resource_start(ec, type->type);
-        info->vaddr = ecardm_iomap(ec, type->type, 0, 0);
-        if (!info->vaddr) {
-                kfree(info);
-                return -ENOMEM;
-        }
-
-        ecard_set_drvdata(ec, info);
-
-        memset(&uart, 0, sizeof(struct uart_8250_port));
-        uart.port.irq   = ec->irq;
-        uart.port.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
-        uart.port.uartclk       = type->uartclk;
-        uart.port.iotype        = UPIO_MEM;
-        uart.port.regshift      = 2;
-        uart.port.dev   = &ec->dev;
-
-        for (i = 0; i < info->num_ports; i ++) {
-                uart.port.membase = info->vaddr + type->offset[i];
-                uart.port.mapbase = bus_addr + type->offset[i];
-
-                info->ports[i] = serial8250_register_8250_port(&uart);
-        }
-
-        return 0;
-}
-
-static void 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         = 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/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
deleted file mode 100644
index d125dc10798..00000000000
--- a/drivers/tty/serial/8250/8250_boca.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2005 Russell King.
- *  Data taken from include/asm-i386/serial.h
- *
- * 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/init.h>
-#include <linux/serial_8250.h>
-
-#define PORT(_base,_irq)                                \
-        {                                               \
-                .iobase         = _base,                \
-                .irq            = _irq,                 \
-                .uartclk        = 1843200,              \
-                .iotype         = UPIO_PORT,            \
-                .flags          = UPF_BOOT_AUTOCONF,    \
-        }
-
-static struct plat_serial8250_port boca_data[] = {
-        PORT(0x100, 12),
-        PORT(0x108, 12),
-        PORT(0x110, 12),
-        PORT(0x118, 12),
-        PORT(0x120, 12),
-        PORT(0x128, 12),
-        PORT(0x130, 12),
-        PORT(0x138, 12),
-        PORT(0x140, 12),
-        PORT(0x148, 12),
-        PORT(0x150, 12),
-        PORT(0x158, 12),
-        PORT(0x160, 12),
-        PORT(0x168, 12),
-        PORT(0x170, 12),
-        PORT(0x178, 12),
-        { },
-};
-
-static struct platform_device boca_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_BOCA,
-        .dev                    = {
-                .platform_data  = boca_data,
-        },
-};
-
-static int __init boca_init(void)
-{
-        return platform_device_register(&boca_device);
-}
-
-module_init(boca_init);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("8250 serial probe module for Boca cards");
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
deleted file mode 100644
index 1d0dba2d562..00000000000
--- a/drivers/tty/serial/8250/8250_dw.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Synopsys DesignWare 8250 driver.
- *
- * Copyright 2011 Picochip, Jamie Iles.
- *
- * 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.
- *
- * The Synopsys DesignWare 8250 has an extra feature whereby it detects if the
- * LCR is written whilst busy.  If it is, then a busy detect interrupt is
- * raised, the LCR needs to be rewritten and the uart status register read.
- */
-#include <linux/device.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/serial_8250.h>
-#include <linux/serial_core.h>
-#include <linux/serial_reg.h>
-#include <linux/of.h>
-#include <linux/of_irq.h>
-#include <linux/of_platform.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-
-struct dw8250_data {
-        int     last_lcr;
-        int     line;
-};
-
-static void dw8250_serial_out(struct uart_port *p, int offset, int value)
-{
-        struct dw8250_data *d = p->private_data;
-
-        if (offset == UART_LCR)
-                d->last_lcr = value;
-
-        offset <<= p->regshift;
-        writeb(value, p->membase + offset);
-}
-
-static unsigned int dw8250_serial_in(struct uart_port *p, int offset)
-{
-        offset <<= p->regshift;
-
-        return readb(p->membase + offset);
-}
-
-static void dw8250_serial_out32(struct uart_port *p, int offset, int value)
-{
-        struct dw8250_data *d = p->private_data;
-
-        if (offset == UART_LCR)
-                d->last_lcr = value;
-
-        offset <<= p->regshift;
-        writel(value, p->membase + offset);
-}
-
-static unsigned int dw8250_serial_in32(struct uart_port *p, int offset)
-{
-        offset <<= p->regshift;
-
-        return readl(p->membase + offset);
-}
-
-/* Offset for the DesignWare's UART Status Register. */
-#define UART_USR        0x1f
-
-static int dw8250_handle_irq(struct uart_port *p)
-{
-        struct dw8250_data *d = p->private_data;
-        unsigned int iir = p->serial_in(p, UART_IIR);
-
-        if (serial8250_handle_irq(p, iir)) {
-                return 1;
-        } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
-                /* Clear the USR and write the LCR again. */
-                (void)p->serial_in(p, UART_USR);
-                p->serial_out(p, d->last_lcr, UART_LCR);
-
-                return 1;
-        }
-
-        return 0;
-}
-
-static int dw8250_probe(struct platform_device *pdev)
-{
-        struct uart_8250_port uart = {};
-        struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        struct resource *irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        struct device_node *np = pdev->dev.of_node;
-        u32 val;
-        struct dw8250_data *data;
-
-        if (!regs || !irq) {
-                dev_err(&pdev->dev, "no registers/irq defined\n");
-                return -EINVAL;
-        }
-
-        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-        uart.port.private_data = data;
-
-        spin_lock_init(&uart.port.lock);
-        uart.port.mapbase = regs->start;
-        uart.port.irq = irq->start;
-        uart.port.handle_irq = dw8250_handle_irq;
-        uart.port.type = PORT_8250;
-        uart.port.flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP |
-                UPF_FIXED_PORT | UPF_FIXED_TYPE;
-        uart.port.dev = &pdev->dev;
-
-        uart.port.iotype = UPIO_MEM;
-        uart.port.serial_in = dw8250_serial_in;
-        uart.port.serial_out = dw8250_serial_out;
-        if (!of_property_read_u32(np, "reg-io-width", &val)) {
-                switch (val) {
-                case 1:
-                        break;
-                case 4:
-                        uart.port.iotype = UPIO_MEM32;
-                        uart.port.serial_in = dw8250_serial_in32;
-                        uart.port.serial_out = dw8250_serial_out32;
-                        break;
-                default:
-                        dev_err(&pdev->dev, "unsupported reg-io-width (%u)\n",
-                                val);
-                        return -EINVAL;
-                }
-        }
-
-        if (!of_property_read_u32(np, "reg-shift", &val))
-                uart.port.regshift = val;
-
-        if (of_property_read_u32(np, "clock-frequency", &val)) {
-                dev_err(&pdev->dev, "no clock-frequency property set\n");
-                return -EINVAL;
-        }
-        uart.port.uartclk = val;
-
-        data->line = serial8250_register_8250_port(&uart);
-        if (data->line < 0)
-                return data->line;
-
-        platform_set_drvdata(pdev, data);
-
-        return 0;
-}
-
-static int dw8250_remove(struct platform_device *pdev)
-{
-        struct dw8250_data *data = platform_get_drvdata(pdev);
-
-        serial8250_unregister_port(data->line);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM
-static int dw8250_suspend(struct platform_device *pdev, pm_message_t state)
-{
-        struct dw8250_data *data = platform_get_drvdata(pdev);
-
-        serial8250_suspend_port(data->line);
-
-        return 0;
-}
-
-static int dw8250_resume(struct platform_device *pdev)
-{
-        struct dw8250_data *data = platform_get_drvdata(pdev);
-
-        serial8250_resume_port(data->line);
-
-        return 0;
-}
-#else
-#define dw8250_suspend NULL
-#define dw8250_resume NULL
-#endif /* CONFIG_PM */
-
-static const struct of_device_id dw8250_match[] = {
-        { .compatible = "snps,dw-apb-uart" },
-        { /* Sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, dw8250_match);
-
-static struct platform_driver dw8250_platform_driver = {
-        .driver = {
-                .name           = "dw-apb-uart",
-                .owner          = THIS_MODULE,
-                .of_match_table = dw8250_match,
-        },
-        .probe                  = dw8250_probe,
-        .remove                 = dw8250_remove,
-        .suspend                = dw8250_suspend,
-        .resume                 = dw8250_resume,
-};
-
-module_platform_driver(dw8250_platform_driver);
-
-MODULE_AUTHOR("Jamie Iles");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Synopsys DesignWare 8250 serial port driver");
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
deleted file mode 100644
index f53a7db4350..00000000000
--- a/drivers/tty/serial/8250/8250_early.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.,
- *      earlycon=uart8250,io,0x3f8,9600n8
- *      earlycon=uart8250,mmio,0xff5e0000,115200n8
- *      earlycon=uart8250,mmio32,0xff5e0000,115200n8
- * or
- *      console=uart8250,io,0x3f8,9600n8
- *      console=uart8250,mmio,0xff5e0000,115200n8
- *      console=uart8250,mmio32,0xff5e0000,115200n8
- */
-
-#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 <linux/serial_8250.h>
-#include <asm/io.h>
-#include <asm/serial.h>
-#ifdef CONFIG_FIX_EARLYCON_MEM
-#include <asm/pgtable.h>
-#include <asm/fixmap.h>
-#endif
-
-struct early_serial8250_device {
-        struct uart_port port;
-        char options[16];               /* e.g., 115200n8 */
-        unsigned int baud;
-};
-
-static struct early_serial8250_device early_device;
-
-unsigned int __weak __init serial8250_early_in(struct uart_port *port, int offset)
-{
-        switch (port->iotype) {
-        case UPIO_MEM:
-                return readb(port->membase + offset);
-        case UPIO_MEM32:
-                return readl(port->membase + (offset << 2));
-        case UPIO_PORT:
-                return inb(port->iobase + offset);
-        default:
-                return 0;
-        }
-}
-
-void __weak __init serial8250_early_out(struct uart_port *port, int offset, int value)
-{
-        switch (port->iotype) {
-        case UPIO_MEM:
-                writeb(value, port->membase + offset);
-                break;
-        case UPIO_MEM32:
-                writel(value, port->membase + (offset << 2));
-                break;
-        case UPIO_PORT:
-                outb(value, port->iobase + offset);
-                break;
-        }
-}
-
-#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-
-static void __init wait_for_xmitr(struct uart_port *port)
-{
-        unsigned int status;
-
-        for (;;) {
-                status = serial8250_early_in(port, UART_LSR);
-                if ((status & BOTH_EMPTY) == BOTH_EMPTY)
-                        return;
-                cpu_relax();
-        }
-}
-
-static void __init serial_putc(struct uart_port *port, int c)
-{
-        wait_for_xmitr(port);
-        serial8250_early_out(port, UART_TX, c);
-}
-
-static void __init early_serial8250_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 = serial8250_early_in(port, UART_IER);
-        serial8250_early_out(port, UART_IER, 0);
-
-        uart_console_write(port, s, count, serial_putc);
-
-        /* Wait for transmitter to become empty and restore the IER */
-        wait_for_xmitr(port);
-        serial8250_early_out(port, UART_IER, ier);
-}
-
-static unsigned int __init probe_baud(struct uart_port *port)
-{
-        unsigned char lcr, dll, dlm;
-        unsigned int quot;
-
-        lcr = serial8250_early_in(port, UART_LCR);
-        serial8250_early_out(port, UART_LCR, lcr | UART_LCR_DLAB);
-        dll = serial8250_early_in(port, UART_DLL);
-        dlm = serial8250_early_in(port, UART_DLM);
-        serial8250_early_out(port, UART_LCR, lcr);
-
-        quot = (dlm << 8) | dll;
-        return (port->uartclk / 16) / quot;
-}
-
-static void __init init_port(struct early_serial8250_device *device)
-{
-        struct uart_port *port = &device->port;
-        unsigned int divisor;
-        unsigned char c;
-
-        serial8250_early_out(port, UART_LCR, 0x3);      /* 8n1 */
-        serial8250_early_out(port, UART_IER, 0);        /* no interrupt */
-        serial8250_early_out(port, UART_FCR, 0);        /* no fifo */
-        serial8250_early_out(port, UART_MCR, 0x3);      /* DTR + RTS */
-
-        divisor = DIV_ROUND_CLOSEST(port->uartclk, 16 * device->baud);
-        c = serial8250_early_in(port, UART_LCR);
-        serial8250_early_out(port, UART_LCR, c | UART_LCR_DLAB);
-        serial8250_early_out(port, UART_DLL, divisor & 0xff);
-        serial8250_early_out(port, UART_DLM, (divisor >> 8) & 0xff);
-        serial8250_early_out(port, UART_LCR, c & ~UART_LCR_DLAB);
-}
-
-static int __init parse_options(struct early_serial8250_device *device,
-                                                                char *options)
-{
-        struct uart_port *port = &device->port;
-        int mmio, mmio32, length;
-
-        if (!options)
-                return -ENODEV;
-
-        port->uartclk = BASE_BAUD * 16;
-
-        mmio = !strncmp(options, "mmio,", 5);
-        mmio32 = !strncmp(options, "mmio32,", 7);
-        if (mmio || mmio32) {
-                port->iotype = (mmio ? UPIO_MEM : UPIO_MEM32);
-                port->mapbase = simple_strtoul(options + (mmio ? 5 : 7),
-                                               &options, 0);
-                if (mmio32)
-                        port->regshift = 2;
-#ifdef CONFIG_FIX_EARLYCON_MEM
-                set_fixmap_nocache(FIX_EARLYCON_MEM_BASE,
-                                        port->mapbase & PAGE_MASK);
-                port->membase =
-                        (void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);
-                port->membase += port->mapbase & ~PAGE_MASK;
-#else
-                port->membase = ioremap_nocache(port->mapbase, 64);
-                if (!port->membase) {
-                        printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",
-                                __func__,
-                               (unsigned long long) port->mapbase);
-                        return -ENOMEM;
-                }
-#endif
-        } else if (!strncmp(options, "io,", 3)) {
-                port->iotype = UPIO_PORT;
-                port->iobase = simple_strtoul(options + 3, &options, 0);
-                mmio = 0;
-        } else
-                return -EINVAL;
-
-        options = strchr(options, ',');
-        if (options) {
-                options++;
-                device->baud = simple_strtoul(options, NULL, 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);
-        }
-
-        if (mmio || mmio32)
-                printk(KERN_INFO
-                       "Early serial console at MMIO%s 0x%llx (options '%s')\n",
-                        mmio32 ? "32" : "",
-                        (unsigned long long)port->mapbase,
-                        device->options);
-        else
-                printk(KERN_INFO
-                      "Early serial console at I/O port 0x%lx (options '%s')\n",
-                        port->iobase,
-                        device->options);
-
-        return 0;
-}
-
-static struct console early_serial8250_console __initdata = {
-        .name   = "uart",
-        .write  = early_serial8250_write,
-        .flags  = CON_PRINTBUFFER | CON_BOOT,
-        .index  = -1,
-};
-
-static int __init early_serial8250_setup(char *options)
-{
-        struct early_serial8250_device *device = &early_device;
-        int err;
-
-        if (device->port.membase || device->port.iobase)
-                return 0;
-
-        err = parse_options(device, options);
-        if (err < 0)
-                return err;
-
-        init_port(device);
-        return 0;
-}
-
-int __init setup_early_serial8250_console(char *cmdline)
-{
-        char *options;
-        int err;
-
-        options = strstr(cmdline, "uart8250,");
-        if (!options) {
-                options = strstr(cmdline, "uart,");
-                if (!options)
-                        return 0;
-        }
-
-        options = strchr(cmdline, ',') + 1;
-        err = early_serial8250_setup(options);
-        if (err < 0)
-                return err;
-
-        register_console(&early_serial8250_console);
-
-        return 0;
-}
-
-int serial8250_find_port_for_earlycon(void)
-{
-        struct early_serial8250_device *device = &early_device;
-        struct uart_port *port = &device->port;
-        int line;
-        int ret;
-
-        if (!device->port.membase && !device->port.iobase)
-                return -ENODEV;
-
-        line = serial8250_find_port(port);
-        if (line < 0)
-                return -ENODEV;
-
-        ret = update_console_cmdline("uart", 8250,
-                             "ttyS", line, device->options);
-        if (ret < 0)
-                ret = update_console_cmdline("uart", 0,
-                                     "ttyS", line, device->options);
-
-        return ret;
-}
-
-early_param("earlycon", setup_early_serial8250_console);
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
deleted file mode 100644
index 916cc19fbbd..00000000000
--- a/drivers/tty/serial/8250/8250_em.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Renesas Emma Mobile 8250 driver
- *
- *  Copyright (C) 2012 Magnus Damm
- *
- * 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
- *
- * 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/device.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/serial_8250.h>
-#include <linux/serial_core.h>
-#include <linux/serial_reg.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/slab.h>
-
-#include "8250.h"
-
-#define UART_DLL_EM 9
-#define UART_DLM_EM 10
-
-struct serial8250_em_priv {
-        struct clk *sclk;
-        int line;
-};
-
-static void serial8250_em_serial_out(struct uart_port *p, int offset, int value)
-{
-        switch (offset) {
-        case UART_TX: /* TX @ 0x00 */
-                writeb(value, p->membase);
-                break;
-        case UART_FCR: /* FCR @ 0x0c (+1) */
-        case UART_LCR: /* LCR @ 0x10 (+1) */
-        case UART_MCR: /* MCR @ 0x14 (+1) */
-        case UART_SCR: /* SCR @ 0x20 (+1) */
-                writel(value, p->membase + ((offset + 1) << 2));
-                break;
-        case UART_IER: /* IER @ 0x04 */
-                value &= 0x0f; /* only 4 valid bits - not Xscale */
-                /* fall-through */
-        case UART_DLL_EM: /* DLL @ 0x24 (+9) */
-        case UART_DLM_EM: /* DLM @ 0x28 (+9) */
-                writel(value, p->membase + (offset << 2));
-        }
-}
-
-static unsigned int serial8250_em_serial_in(struct uart_port *p, int offset)
-{
-        switch (offset) {
-        case UART_RX: /* RX @ 0x00 */
-                return readb(p->membase);
-        case UART_MCR: /* MCR @ 0x14 (+1) */
-        case UART_LSR: /* LSR @ 0x18 (+1) */
-        case UART_MSR: /* MSR @ 0x1c (+1) */
-        case UART_SCR: /* SCR @ 0x20 (+1) */
-                return readl(p->membase + ((offset + 1) << 2));
-        case UART_IER: /* IER @ 0x04 */
-        case UART_IIR: /* IIR @ 0x08 */
-        case UART_DLL_EM: /* DLL @ 0x24 (+9) */
-        case UART_DLM_EM: /* DLM @ 0x28 (+9) */
-                return readl(p->membase + (offset << 2));
-        }
-        return 0;
-}
-
-static int serial8250_em_serial_dl_read(struct uart_8250_port *up)
-{
-        return serial_in(up, UART_DLL_EM) | serial_in(up, UART_DLM_EM) << 8;
-}
-
-static void serial8250_em_serial_dl_write(struct uart_8250_port *up, int value)
-{
-        serial_out(up, UART_DLL_EM, value & 0xff);
-        serial_out(up, UART_DLM_EM, value >> 8 & 0xff);
-}
-
-static int serial8250_em_probe(struct platform_device *pdev)
-{
-        struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        struct resource *irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        struct serial8250_em_priv *priv;
-        struct uart_8250_port up;
-        int ret = -EINVAL;
-
-        if (!regs || !irq) {
-                dev_err(&pdev->dev, "missing registers or irq\n");
-                goto err0;
-        }
-
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                dev_err(&pdev->dev, "unable to allocate private data\n");
-                ret = -ENOMEM;
-                goto err0;
-        }
-
-        priv->sclk = clk_get(&pdev->dev, "sclk");
-        if (IS_ERR(priv->sclk)) {
-                dev_err(&pdev->dev, "unable to get clock\n");
-                ret = PTR_ERR(priv->sclk);
-                goto err1;
-        }
-
-        memset(&up, 0, sizeof(up));
-        up.port.mapbase = regs->start;
-        up.port.irq = irq->start;
-        up.port.type = PORT_UNKNOWN;
-        up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP;
-        up.port.dev = &pdev->dev;
-        up.port.private_data = priv;
-
-        clk_enable(priv->sclk);
-        up.port.uartclk = clk_get_rate(priv->sclk);
-
-        up.port.iotype = UPIO_MEM32;
-        up.port.serial_in = serial8250_em_serial_in;
-        up.port.serial_out = serial8250_em_serial_out;
-        up.dl_read = serial8250_em_serial_dl_read;
-        up.dl_write = serial8250_em_serial_dl_write;
-
-        ret = serial8250_register_8250_port(&up);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "unable to register 8250 port\n");
-                goto err2;
-        }
-
-        priv->line = ret;
-        platform_set_drvdata(pdev, priv);
-        return 0;
-
- err2:
-        clk_disable(priv->sclk);
-        clk_put(priv->sclk);
- err1:
-        kfree(priv);
- err0:
-        return ret;
-}
-
-static int serial8250_em_remove(struct platform_device *pdev)
-{
-        struct serial8250_em_priv *priv = platform_get_drvdata(pdev);
-
-        serial8250_unregister_port(priv->line);
-        clk_disable(priv->sclk);
-        clk_put(priv->sclk);
-        kfree(priv);
-        return 0;
-}
-
-static const struct of_device_id serial8250_em_dt_ids[] = {
-        { .compatible = "renesas,em-uart", },
-        {},
-};
-MODULE_DEVICE_TABLE(of, serial8250_em_dt_ids);
-
-static struct platform_driver serial8250_em_platform_driver = {
-        .driver = {
-                .name           = "serial8250-em",
-                .of_match_table = serial8250_em_dt_ids,
-                .owner          = THIS_MODULE,
-        },
-        .probe                  = serial8250_em_probe,
-        .remove                 = serial8250_em_remove,
-};
-
-module_platform_driver(serial8250_em_platform_driver);
-
-MODULE_AUTHOR("Magnus Damm");
-MODULE_DESCRIPTION("Renesas Emma Mobile 8250 Driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
deleted file mode 100644
index bf53aabf9b5..00000000000
--- a/drivers/tty/serial/8250/8250_exar_st16c554.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Written by Paul B Schroeder < pschroeder "at" uplogix "dot" com >
- *  Based on 8250_boca.
- *
- *  Copyright (C) 2005 Russell King.
- *  Data taken from include/asm-i386/serial.h
- *
- * 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/init.h>
-#include <linux/serial_8250.h>
-
-#define PORT(_base,_irq)                                \
-        {                                               \
-                .iobase         = _base,                \
-                .irq            = _irq,                 \
-                .uartclk        = 1843200,              \
-                .iotype         = UPIO_PORT,            \
-                .flags          = UPF_BOOT_AUTOCONF,    \
-        }
-
-static struct plat_serial8250_port exar_data[] = {
-        PORT(0x100, 5),
-        PORT(0x108, 5),
-        PORT(0x110, 5),
-        PORT(0x118, 5),
-        { },
-};
-
-static struct platform_device exar_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_EXAR_ST16C554,
-        .dev                    = {
-                .platform_data  = exar_data,
-        },
-};
-
-static int __init exar_init(void)
-{
-        return platform_device_register(&exar_device);
-}
-
-module_init(exar_init);
-
-MODULE_AUTHOR("Paul B Schroeder");
-MODULE_DESCRIPTION("8250 serial probe module for Exar cards");
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
deleted file mode 100644
index be158260962..00000000000
--- a/drivers/tty/serial/8250/8250_fourport.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (C) 2005 Russell King.
- *  Data taken from include/asm-i386/serial.h
- *
- * 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/init.h>
-#include <linux/serial_8250.h>
-
-#define PORT(_base,_irq)                                                \
-        {                                                               \
-                .iobase         = _base,                                \
-                .irq            = _irq,                                 \
-                .uartclk        = 1843200,                              \
-                .iotype         = UPIO_PORT,                            \
-                .flags          = UPF_BOOT_AUTOCONF | UPF_FOURPORT,     \
-        }
-
-static struct plat_serial8250_port fourport_data[] = {
-        PORT(0x1a0, 9),
-        PORT(0x1a8, 9),
-        PORT(0x1b0, 9),
-        PORT(0x1b8, 9),
-        PORT(0x2a0, 5),
-        PORT(0x2a8, 5),
-        PORT(0x2b0, 5),
-        PORT(0x2b8, 5),
-        { },
-};
-
-static struct platform_device fourport_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_FOURPORT,
-        .dev                    = {
-                .platform_data  = fourport_data,
-        },
-};
-
-static int __init fourport_init(void)
-{
-        return platform_device_register(&fourport_device);
-}
-
-module_init(fourport_init);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("8250 serial probe module for AST Fourport cards");
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
deleted file mode 100644
index f4d3c47b88e..00000000000
--- a/drivers/tty/serial/8250/8250_fsl.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <linux/serial_reg.h>
-#include <linux/serial_8250.h>
-
-#include "8250.h"
-
-/*
- * Freescale 16550 UART "driver", Copyright (C) 2011 Paul Gortmaker.
- *
- * 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.
- *
- * This isn't a full driver; it just provides an alternate IRQ
- * handler to deal with an errata.  Everything else is just
- * using the bog standard 8250 support.
- *
- * We follow code flow of serial8250_default_handle_irq() but add
- * a check for a break and insert a dummy read on the Rx for the
- * immediately following IRQ event.
- *
- * We re-use the already existing "bug handling" lsr_saved_flags
- * field to carry the "what we just did" information from the one
- * IRQ event to the next one.
- */
-
-int fsl8250_handle_irq(struct uart_port *port)
-{
-        unsigned char lsr, orig_lsr;
-        unsigned long flags;
-        unsigned int iir;
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        spin_lock_irqsave(&up->port.lock, flags);
-
-        iir = port->serial_in(port, UART_IIR);
-        if (iir & UART_IIR_NO_INT) {
-                spin_unlock_irqrestore(&up->port.lock, flags);
-                return 0;
-        }
-
-        /* This is the WAR; if last event was BRK, then read and return */
-        if (unlikely(up->lsr_saved_flags & UART_LSR_BI)) {
-                up->lsr_saved_flags &= ~UART_LSR_BI;
-                port->serial_in(port, UART_RX);
-                spin_unlock_irqrestore(&up->port.lock, flags);
-                return 1;
-        }
-
-        lsr = orig_lsr = up->port.serial_in(&up->port, UART_LSR);
-
-        if (lsr & (UART_LSR_DR | UART_LSR_BI))
-                lsr = serial8250_rx_chars(up, lsr);
-
-        serial8250_modem_status(up);
-
-        if (lsr & UART_LSR_THRE)
-                serial8250_tx_chars(up);
-
-        up->lsr_saved_flags = orig_lsr;
-        spin_unlock_irqrestore(&up->port.lock, flags);
-        return 1;
-}
diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c
deleted file mode 100644
index 097dff9c08a..00000000000
--- a/drivers/tty/serial/8250/8250_gsc.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *      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/types.h>
-
-#include <asm/hardware.h>
-#include <asm/parisc-device.h>
-#include <asm/io.h>
-
-#include "8250.h"
-
-static int __init serial_init_chip(struct parisc_device *dev)
-{
-        struct uart_8250_port uart;
-        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%llx not configured.\n"
-                                "Enable support for Wax, Lasi, Asp or Dino.\n",
-                                (unsigned long long)dev->hpa.start);
-                return -ENODEV;
-        }
-
-        address = dev->hpa.start;
-        if (dev->id.sversion != 0x8d)
-                address += 0x800;
-
-        memset(&uart, 0, sizeof(uart));
-        uart.port.iotype        = UPIO_MEM;
-        /* 7.272727MHz on Lasi.  Assumed the same for Dino, Wax and Timi. */
-        uart.port.uartclk       = 7272727;
-        uart.port.mapbase       = address;
-        uart.port.membase       = ioremap_nocache(address, 16);
-        uart.port.irq   = dev->irq;
-        uart.port.flags = UPF_BOOT_AUTOCONF;
-        uart.port.dev   = &dev->dev;
-
-        err = serial8250_register_8250_port(&uart);
-        if (err < 0) {
-                printk(KERN_WARNING
-                        "serial8250_register_8250_port returned error %d\n", err);
-                iounmap(uart.port.membase);
-                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,
-};
-
-static int __init probe_serial_gsc(void)
-{
-        register_parisc_driver(&lasi_driver);
-        register_parisc_driver(&serial_driver);
-        return 0;
-}
-
-module_init(probe_serial_gsc);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
deleted file mode 100644
index 5bdaf271d39..00000000000
--- a/drivers/tty/serial/8250/8250_hp300.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * 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/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
-#include <linux/delay.h>
-#include <linux/dio.h>
-#include <linux/console.h>
-#include <linux/slab.h>
-#include <asm/io.h>
-
-#include "8250.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 hpdca_init_one(struct dio_dev *d,
-                                        const struct dio_device_id *ent);
-static void 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    = hpdca_remove_one,
-};
-
-#endif
-
-static unsigned int num_ports;
-
-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 hpdca_init_one(struct dio_dev *d,
-                                const struct dio_device_id *ent)
-{
-        struct uart_8250_port uart;
-        int line;
-
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-        if (hp300_uart_scode == d->scode) {
-                /* Already got it. */
-                return 0;
-        }
-#endif
-        memset(&uart, 0, sizeof(uart));
-
-        /* Memory mapped I/O */
-        uart.port.iotype = UPIO_MEM;
-        uart.port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
-        uart.port.irq = d->ipl;
-        uart.port.uartclk = HPDCA_BAUD_BASE * 16;
-        uart.port.mapbase = (d->resource.start + UART_OFFSET);
-        uart.port.membase = (char *)(uart.port.mapbase + DIO_VIRADDRBASE);
-        uart.port.regshift = 1;
-        uart.port.dev = &d->dev;
-        line = serial8250_register_8250_port(&uart);
-
-        if (line < 0) {
-                printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d"
-                       " irq %d failed\n", d->scode, uart.port.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);
-
-        num_ports++;
-
-        return 0;
-}
-#endif
-
-static int __init hp300_8250_init(void)
-{
-        static int called;
-#ifdef CONFIG_HPAPCI
-        int line;
-        unsigned long base;
-        struct uart_8250_port uart;
-        struct hp300_port *port;
-        int i;
-#endif
-        if (called)
-                return -ENODEV;
-        called = 1;
-
-        if (!MACH_IS_HP300)
-                return -ENODEV;
-
-#ifdef CONFIG_HPDCA
-        dio_register_driver(&hpdca_driver);
-#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(&uart, 0, sizeof(uart));
-
-                base = (FRODO_BASE + FRODO_APCI_OFFSET(i));
-
-                /* Memory mapped I/O */
-                uart.port.iotype = UPIO_MEM;
-                uart.port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ \
-                              | UPF_BOOT_AUTOCONF;
-                /* XXX - no interrupt support yet */
-                uart.port.irq = 0;
-                uart.port.uartclk = HPAPCI_BAUD_BASE * 16;
-                uart.port.mapbase = base;
-                uart.port.membase = (char *)(base + DIO_VIRADDRBASE);
-                uart.port.regshift = 2;
-
-                line = serial8250_register_8250_port(&uart);
-
-                if (line < 0) {
-                        printk(KERN_NOTICE "8250_hp300: register_serial() APCI"
-                               " %d irq %d failed\n", i, uart.port.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 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);
-        }
-        serial8250_unregister_port(line);
-}
-#endif
-
-static void __exit hp300_8250_exit(void)
-{
-#ifdef CONFIG_HPAPCI
-        struct hp300_port *port, *to_free;
-
-        for (port = hp300_ports; port; ) {
-                serial8250_unregister_port(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/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
deleted file mode 100644
index a5c778e83de..00000000000
--- a/drivers/tty/serial/8250/8250_hub6.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2005 Russell King.
- *  Data taken from include/asm-i386/serial.h
- *
- * 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/init.h>
-#include <linux/serial_8250.h>
-
-#define HUB6(card,port)                                                 \
-        {                                                               \
-                .iobase         = 0x302,                                \
-                .irq            = 3,                                    \
-                .uartclk        = 1843200,                              \
-                .iotype         = UPIO_HUB6,                            \
-                .flags          = UPF_BOOT_AUTOCONF,                    \
-                .hub6           = (card) << 6 | (port) << 3 | 1,        \
-        }
-
-static struct plat_serial8250_port hub6_data[] = {
-        HUB6(0, 0),
-        HUB6(0, 1),
-        HUB6(0, 2),
-        HUB6(0, 3),
-        HUB6(0, 4),
-        HUB6(0, 5),
-        HUB6(1, 0),
-        HUB6(1, 1),
-        HUB6(1, 2),
-        HUB6(1, 3),
-        HUB6(1, 4),
-        HUB6(1, 5),
-        { },
-};
-
-static struct platform_device hub6_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_HUB6,
-        .dev                    = {
-                .platform_data  = hub6_data,
-        },
-};
-
-static int __init hub6_init(void)
-{
-        return platform_device_register(&hub6_device);
-}
-
-module_init(hub6_init);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("8250 serial probe module for Hub6 cards");
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
deleted file mode 100644
index 26b9dc012ed..00000000000
--- a/drivers/tty/serial/8250/8250_pci.c
+++ /dev/null
@@ -1,4604 +0,0 @@
-/*
- *  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.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/tty.h>
-#include <linux/serial_reg.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
-
-/*
- * 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     (*probe)(struct pci_dev *dev);
-        int     (*init)(struct pci_dev *dev);
-        int     (*setup)(struct serial_private *,
-                         const struct pciserial_board *,
-                         struct uart_8250_port *, int);
-        void    (*exit)(struct pci_dev *dev);
-};
-
-#define PCI_NUM_BAR_RESOURCES   6
-
-struct serial_private {
-        struct pci_dev          *dev;
-        unsigned int            nr;
-        void __iomem            *remapped_bar[PCI_NUM_BAR_RESOURCES];
-        struct pci_serial_quirk *quirk;
-        int                     line[0];
-};
-
-static int pci_default_setup(struct serial_private*,
-          const struct pciserial_board*, struct uart_8250_port *, int);
-
-static void moan_device(const char *str, struct pci_dev *dev)
-{
-        printk(KERN_WARNING
-               "%s: %s\n"
-               "Please send the output of lspci -vv, this\n"
-               "message (0x%04x,0x%04x,0x%04x,0x%04x), the\n"
-               "manufacturer and name of serial board or\n"
-               "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 serial_private *priv, struct uart_8250_port *port,
-           int bar, int offset, int regshift)
-{
-        struct pci_dev *dev = priv->dev;
-        unsigned long base, len;
-
-        if (bar >= PCI_NUM_BAR_RESOURCES)
-                return -EINVAL;
-
-        base = pci_resource_start(dev, bar);
-
-        if (pci_resource_flags(dev, bar) & IORESOURCE_MEM) {
-                len =  pci_resource_len(dev, bar);
-
-                if (!priv->remapped_bar[bar])
-                        priv->remapped_bar[bar] = ioremap_nocache(base, len);
-                if (!priv->remapped_bar[bar])
-                        return -ENOMEM;
-
-                port->port.iotype = UPIO_MEM;
-                port->port.iobase = 0;
-                port->port.mapbase = base + offset;
-                port->port.membase = priv->remapped_bar[bar] + offset;
-                port->port.regshift = regshift;
-        } else {
-                port->port.iotype = UPIO_PORT;
-                port->port.iobase = base + offset;
-                port->port.mapbase = 0;
-                port->port.membase = NULL;
-                port->port.regshift = 0;
-        }
-        return 0;
-}
-
-/*
- * ADDI-DATA GmbH communication cards <info@addi-data.com>
- */
-static int addidata_apci7800_setup(struct serial_private *priv,
-                                const struct pciserial_board *board,
-                                struct uart_8250_port *port, int idx)
-{
-        unsigned int bar = 0, offset = board->first_offset;
-        bar = FL_GET_BASE(board->flags);
-
-        if (idx < 2) {
-                offset += idx * board->uart_offset;
-        } else if ((idx >= 2) && (idx < 4)) {
-                bar += 1;
-                offset += ((idx - 2) * board->uart_offset);
-        } else if ((idx >= 4) && (idx < 6)) {
-                bar += 2;
-                offset += ((idx - 4) * board->uart_offset);
-        } else if (idx >= 6) {
-                bar += 3;
-                offset += ((idx - 6) * board->uart_offset);
-        }
-
-        return setup_port(priv, port, bar, offset, board->reg_shift);
-}
-
-/*
- * AFAVLAB uses a different mixture of BARs and offsets
- * Not that ugly ;) -- HW
- */
-static int
-afavlab_setup(struct serial_private *priv, const struct pciserial_board *board,
-              struct uart_8250_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(priv, 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 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:
-        case PCI_DEVICE_ID_HP_DIVA_HURRICANE:
-                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 serial_private *priv,
-                const struct pciserial_board *board,
-                struct uart_8250_port *port, int idx)
-{
-        unsigned int offset = board->first_offset;
-        unsigned int bar = FL_GET_BASE(board->flags);
-
-        switch (priv->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(priv, port, bar, offset, board->reg_shift);
-}
-
-/*
- * Added for EKF Intel i960 serial boards
- */
-static int 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 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 ||
-            dev->subsystem_vendor == PCI_SUBVENDOR_ID_EXSYS)
-                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_nocache(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 pci_plx9050_exit(struct pci_dev *dev)
-{
-        u8 __iomem *p;
-
-        if ((pci_resource_flags(dev, 0) & IORESOURCE_MEM) == 0)
-                return;
-
-        /*
-         * disable interrupts
-         */
-        p = ioremap_nocache(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);
-        }
-}
-
-#define NI8420_INT_ENABLE_REG   0x38
-#define NI8420_INT_ENABLE_BIT   0x2000
-
-static void pci_ni8420_exit(struct pci_dev *dev)
-{
-        void __iomem *p;
-        unsigned long base, len;
-        unsigned int bar = 0;
-
-        if ((pci_resource_flags(dev, bar) & IORESOURCE_MEM) == 0) {
-                moan_device("no memory in bar", dev);
-                return;
-        }
-
-        base = pci_resource_start(dev, bar);
-        len =  pci_resource_len(dev, bar);
-        p = ioremap_nocache(base, len);
-        if (p == NULL)
-                return;
-
-        /* Disable the CPU Interrupt */
-        writel(readl(p + NI8420_INT_ENABLE_REG) & ~(NI8420_INT_ENABLE_BIT),
-               p + NI8420_INT_ENABLE_REG);
-        iounmap(p);
-}
-
-
-/* MITE registers */
-#define MITE_IOWBSR1    0xc4
-#define MITE_IOWCR1     0xf4
-#define MITE_LCIMR1     0x08
-#define MITE_LCIMR2     0x10
-
-#define MITE_LCIMR2_CLR_CPU_IE  (1 << 30)
-
-static void pci_ni8430_exit(struct pci_dev *dev)
-{
-        void __iomem *p;
-        unsigned long base, len;
-        unsigned int bar = 0;
-
-        if ((pci_resource_flags(dev, bar) & IORESOURCE_MEM) == 0) {
-                moan_device("no memory in bar", dev);
-                return;
-        }
-
-        base = pci_resource_start(dev, bar);
-        len =  pci_resource_len(dev, bar);
-        p = ioremap_nocache(base, len);
-        if (p == NULL)
-                return;
-
-        /* Disable the CPU Interrupt */
-        writel(MITE_LCIMR2_CLR_CPU_IE, p + MITE_LCIMR2);
-        iounmap(p);
-}
-
-/* SBS Technologies Inc. PMC-OCTPRO and P-OCTAL cards */
-static int
-sbs_setup(struct serial_private *priv, const struct pciserial_board *board,
-                struct uart_8250_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(priv, 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 sbs_init(struct pci_dev *dev)
-{
-        u8 __iomem *p;
-
-        p = pci_ioremap_bar(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 sbs_exit(struct pci_dev *dev)
-{
-        u8 __iomem *p;
-
-        p = pci_ioremap_bar(dev, 0);
-        /* FIXME: What if resource_len < OCT_REG_CR_OFF */
-        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 equipped 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: all 10x cards have PCI device ids 0x10..
- *       all 20x cards have PCI device ids 0x20..
- *
- * There are also Quartet Serial cards which use Oxford Semiconductor
- * 16954 quad UART PCI chip clocked by 18.432 MHz quartz.
- *
- * 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_nocache(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;
-}
-
-static int pci_siig_init(struct pci_dev *dev)
-{
-        unsigned int type = dev->device & 0xff00;
-
-        if (type == 0x1000)
-                return pci_siig10x_init(dev);
-        else if (type == 0x2000)
-                return pci_siig20x_init(dev);
-
-        moan_device("Unknown SIIG card", dev);
-        return -ENODEV;
-}
-
-static int pci_siig_setup(struct serial_private *priv,
-                          const struct pciserial_board *board,
-                          struct uart_8250_port *port, int idx)
-{
-        unsigned int bar = FL_GET_BASE(board->flags) + idx, offset = 0;
-
-        if (idx > 3) {
-                bar = 4;
-                offset = (idx - 4) * 8;
-        }
-
-        return setup_port(priv, port, bar, offset, 0);
-}
-
-/*
- * 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 const unsigned short timedia_single_port[] = {
-        0x4025, 0x4027, 0x4028, 0x5025, 0x5027, 0
-};
-
-static const 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 const 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 const unsigned short timedia_eight_port[] = {
-        0x4065, 0x4066, 0x5065, 0x5066, 0x8166, 0x9066, 0x9166,
-        0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0
-};
-
-static const struct timedia_struct {
-        int num;
-        const unsigned short *ids;
-} timedia_data[] = {
-        { 1, timedia_single_port },
-        { 2, timedia_dual_port },
-        { 4, timedia_quad_port },
-        { 8, timedia_eight_port }
-};
-
-/*
- * There are nearly 70 different Timedia/SUNIX PCI serial devices.  Instead of
- * listing them individually, this driver merely grabs them all with
- * PCI_ANY_ID.  Some of these devices, however, also feature a parallel port,
- * and should be left free to be claimed by parport_serial instead.
- */
-static int pci_timedia_probe(struct pci_dev *dev)
-{
-        /*
-         * Check the third digit of the subdevice ID
-         * (0,2,3,5,6: serial only -- 7,8,9: serial + parallel)
-         */
-        if ((dev->subsystem_device & 0x00f0) >= 0x70) {
-                dev_info(&dev->dev,
-                        "ignoring Timedia subdevice %04x for parport_serial\n",
-                        dev->subsystem_device);
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-static int pci_timedia_init(struct pci_dev *dev)
-{
-        const unsigned short *ids;
-        int i, j;
-
-        for (i = 0; i < ARRAY_SIZE(timedia_data); 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 serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_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;
-                /* FALLTHROUGH */
-        case 4: /* BAR 2 */
-        case 5: /* BAR 3 */
-        case 6: /* BAR 4 */
-        case 7: /* BAR 5 */
-                bar = idx - 2;
-        }
-
-        return setup_port(priv, port, bar, offset, board->reg_shift);
-}
-
-/*
- * Some Titan cards are also a little weird
- */
-static int
-titan_400l_800l_setup(struct serial_private *priv,
-                      const struct pciserial_board *board,
-                      struct uart_8250_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(priv, port, bar, offset, board->reg_shift);
-}
-
-static int pci_xircom_init(struct pci_dev *dev)
-{
-        msleep(100);
-        return 0;
-}
-
-static int pci_ni8420_init(struct pci_dev *dev)
-{
-        void __iomem *p;
-        unsigned long base, len;
-        unsigned int bar = 0;
-
-        if ((pci_resource_flags(dev, bar) & IORESOURCE_MEM) == 0) {
-                moan_device("no memory in bar", dev);
-                return 0;
-        }
-
-        base = pci_resource_start(dev, bar);
-        len =  pci_resource_len(dev, bar);
-        p = ioremap_nocache(base, len);
-        if (p == NULL)
-                return -ENOMEM;
-
-        /* Enable CPU Interrupt */
-        writel(readl(p + NI8420_INT_ENABLE_REG) | NI8420_INT_ENABLE_BIT,
-               p + NI8420_INT_ENABLE_REG);
-
-        iounmap(p);
-        return 0;
-}
-
-#define MITE_IOWBSR1_WSIZE      0xa
-#define MITE_IOWBSR1_WIN_OFFSET 0x800
-#define MITE_IOWBSR1_WENAB      (1 << 7)
-#define MITE_LCIMR1_IO_IE_0     (1 << 24)
-#define MITE_LCIMR2_SET_CPU_IE  (1 << 31)
-#define MITE_IOWCR1_RAMSEL_MASK 0xfffffffe
-
-static int pci_ni8430_init(struct pci_dev *dev)
-{
-        void __iomem *p;
-        unsigned long base, len;
-        u32 device_window;
-        unsigned int bar = 0;
-
-        if ((pci_resource_flags(dev, bar) & IORESOURCE_MEM) == 0) {
-                moan_device("no memory in bar", dev);
-                return 0;
-        }
-
-        base = pci_resource_start(dev, bar);
-        len =  pci_resource_len(dev, bar);
-        p = ioremap_nocache(base, len);
-        if (p == NULL)
-                return -ENOMEM;
-
-        /* Set device window address and size in BAR0 */
-        device_window = ((base + MITE_IOWBSR1_WIN_OFFSET) & 0xffffff00)
-                        | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;
-        writel(device_window, p + MITE_IOWBSR1);
-
-        /* Set window access to go to RAMSEL IO address space */
-        writel((readl(p + MITE_IOWCR1) & MITE_IOWCR1_RAMSEL_MASK),
-               p + MITE_IOWCR1);
-
-        /* Enable IO Bus Interrupt 0 */
-        writel(MITE_LCIMR1_IO_IE_0, p + MITE_LCIMR1);
-
-        /* Enable CPU Interrupt */
-        writel(MITE_LCIMR2_SET_CPU_IE, p + MITE_LCIMR2);
-
-        iounmap(p);
-        return 0;
-}
-
-/* UART Port Control Register */
-#define NI8430_PORTCON  0x0f
-#define NI8430_PORTCON_TXVR_ENABLE      (1 << 3)
-
-static int
-pci_ni8430_setup(struct serial_private *priv,
-                 const struct pciserial_board *board,
-                 struct uart_8250_port *port, int idx)
-{
-        void __iomem *p;
-        unsigned long base, len;
-        unsigned int bar, offset = board->first_offset;
-
-        if (idx >= board->num_ports)
-                return 1;
-
-        bar = FL_GET_BASE(board->flags);
-        offset += idx * board->uart_offset;
-
-        base = pci_resource_start(priv->dev, bar);
-        len =  pci_resource_len(priv->dev, bar);
-        p = ioremap_nocache(base, len);
-
-        /* enable the transceiver */
-        writeb(readb(p + offset + NI8430_PORTCON) | NI8430_PORTCON_TXVR_ENABLE,
-               p + offset + NI8430_PORTCON);
-
-        iounmap(p);
-
-        return setup_port(priv, port, bar, offset, board->reg_shift);
-}
-
-static int pci_netmos_9900_setup(struct serial_private *priv,
-                                const struct pciserial_board *board,
-                                struct uart_8250_port *port, int idx)
-{
-        unsigned int bar;
-
-        if ((priv->dev->subsystem_device & 0xff00) == 0x3000) {
-                /* netmos apparently orders BARs by datasheet layout, so serial
-                 * ports get BARs 0 and 3 (or 1 and 4 for memmapped)
-                 */
-                bar = 3 * idx;
-
-                return setup_port(priv, port, bar, 0, board->reg_shift);
-        } else {
-                return pci_default_setup(priv, board, port, idx);
-        }
-}
-
-/* the 99xx series comes with a range of device IDs and a variety
- * of capabilities:
- *
- * 9900 has varying capabilities and can cascade to sub-controllers
- *   (cascading should be purely internal)
- * 9904 is hardwired with 4 serial ports
- * 9912 and 9922 are hardwired with 2 serial ports
- */
-static int pci_netmos_9900_numports(struct pci_dev *dev)
-{
-        unsigned int c = dev->class;
-        unsigned int pi;
-        unsigned short sub_serports;
-
-        pi = (c & 0xff);
-
-        if (pi == 2) {
-                return 1;
-        } else if ((pi == 0) &&
-                           (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {
-                /* two possibilities: 0x30ps encodes number of parallel and
-                 * serial ports, or 0x1000 indicates *something*. This is not
-                 * immediately obvious, since the 2s1p+4s configuration seems
-                 * to offer all functionality on functions 0..2, while still
-                 * advertising the same function 3 as the 4s+2s1p config.
-                 */
-                sub_serports = dev->subsystem_device & 0xf;
-                if (sub_serports > 0) {
-                        return sub_serports;
-                } else {
-                        printk(KERN_NOTICE "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
-                        return 0;
-                }
-        }
-
-        moan_device("unknown NetMos/Mostech program interface", dev);
-        return 0;
-}
-
-static int pci_netmos_init(struct pci_dev *dev)
-{
-        /* subdevice 0x00PS means <P> parallel, <S> serial */
-        unsigned int num_serial = dev->subsystem_device & 0xf;
-
-        if ((dev->device == PCI_DEVICE_ID_NETMOS_9901) ||
-                (dev->device == PCI_DEVICE_ID_NETMOS_9865))
-                return 0;
-
-        if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
-                        dev->subsystem_device == 0x0299)
-                return 0;
-
-        switch (dev->device) { /* FALLTHROUGH on all */
-                case PCI_DEVICE_ID_NETMOS_9904:
-                case PCI_DEVICE_ID_NETMOS_9912:
-                case PCI_DEVICE_ID_NETMOS_9922:
-                case PCI_DEVICE_ID_NETMOS_9900:
-                        num_serial = pci_netmos_9900_numports(dev);
-                        break;
-
-                default:
-                        if (num_serial == 0 ) {
-                                moan_device("unknown NetMos/Mostech device", dev);
-                        }
-        }
-
-        if (num_serial == 0)
-                return -ENODEV;
-
-        return num_serial;
-}
-
-/*
- * These chips are available with optionally one parallel port and up to
- * two serial ports. Unfortunately they all have the same product id.
- *
- * Basic configuration is done over a region of 32 I/O ports. The base
- * ioport is called INTA or INTC, depending on docs/other drivers.
- *
- * The region of the 32 I/O ports is configured in POSIO0R...
- */
-
-/* registers */
-#define ITE_887x_MISCR          0x9c
-#define ITE_887x_INTCBAR        0x78
-#define ITE_887x_UARTBAR        0x7c
-#define ITE_887x_PS0BAR         0x10
-#define ITE_887x_POSIO0         0x60
-
-/* I/O space size */
-#define ITE_887x_IOSIZE         32
-/* I/O space size (bits 26-24; 8 bytes = 011b) */
-#define ITE_887x_POSIO_IOSIZE_8         (3 << 24)
-/* I/O space size (bits 26-24; 32 bytes = 101b) */
-#define ITE_887x_POSIO_IOSIZE_32        (5 << 24)
-/* Decoding speed (1 = slow, 2 = medium, 3 = fast) */
-#define ITE_887x_POSIO_SPEED            (3 << 29)
-/* enable IO_Space bit */
-#define ITE_887x_POSIO_ENABLE           (1 << 31)
-
-static int pci_ite887x_init(struct pci_dev *dev)
-{
-        /* inta_addr are the configuration addresses of the ITE */
-        static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0,
-                                                        0x200, 0x280, 0 };
-        int ret, i, type;
-        struct resource *iobase = NULL;
-        u32 miscr, uartbar, ioport;
-
-        /* search for the base-ioport */
-        i = 0;
-        while (inta_addr[i] && iobase == NULL) {
-                iobase = request_region(inta_addr[i], ITE_887x_IOSIZE,
-                                                                "ite887x");
-                if (iobase != NULL) {
-                        /* write POSIO0R - speed | size | ioport */
-                        pci_write_config_dword(dev, ITE_887x_POSIO0,
-                                ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
-                                ITE_887x_POSIO_IOSIZE_32 | inta_addr[i]);
-                        /* write INTCBAR - ioport */
-                        pci_write_config_dword(dev, ITE_887x_INTCBAR,
-                                                                inta_addr[i]);
-                        ret = inb(inta_addr[i]);
-                        if (ret != 0xff) {
-                                /* ioport connected */
-                                break;
-                        }
-                        release_region(iobase->start, ITE_887x_IOSIZE);
-                        iobase = NULL;
-                }
-                i++;
-        }
-
-        if (!inta_addr[i]) {
-                printk(KERN_ERR "ite887x: could not find iobase\n");
-                return -ENODEV;
-        }
-
-        /* start of undocumented type checking (see parport_pc.c) */
-        type = inb(iobase->start + 0x18) & 0x0f;
-
-        switch (type) {
-        case 0x2:       /* ITE8871 (1P) */
-        case 0xa:       /* ITE8875 (1P) */
-                ret = 0;
-                break;
-        case 0xe:       /* ITE8872 (2S1P) */
-                ret = 2;
-                break;
-        case 0x6:       /* ITE8873 (1S) */
-                ret = 1;
-                break;
-        case 0x8:       /* ITE8874 (2S) */
-                ret = 2;
-                break;
-        default:
-                moan_device("Unknown ITE887x", dev);
-                ret = -ENODEV;
-        }
-
-        /* configure all serial ports */
-        for (i = 0; i < ret; i++) {
-                /* read the I/O port from the device */
-                pci_read_config_dword(dev, ITE_887x_PS0BAR + (0x4 * (i + 1)),
-                                                                &ioport);
-                ioport &= 0x0000FF00;   /* the actual base address */
-                pci_write_config_dword(dev, ITE_887x_POSIO0 + (0x4 * (i + 1)),
-                        ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
-                        ITE_887x_POSIO_IOSIZE_8 | ioport);
-
-                /* write the ioport to the UARTBAR */
-                pci_read_config_dword(dev, ITE_887x_UARTBAR, &uartbar);
-                uartbar &= ~(0xffff << (16 * i));       /* clear half the reg */
-                uartbar |= (ioport << (16 * i));        /* set the ioport */
-                pci_write_config_dword(dev, ITE_887x_UARTBAR, uartbar);
-
-                /* get current config */
-                pci_read_config_dword(dev, ITE_887x_MISCR, &miscr);
-                /* disable interrupts (UARTx_Routing[3:0]) */
-                miscr &= ~(0xf << (12 - 4 * i));
-                /* activate the UART (UARTx_En) */
-                miscr |= 1 << (23 - i);
-                /* write new config with activated UART */
-                pci_write_config_dword(dev, ITE_887x_MISCR, miscr);
-        }
-
-        if (ret <= 0) {
-                /* the device has no UARTs if we get here */
-                release_region(iobase->start, ITE_887x_IOSIZE);
-        }
-
-        return ret;
-}
-
-static void pci_ite887x_exit(struct pci_dev *dev)
-{
-        u32 ioport;
-        /* the ioport is bit 0-15 in POSIO0R */
-        pci_read_config_dword(dev, ITE_887x_POSIO0, &ioport);
-        ioport &= 0xffff;
-        release_region(ioport, ITE_887x_IOSIZE);
-}
-
-/*
- * Oxford Semiconductor Inc.
- * Check that device is part of the Tornado range of devices, then determine
- * the number of ports available on the device.
- */
-static int pci_oxsemi_tornado_init(struct pci_dev *dev)
-{
-        u8 __iomem *p;
-        unsigned long deviceID;
-        unsigned int  number_uarts = 0;
-
-        /* OxSemi Tornado devices are all 0xCxxx */
-        if (dev->vendor == PCI_VENDOR_ID_OXSEMI &&
-            (dev->device & 0xF000) != 0xC000)
-                return 0;
-
-        p = pci_iomap(dev, 0, 5);
-        if (p == NULL)
-                return -ENOMEM;
-
-        deviceID = ioread32(p);
-        /* Tornado device */
-        if (deviceID == 0x07000200) {
-                number_uarts = ioread8(p + 4);
-                printk(KERN_DEBUG
-                        "%d ports detected on Oxford PCI Express device\n",
-                                                                number_uarts);
-        }
-        pci_iounmap(dev, p);
-        return number_uarts;
-}
-
-static int pci_asix_setup(struct serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_port *port, int idx)
-{
-        port->bugs |= UART_BUG_PARITY;
-        return pci_default_setup(priv, board, port, idx);
-}
-
-static int pci_default_setup(struct serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_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(priv->dev, bar) - board->first_offset) >>
-                (board->reg_shift + 3);
-
-        if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
-                return 1;
-
-        return setup_port(priv, port, bar, offset, board->reg_shift);
-}
-
-static int
-ce4100_serial_setup(struct serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_port *port, int idx)
-{
-        int ret;
-
-        ret = setup_port(priv, port, idx, 0, board->reg_shift);
-        port->port.iotype = UPIO_MEM32;
-        port->port.type = PORT_XSCALE;
-        port->port.flags = (port->port.flags | UPF_FIXED_PORT | UPF_FIXED_TYPE);
-        port->port.regshift = 2;
-
-        return ret;
-}
-
-static int
-pci_omegapci_setup(struct serial_private *priv,
-                      const struct pciserial_board *board,
-                      struct uart_8250_port *port, int idx)
-{
-        return setup_port(priv, port, 2, idx * 8, 0);
-}
-
-static int skip_tx_en_setup(struct serial_private *priv,
-                        const struct pciserial_board *board,
-                        struct uart_8250_port *port, int idx)
-{
-        port->port.flags |= UPF_NO_TXEN_TEST;
-        printk(KERN_DEBUG "serial8250: skipping TxEn test for device "
-                          "[%04x:%04x] subsystem [%04x:%04x]\n",
-                          priv->dev->vendor,
-                          priv->dev->device,
-                          priv->dev->subsystem_vendor,
-                          priv->dev->subsystem_device);
-
-        return pci_default_setup(priv, board, port, idx);
-}
-
-static void kt_handle_break(struct uart_port *p)
-{
-        struct uart_8250_port *up =
-                container_of(p, struct uart_8250_port, port);
-        /*
-         * On receipt of a BI, serial device in Intel ME (Intel
-         * management engine) needs to have its fifos cleared for sane
-         * SOL (Serial Over Lan) output.
-         */
-        serial8250_clear_and_reinit_fifos(up);
-}
-
-static unsigned int kt_serial_in(struct uart_port *p, int offset)
-{
-        struct uart_8250_port *up =
-                container_of(p, struct uart_8250_port, port);
-        unsigned int val;
-
-        /*
-         * When the Intel ME (management engine) gets reset its serial
-         * port registers could return 0 momentarily.  Functions like
-         * serial8250_console_write, read and save the IER, perform
-         * some operation and then restore it.  In order to avoid
-         * setting IER register inadvertently to 0, if the value read
-         * is 0, double check with ier value in uart_8250_port and use
-         * that instead.  up->ier should be the same value as what is
-         * currently configured.
-         */
-        val = inb(p->iobase + offset);
-        if (offset == UART_IER) {
-                if (val == 0)
-                        val = up->ier;
-        }
-        return val;
-}
-
-static int kt_serial_setup(struct serial_private *priv,
-                           const struct pciserial_board *board,
-                           struct uart_8250_port *port, int idx)
-{
-        port->port.flags |= UPF_BUG_THRE;
-        port->port.serial_in = kt_serial_in;
-        port->port.handle_break = kt_handle_break;
-        return skip_tx_en_setup(priv, board, port, idx);
-}
-
-static int pci_eg20t_init(struct pci_dev *dev)
-{
-#if defined(CONFIG_SERIAL_PCH_UART) || defined(CONFIG_SERIAL_PCH_UART_MODULE)
-        return -ENODEV;
-#else
-        return 0;
-#endif
-}
-
-static int
-pci_xr17c154_setup(struct serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_port *port, int idx)
-{
-        port->port.flags |= UPF_EXAR_EFR;
-        return pci_default_setup(priv, board, port, idx);
-}
-
-static int
-pci_xr17v35x_setup(struct serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_port *port, int idx)
-{
-        u8 __iomem *p;
-
-        p = pci_ioremap_bar(priv->dev, 0);
-        if (p == NULL)
-                return -ENOMEM;
-
-        port->port.flags |= UPF_EXAR_EFR;
-
-        /*
-         * Setup Multipurpose Input/Output pins.
-         */
-        if (idx == 0) {
-                writeb(0x00, p + 0x8f); /*MPIOINT[7:0]*/
-                writeb(0x00, p + 0x90); /*MPIOLVL[7:0]*/
-                writeb(0x00, p + 0x91); /*MPIO3T[7:0]*/
-                writeb(0x00, p + 0x92); /*MPIOINV[7:0]*/
-                writeb(0x00, p + 0x93); /*MPIOSEL[7:0]*/
-                writeb(0x00, p + 0x94); /*MPIOOD[7:0]*/
-                writeb(0x00, p + 0x95); /*MPIOINT[15:8]*/
-                writeb(0x00, p + 0x96); /*MPIOLVL[15:8]*/
-                writeb(0x00, p + 0x97); /*MPIO3T[15:8]*/
-                writeb(0x00, p + 0x98); /*MPIOINV[15:8]*/
-                writeb(0x00, p + 0x99); /*MPIOSEL[15:8]*/
-                writeb(0x00, p + 0x9a); /*MPIOOD[15:8]*/
-        }
-        writeb(0x00, p + UART_EXAR_8XMODE);
-        writeb(UART_FCTR_EXAR_TRGD, p + UART_EXAR_FCTR);
-        writeb(128, p + UART_EXAR_TXTRG);
-        writeb(128, p + UART_EXAR_RXTRG);
-        iounmap(p);
-
-        return pci_default_setup(priv, board, port, idx);
-}
-
-#define PCI_DEVICE_ID_COMMTECH_4222PCI335 0x0004
-#define PCI_DEVICE_ID_COMMTECH_4224PCI335 0x0002
-#define PCI_DEVICE_ID_COMMTECH_2324PCI335 0x000a
-#define PCI_DEVICE_ID_COMMTECH_2328PCI335 0x000b
-
-static int
-pci_fastcom335_setup(struct serial_private *priv,
-                  const struct pciserial_board *board,
-                  struct uart_8250_port *port, int idx)
-{
-        u8 __iomem *p;
-
-        p = pci_ioremap_bar(priv->dev, 0);
-        if (p == NULL)
-                return -ENOMEM;
-
-        port->port.flags |= UPF_EXAR_EFR;
-
-        /*
-         * Setup Multipurpose Input/Output pins.
-         */
-        if (idx == 0) {
-                switch (priv->dev->device) {
-                case PCI_DEVICE_ID_COMMTECH_4222PCI335:
-                case PCI_DEVICE_ID_COMMTECH_4224PCI335:
-                        writeb(0x78, p + 0x90); /* MPIOLVL[7:0] */
-                        writeb(0x00, p + 0x92); /* MPIOINV[7:0] */
-                        writeb(0x00, p + 0x93); /* MPIOSEL[7:0] */
-                        break;
-                case PCI_DEVICE_ID_COMMTECH_2324PCI335:
-                case PCI_DEVICE_ID_COMMTECH_2328PCI335:
-                        writeb(0x00, p + 0x90); /* MPIOLVL[7:0] */
-                        writeb(0xc0, p + 0x92); /* MPIOINV[7:0] */
-                        writeb(0xc0, p + 0x93); /* MPIOSEL[7:0] */
-                        break;
-                }
-                writeb(0x00, p + 0x8f); /* MPIOINT[7:0] */
-                writeb(0x00, p + 0x91); /* MPIO3T[7:0] */
-                writeb(0x00, p + 0x94); /* MPIOOD[7:0] */
-        }
-        writeb(0x00, p + UART_EXAR_8XMODE);
-        writeb(UART_FCTR_EXAR_TRGD, p + UART_EXAR_FCTR);
-        writeb(32, p + UART_EXAR_TXTRG);
-        writeb(32, p + UART_EXAR_RXTRG);
-        iounmap(p);
-
-        return pci_default_setup(priv, board, port, idx);
-}
-
-static int
-pci_wch_ch353_setup(struct serial_private *priv,
-                    const struct pciserial_board *board,
-                    struct uart_8250_port *port, int idx)
-{
-        port->port.flags |= UPF_FIXED_TYPE;
-        port->port.type = PORT_16550A;
-        return pci_default_setup(priv, board, port, idx);
-}
-
-#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
-#define PCI_SUBDEVICE_ID_SIIG_DUAL_00   0x2500
-#define PCI_SUBDEVICE_ID_SIIG_DUAL_30   0x2530
-#define PCI_VENDOR_ID_ADVANTECH         0x13fe
-#define PCI_DEVICE_ID_INTEL_CE4100_UART 0x2e66
-#define PCI_DEVICE_ID_ADVANTECH_PCI3620 0x3620
-#define PCI_DEVICE_ID_TITAN_200I        0x8028
-#define PCI_DEVICE_ID_TITAN_400I        0x8048
-#define PCI_DEVICE_ID_TITAN_800I        0x8088
-#define PCI_DEVICE_ID_TITAN_800EH       0xA007
-#define PCI_DEVICE_ID_TITAN_800EHB      0xA008
-#define PCI_DEVICE_ID_TITAN_400EH       0xA009
-#define PCI_DEVICE_ID_TITAN_100E        0xA010
-#define PCI_DEVICE_ID_TITAN_200E        0xA012
-#define PCI_DEVICE_ID_TITAN_400E        0xA013
-#define PCI_DEVICE_ID_TITAN_800E        0xA014
-#define PCI_DEVICE_ID_TITAN_200EI       0xA016
-#define PCI_DEVICE_ID_TITAN_200EISI     0xA017
-#define PCI_DEVICE_ID_TITAN_400V3       0xA310
-#define PCI_DEVICE_ID_TITAN_410V3       0xA312
-#define PCI_DEVICE_ID_TITAN_800V3       0xA314
-#define PCI_DEVICE_ID_TITAN_800V3B      0xA315
-#define PCI_DEVICE_ID_OXSEMI_16PCI958   0x9538
-#define PCIE_DEVICE_ID_NEO_2_OX_IBM     0x00F6
-#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA  0xc001
-#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d
-#define PCI_VENDOR_ID_WCH               0x4348
-#define PCI_DEVICE_ID_WCH_CH353_4S      0x3453
-#define PCI_DEVICE_ID_WCH_CH353_2S1PF   0x5046
-#define PCI_DEVICE_ID_WCH_CH353_2S1P    0x7053
-#define PCI_VENDOR_ID_AGESTAR           0x5372
-#define PCI_DEVICE_ID_AGESTAR_9375      0x6872
-#define PCI_VENDOR_ID_ASIX              0x9710
-#define PCI_DEVICE_ID_COMMTECH_4222PCIE 0x0019
-#define PCI_DEVICE_ID_COMMTECH_4224PCIE 0x0020
-#define PCI_DEVICE_ID_COMMTECH_4228PCIE 0x0021
-
-
-/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
-#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
-
-/*
- * 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[] __refdata = {
-        /*
-        * ADDI-DATA GmbH communication cards <info@addi-data.com>
-        */
-        {
-                .vendor         = PCI_VENDOR_ID_ADDIDATA_OLD,
-                .device         = PCI_DEVICE_ID_ADDIDATA_APCI7800,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = addidata_apci7800_setup,
-        },
-        /*
-         * AFAVLAB cards - these may be called via parport_serial
-         *  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,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = PCI_DEVICE_ID_INTEL_8257X_SOL,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = skip_tx_en_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = PCI_DEVICE_ID_INTEL_82573L_SOL,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = skip_tx_en_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = PCI_DEVICE_ID_INTEL_82573E_SOL,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = skip_tx_en_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = PCI_DEVICE_ID_INTEL_CE4100_UART,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = ce4100_serial_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = PCI_DEVICE_ID_INTEL_PATSBURG_KT,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = kt_serial_setup,
-        },
-        /*
-         * ITE
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_ITE,
-                .device         = PCI_DEVICE_ID_ITE_8872,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ite887x_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ite887x_exit,
-        },
-        /*
-         * National Instruments
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PCI23216,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PCI2328,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PCI2324,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PCI2322,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PCI2324I,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PCI2322I,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PXI8420_23216,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PXI8420_2328,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PXI8420_2324,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PXI8420_2322,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PXI8422_2324,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_DEVICE_ID_NI_PXI8422_2322,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8420_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_ni8420_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_NI,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_ni8430_init,
-                .setup          = pci_ni8430_setup,
-                .exit           = pci_ni8430_exit,
-        },
-        /*
-         * 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           = 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           = pci_plx9050_exit,
-        },
-        /*
-         * PLX
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_PLX,
-                .device         = PCI_DEVICE_ID_PLX_9030,
-                .subvendor      = PCI_SUBVENDOR_ID_PERLE,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_PLX,
-                .device         = PCI_DEVICE_ID_PLX_9050,
-                .subvendor      = PCI_SUBVENDOR_ID_EXSYS,
-                .subdevice      = PCI_SUBDEVICE_ID_EXSYS_4055,
-                .init           = pci_plx9050_init,
-                .setup          = pci_default_setup,
-                .exit           = pci_plx9050_exit,
-        },
-        {
-                .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           = pci_plx9050_exit,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_PLX,
-                .device         = PCI_DEVICE_ID_PLX_9050,
-                .subvendor      = PCI_VENDOR_ID_PLX,
-                .subdevice      = PCI_SUBDEVICE_ID_UNKNOWN_0x1584,
-                .init           = pci_plx9050_init,
-                .setup          = pci_default_setup,
-                .exit           = 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           = 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           = 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           = 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           = 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           = sbs_exit,
-        },
-        /*
-         * SIIG cards - these may be called via parport_serial
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_SIIG,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_siig_init,
-                .setup          = pci_siig_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,
-                .probe          = pci_timedia_probe,
-                .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,
-        },
-        /*
-         * Exar cards
-         */
-        {
-                .vendor = PCI_VENDOR_ID_EXAR,
-                .device = PCI_DEVICE_ID_EXAR_XR17C152,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17c154_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_EXAR,
-                .device = PCI_DEVICE_ID_EXAR_XR17C154,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17c154_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_EXAR,
-                .device = PCI_DEVICE_ID_EXAR_XR17C158,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17c154_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_EXAR,
-                .device = PCI_DEVICE_ID_EXAR_XR17V352,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17v35x_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_EXAR,
-                .device = PCI_DEVICE_ID_EXAR_XR17V354,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17v35x_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_EXAR,
-                .device = PCI_DEVICE_ID_EXAR_XR17V358,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17v35x_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 - these may be called via parport_serial
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_NETMOS,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_netmos_init,
-                .setup          = pci_netmos_9900_setup,
-        },
-        /*
-         * For Oxford Semiconductor Tornado based devices
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_OXSEMI,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_oxsemi_tornado_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_MAINPINE,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_oxsemi_tornado_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_DIGI,
-                .device         = PCIE_DEVICE_ID_NEO_2_OX_IBM,
-                .subvendor              = PCI_SUBVENDOR_ID_IBM,
-                .subdevice              = PCI_ANY_ID,
-                .init                   = pci_oxsemi_tornado_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = 0x8811,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = 0x8812,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = 0x8813,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = PCI_VENDOR_ID_INTEL,
-                .device         = 0x8814,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = 0x10DB,
-                .device         = 0x8027,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = 0x10DB,
-                .device         = 0x8028,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = 0x10DB,
-                .device         = 0x8029,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = 0x10DB,
-                .device         = 0x800C,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        {
-                .vendor         = 0x10DB,
-                .device         = 0x800D,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .init           = pci_eg20t_init,
-                .setup          = pci_default_setup,
-        },
-        /*
-         * Cronyx Omega PCI (PLX-chip based)
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_PLX,
-                .device         = PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_omegapci_setup,
-        },
-        /* WCH CH353 2S1P card (16550 clone) */
-        {
-                .vendor         = PCI_VENDOR_ID_WCH,
-                .device         = PCI_DEVICE_ID_WCH_CH353_2S1P,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_wch_ch353_setup,
-        },
-        /* WCH CH353 4S card (16550 clone) */
-        {
-                .vendor         = PCI_VENDOR_ID_WCH,
-                .device         = PCI_DEVICE_ID_WCH_CH353_4S,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_wch_ch353_setup,
-        },
-        /* WCH CH353 2S1PF card (16550 clone) */
-        {
-                .vendor         = PCI_VENDOR_ID_WCH,
-                .device         = PCI_DEVICE_ID_WCH_CH353_2S1PF,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_wch_ch353_setup,
-        },
-        /*
-         * ASIX devices with FIFO bug
-         */
-        {
-                .vendor         = PCI_VENDOR_ID_ASIX,
-                .device         = PCI_ANY_ID,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_asix_setup,
-        },
-        /*
-         * Commtech, Inc. Fastcom adapters
-         *
-         */
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_4222PCI335,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_fastcom335_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_4224PCI335,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_fastcom335_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_2324PCI335,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_fastcom335_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_2328PCI335,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_fastcom335_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_4222PCIE,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17v35x_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_4224PCIE,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17v35x_setup,
-        },
-        {
-                .vendor = PCI_VENDOR_ID_COMMTECH,
-                .device = PCI_DEVICE_ID_COMMTECH_4228PCIE,
-                .subvendor      = PCI_ANY_ID,
-                .subdevice      = PCI_ANY_ID,
-                .setup          = pci_xr17v35x_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,
-                                const struct pciserial_board *board)
-{
-        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{_offsetinhex}
- *
- *  bn          = PCI BAR number
- *  bt          = Index using PCI BARs
- *  n           = number of serial ports
- *  baud        = baud rate
- *  offsetinhex = offset for each sequential port (in hex)
- *
- * This table is sorted by (in order): bn, bt, baud, offsetindex, n.
- *
- * 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_8_115200,
-
-        pbn_b0_1_921600,
-        pbn_b0_2_921600,
-        pbn_b0_4_921600,
-
-        pbn_b0_2_1130000,
-
-        pbn_b0_4_1152000,
-
-        pbn_b0_2_1152000_200,
-        pbn_b0_4_1152000_200,
-        pbn_b0_8_1152000_200,
-
-        pbn_b0_2_1843200,
-        pbn_b0_4_1843200,
-
-        pbn_b0_2_1843200_200,
-        pbn_b0_4_1843200_200,
-        pbn_b0_8_1843200_200,
-
-        pbn_b0_1_4000000,
-
-        pbn_b0_bt_1_115200,
-        pbn_b0_bt_2_115200,
-        pbn_b0_bt_4_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_16_115200,
-
-        pbn_b1_1_921600,
-        pbn_b1_2_921600,
-        pbn_b1_4_921600,
-        pbn_b1_8_921600,
-
-        pbn_b1_2_1250000,
-
-        pbn_b1_bt_1_115200,
-        pbn_b1_bt_2_115200,
-        pbn_b1_bt_4_115200,
-
-        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_2_115200,
-        pbn_b2_4_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_8_1152000,
-
-        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_2_115200,
-        pbn_b3_4_115200,
-        pbn_b3_8_115200,
-
-        pbn_b4_bt_2_921600,
-        pbn_b4_bt_4_921600,
-        pbn_b4_bt_8_921600,
-
-        /*
-         * Board-specific versions.
-         */
-        pbn_panacom,
-        pbn_panacom2,
-        pbn_panacom4,
-        pbn_plx_romulus,
-        pbn_oxsemi,
-        pbn_oxsemi_1_4000000,
-        pbn_oxsemi_2_4000000,
-        pbn_oxsemi_4_4000000,
-        pbn_oxsemi_8_4000000,
-        pbn_intel_i960,
-        pbn_sgi_ioc3,
-        pbn_computone_4,
-        pbn_computone_6,
-        pbn_computone_8,
-        pbn_sbsxrsio,
-        pbn_exar_XR17C152,
-        pbn_exar_XR17C154,
-        pbn_exar_XR17C158,
-        pbn_exar_XR17V352,
-        pbn_exar_XR17V354,
-        pbn_exar_XR17V358,
-        pbn_exar_ibm_saturn,
-        pbn_pasemi_1682M,
-        pbn_ni8430_2,
-        pbn_ni8430_4,
-        pbn_ni8430_8,
-        pbn_ni8430_16,
-        pbn_ADDIDATA_PCIe_1_3906250,
-        pbn_ADDIDATA_PCIe_2_3906250,
-        pbn_ADDIDATA_PCIe_4_3906250,
-        pbn_ADDIDATA_PCIe_8_3906250,
-        pbn_ce4100_1_115200,
-        pbn_omegapci,
-        pbn_NETMOS9900_2s_115200,
-};
-
-/*
- * 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 pciserial_board pci_boards[] = {
-        [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_8_115200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .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_2_1130000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 1130000,
-                .uart_offset    = 8,
-        },
-
-        [pbn_b0_4_1152000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 1152000,
-                .uart_offset    = 8,
-        },
-
-        [pbn_b0_2_1152000_200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 1152000,
-                .uart_offset    = 0x200,
-        },
-
-        [pbn_b0_4_1152000_200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 1152000,
-                .uart_offset    = 0x200,
-        },
-
-        [pbn_b0_8_1152000_200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 1152000,
-                .uart_offset    = 0x200,
-        },
-
-        [pbn_b0_2_1843200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 1843200,
-                .uart_offset    = 8,
-        },
-        [pbn_b0_4_1843200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 1843200,
-                .uart_offset    = 8,
-        },
-
-        [pbn_b0_2_1843200_200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 1843200,
-                .uart_offset    = 0x200,
-        },
-        [pbn_b0_4_1843200_200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 1843200,
-                .uart_offset    = 0x200,
-        },
-        [pbn_b0_8_1843200_200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 1843200,
-                .uart_offset    = 0x200,
-        },
-        [pbn_b0_1_4000000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 1,
-                .base_baud      = 4000000,
-                .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_4_115200] = {
-                .flags          = FL_BASE0|FL_BASE_BARS,
-                .num_ports      = 4,
-                .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_16_115200] = {
-                .flags          = FL_BASE1,
-                .num_ports      = 16,
-                .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_2_1250000] = {
-                .flags          = FL_BASE1,
-                .num_ports      = 2,
-                .base_baud      = 1250000,
-                .uart_offset    = 8,
-        },
-
-        [pbn_b1_bt_1_115200] = {
-                .flags          = FL_BASE1|FL_BASE_BARS,
-                .num_ports      = 1,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-        [pbn_b1_bt_2_115200] = {
-                .flags          = FL_BASE1|FL_BASE_BARS,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-        [pbn_b1_bt_4_115200] = {
-                .flags          = FL_BASE1|FL_BASE_BARS,
-                .num_ports      = 4,
-                .base_baud      = 115200,
-                .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_2_115200] = {
-                .flags          = FL_BASE2,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-        [pbn_b2_4_115200] = {
-                .flags          = FL_BASE2,
-                .num_ports      = 4,
-                .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_8_1152000] = {
-                .flags          = FL_BASE2,
-                .num_ports      = 8,
-                .base_baud      = 1152000,
-                .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_2_115200] = {
-                .flags          = FL_BASE3,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-                .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,
-        },
-
-        [pbn_b4_bt_2_921600] = {
-                .flags          = FL_BASE4,
-                .num_ports      = 2,
-                .base_baud      = 921600,
-                .uart_offset    = 8,
-        },
-        [pbn_b4_bt_4_921600] = {
-                .flags          = FL_BASE4,
-                .num_ports      = 4,
-                .base_baud      = 921600,
-                .uart_offset    = 8,
-        },
-        [pbn_b4_bt_8_921600] = {
-                .flags          = FL_BASE4,
-                .num_ports      = 8,
-                .base_baud      = 921600,
-                .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,
-        },
-        [pbn_oxsemi_1_4000000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 1,
-                .base_baud      = 4000000,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_oxsemi_2_4000000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 4000000,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_oxsemi_4_4000000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 4000000,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_oxsemi_8_4000000] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 4000000,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-
-
-        /*
-         * 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,
-        },
-
-        /*
-         * 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,
-        },
-        [pbn_exar_XR17V352] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 7812500,
-                .uart_offset    = 0x400,
-                .reg_shift      = 0,
-                .first_offset   = 0,
-        },
-        [pbn_exar_XR17V354] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 7812500,
-                .uart_offset    = 0x400,
-                .reg_shift      = 0,
-                .first_offset   = 0,
-        },
-        [pbn_exar_XR17V358] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 7812500,
-                .uart_offset    = 0x400,
-                .reg_shift      = 0,
-                .first_offset   = 0,
-        },
-        [pbn_exar_ibm_saturn] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 1,
-                .base_baud      = 921600,
-                .uart_offset    = 0x200,
-        },
-
-        /*
-         * PA Semi PWRficient PA6T-1682M on-chip UART
-         */
-        [pbn_pasemi_1682M] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 1,
-                .base_baud      = 8333333,
-        },
-        /*
-         * National Instruments 843x
-         */
-        [pbn_ni8430_16] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 16,
-                .base_baud      = 3686400,
-                .uart_offset    = 0x10,
-                .first_offset   = 0x800,
-        },
-        [pbn_ni8430_8] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 3686400,
-                .uart_offset    = 0x10,
-                .first_offset   = 0x800,
-        },
-        [pbn_ni8430_4] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 3686400,
-                .uart_offset    = 0x10,
-                .first_offset   = 0x800,
-        },
-        [pbn_ni8430_2] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 3686400,
-                .uart_offset    = 0x10,
-                .first_offset   = 0x800,
-        },
-        /*
-         * ADDI-DATA GmbH PCI-Express communication cards <info@addi-data.com>
-         */
-        [pbn_ADDIDATA_PCIe_1_3906250] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 1,
-                .base_baud      = 3906250,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_ADDIDATA_PCIe_2_3906250] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 3906250,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_ADDIDATA_PCIe_4_3906250] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 4,
-                .base_baud      = 3906250,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_ADDIDATA_PCIe_8_3906250] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 3906250,
-                .uart_offset    = 0x200,
-                .first_offset   = 0x1000,
-        },
-        [pbn_ce4100_1_115200] = {
-                .flags          = FL_BASE_BARS,
-                .num_ports      = 2,
-                .base_baud      = 921600,
-                .reg_shift      = 2,
-        },
-        [pbn_omegapci] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 115200,
-                .uart_offset    = 0x200,
-        },
-        [pbn_NETMOS9900_2s_115200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 2,
-                .base_baud      = 115200,
-        },
-};
-
-static const struct pci_device_id blacklist[] = {
-        /* softmodems */
-        { PCI_VDEVICE(AL, 0x5457), }, /* ALi Corporation M5457 AC'97 Modem */
-        { PCI_VDEVICE(MOTOROLA, 0x3052), }, /* Motorola Si3052-based modem */
-        { PCI_DEVICE(0x1543, 0x3052), }, /* Si3052-based modem, default IDs */
-
-        /* multi-io cards handled by parport_serial */
-        { PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */
-};
-
-/*
- * 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
-serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
-{
-        const struct pci_device_id *bldev;
-        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;
-
-        /*
-         * Do not access blacklisted devices that are known not to
-         * feature serial ports or are handled by other modules.
-         */
-        for (bldev = blacklist;
-             bldev < blacklist + ARRAY_SIZE(blacklist);
-             bldev++) {
-                if (dev->vendor == bldev->vendor &&
-                    dev->device == bldev->device)
-                        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(const struct pciserial_board *board,
-                   const struct pciserial_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;
-}
-
-struct serial_private *
-pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board)
-{
-        struct uart_8250_port uart;
-        struct serial_private *priv;
-        struct pci_serial_quirk *quirk;
-        int rc, nr_ports, i;
-
-        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) {
-                        priv = ERR_PTR(rc);
-                        goto err_out;
-                }
-                if (rc)
-                        nr_ports = rc;
-        }
-
-        priv = kzalloc(sizeof(struct serial_private) +
-                       sizeof(unsigned int) * nr_ports,
-                       GFP_KERNEL);
-        if (!priv) {
-                priv = ERR_PTR(-ENOMEM);
-                goto err_deinit;
-        }
-
-        priv->dev = dev;
-        priv->quirk = quirk;
-
-        memset(&uart, 0, sizeof(uart));
-        uart.port.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
-        uart.port.uartclk = board->base_baud * 16;
-        uart.port.irq = get_pci_irq(dev, board);
-        uart.port.dev = &dev->dev;
-
-        for (i = 0; i < nr_ports; i++) {
-                if (quirk->setup(priv, board, &uart, i))
-                        break;
-
-#ifdef SERIAL_DEBUG_PCI
-                printk(KERN_DEBUG "Setup PCI port: port %lx, irq %d, type %d\n",
-                       uart.port.iobase, uart.port.irq, uart.port.iotype);
-#endif
-
-                priv->line[i] = serial8250_register_8250_port(&uart);
-                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 priv;
-
-err_deinit:
-        if (quirk->exit)
-                quirk->exit(dev);
-err_out:
-        return priv;
-}
-EXPORT_SYMBOL_GPL(pciserial_init_ports);
-
-void pciserial_remove_ports(struct serial_private *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(priv->dev);
-        if (quirk->exit)
-                quirk->exit(priv->dev);
-
-        kfree(priv);
-}
-EXPORT_SYMBOL_GPL(pciserial_remove_ports);
-
-void pciserial_suspend_ports(struct serial_private *priv)
-{
-        int i;
-
-        for (i = 0; i < priv->nr; i++)
-                if (priv->line[i] >= 0)
-                        serial8250_suspend_port(priv->line[i]);
-
-        /*
-         * Ensure that every init quirk is properly torn down
-         */
-        if (priv->quirk->exit)
-                priv->quirk->exit(priv->dev);
-}
-EXPORT_SYMBOL_GPL(pciserial_suspend_ports);
-
-void pciserial_resume_ports(struct serial_private *priv)
-{
-        int i;
-
-        /*
-         * Ensure that the board is correctly configured.
-         */
-        if (priv->quirk->init)
-                priv->quirk->init(priv->dev);
-
-        for (i = 0; i < priv->nr; i++)
-                if (priv->line[i] >= 0)
-                        serial8250_resume_port(priv->line[i]);
-}
-EXPORT_SYMBOL_GPL(pciserial_resume_ports);
-
-/*
- * Probe one serial board.  Unfortunately, there is no rhyme nor reason
- * to the arrangement of serial ports on a PCI card.
- */
-static int
-pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
-{
-        struct pci_serial_quirk *quirk;
-        struct serial_private *priv;
-        const struct pciserial_board *board;
-        struct pciserial_board tmp;
-        int rc;
-
-        quirk = find_quirk(dev);
-        if (quirk->probe) {
-                rc = quirk->probe(dev);
-                if (rc)
-                        return rc;
-        }
-
-        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);
-        pci_save_state(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 pciserial_board));
-                board = &tmp;
-
-                /*
-                 * We matched one of our class entries.  Try to
-                 * determine the parameters of this board.
-                 */
-                rc = serial_pci_guess_board(dev, &tmp);
-                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 pciserial_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);
-        }
-
-        priv = pciserial_init_ports(dev, board);
-        if (!IS_ERR(priv)) {
-                pci_set_drvdata(dev, priv);
-                return 0;
-        }
-
-        rc = PTR_ERR(priv);
-
- disable:
-        pci_disable_device(dev);
-        return rc;
-}
-
-static void pciserial_remove_one(struct pci_dev *dev)
-{
-        struct serial_private *priv = pci_get_drvdata(dev);
-
-        pci_set_drvdata(dev, NULL);
-
-        pciserial_remove_ports(priv);
-
-        pci_disable_device(dev);
-}
-
-#ifdef CONFIG_PM
-static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
-{
-        struct serial_private *priv = pci_get_drvdata(dev);
-
-        if (priv)
-                pciserial_suspend_ports(priv);
-
-        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)
-{
-        int err;
-        struct serial_private *priv = pci_get_drvdata(dev);
-
-        pci_set_power_state(dev, PCI_D0);
-        pci_restore_state(dev);
-
-        if (priv) {
-                /*
-                 * The device may have been disabled.  Re-enable it.
-                 */
-                err = pci_enable_device(dev);
-                /* FIXME: We cannot simply error out here */
-                if (err)
-                        printk(KERN_ERR "pciserial: Unable to re-enable ports, trying to continue.\n");
-                pciserial_resume_ports(priv);
-        }
-        return 0;
-}
-#endif
-
-static struct pci_device_id serial_pci_tbl[] = {
-        /* Advantech use PCI_DEVICE_ID_ADVANTECH_PCI3620 (0x3620) as 'PCI_SUBVENDOR_ID' */
-        {       PCI_VENDOR_ID_ADVANTECH, PCI_DEVICE_ID_ADVANTECH_PCI3620,
-                PCI_DEVICE_ID_ADVANTECH_PCI3620, 0x0001, 0, 0,
-                pbn_b2_8_921600 },
-        {       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_V3, PCI_DEVICE_ID_V3_V351,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_20MHZ, 0, 0,
-                pbn_b1_2_1250000 },
-        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_2, 0, 0,
-                pbn_b0_2_1843200 },
-        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4, 0, 0,
-                pbn_b0_4_1843200 },
-        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
-                PCI_VENDOR_ID_AFAVLAB,
-                PCI_SUBDEVICE_ID_AFAVLAB_P061, 0, 0,
-                pbn_b0_4_1152000 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232, 0, 0,
-                pbn_b0_2_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C154,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_232, 0, 0,
-                pbn_b0_4_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C158,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_232, 0, 0,
-                pbn_b0_8_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_1_1, 0, 0,
-                pbn_b0_2_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C154,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_2, 0, 0,
-                pbn_b0_4_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C158,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_4, 0, 0,
-                pbn_b0_8_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2, 0, 0,
-                pbn_b0_2_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C154,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4, 0, 0,
-                pbn_b0_4_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C158,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8, 0, 0,
-                pbn_b0_8_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_485, 0, 0,
-                pbn_b0_2_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C154,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_485, 0, 0,
-                pbn_b0_4_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C158,
-                PCI_SUBVENDOR_ID_CONNECT_TECH,
-                PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485, 0, 0,
-                pbn_b0_8_1843200_200 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
-                PCI_VENDOR_ID_IBM, PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT,
-                0, 0, pbn_exar_ibm_saturn },
-
-        {       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_7803,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b2_8_460800 },
-        {       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 },
-        /* Unknown card - subdevice 0x1584 */
-        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
-                PCI_VENDOR_ID_PLX,
-                PCI_SUBDEVICE_ID_UNKNOWN_0x1584, 0, 0,
-                pbn_b0_4_115200 },
-        {       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_9030,
-                PCI_VENDOR_ID_ESDGMBH,
-                PCI_DEVICE_ID_ESDGMBH_CPCIASIO4, 0, 0,
-                pbn_b2_4_115200 },
-        {       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 },
-        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
-                PCI_SUBVENDOR_ID_EXSYS,
-                PCI_SUBDEVICE_ID_EXSYS_4055, 0, 0,
-                pbn_b2_4_115200 },
-        /*
-         * 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_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL,
-                0, 0,
-                pbn_b0_4_1152000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0x9505,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_bt_2_921600 },
-
-                /*
-                 * The below card is a little controversial since it is the
-                 * subject of a PCI vendor/device ID clash.  (See
-                 * www.ussg.iu.edu/hypermail/linux/kernel/0303.1/0516.html).
-                 * For now just used the hex ID 0x950a.
-                 */
-        {       PCI_VENDOR_ID_OXSEMI, 0x950a,
-                PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_00,
-                0, 0, pbn_b0_2_115200 },
-        {       PCI_VENDOR_ID_OXSEMI, 0x950a,
-                PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_30,
-                0, 0, pbn_b0_2_115200 },
-        {       PCI_VENDOR_ID_OXSEMI, 0x950a,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_2_1130000 },
-        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_C950,
-                PCI_VENDOR_ID_OXSEMI, PCI_SUBDEVICE_ID_OXSEMI_C950, 0, 0,
-                pbn_b0_1_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 },
-        {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,
-                PCI_ANY_ID , PCI_ANY_ID, 0, 0,
-                pbn_b2_8_1152000 },
-
-        /*
-         * Oxford Semiconductor Inc. Tornado PCI express device range.
-         */
-        {       PCI_VENDOR_ID_OXSEMI, 0xc101,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc105,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc11b,    /* OXPCIe952 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc11f,    /* OXPCIe952 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc120,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc124,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc138,    /* OXPCIe952 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc13d,    /* OXPCIe952 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc140,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc141,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc144,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc145,    /* OXPCIe952 1 Legacy UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc158,    /* OXPCIe952 2 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_2_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc15d,    /* OXPCIe952 2 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_2_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc208,    /* OXPCIe954 4 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_4_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc20d,    /* OXPCIe954 4 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_4_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc308,    /* OXPCIe958 8 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_8_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc30d,    /* OXPCIe958 8 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_8_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc40b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc40f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc41b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc41f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc42b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc42f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc43b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc43f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc44b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc44f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc45b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc45f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc46b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc46f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc47b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc47f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc48b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc48f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc49b,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc49f,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc4ab,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc4af,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc4bb,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc4bf,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc4cb,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_OXSEMI, 0xc4cf,    /* OXPCIe200 1 Native UART */
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        /*
-         * Mainpine Inc. IQ Express "Rev3" utilizing OxSemi Tornado
-         */
-        {       PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 1 Port V.34 Super-G3 Fax */
-                PCI_VENDOR_ID_MAINPINE, 0x4001, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 2 Port V.34 Super-G3 Fax */
-                PCI_VENDOR_ID_MAINPINE, 0x4002, 0, 0,
-                pbn_oxsemi_2_4000000 },
-        {       PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 4 Port V.34 Super-G3 Fax */
-                PCI_VENDOR_ID_MAINPINE, 0x4004, 0, 0,
-                pbn_oxsemi_4_4000000 },
-        {       PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 8 Port V.34 Super-G3 Fax */
-                PCI_VENDOR_ID_MAINPINE, 0x4008, 0, 0,
-                pbn_oxsemi_8_4000000 },
-
-        /*
-         * Digi/IBM PCIe 2-port Async EIA-232 Adapter utilizing OxSemi Tornado
-         */
-        {       PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_2_OX_IBM,
-                PCI_SUBVENDOR_ID_IBM, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_2_4000000 },
-
-        /*
-         * 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_TITAN, PCI_DEVICE_ID_TITAN_200I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b4_bt_2_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b4_bt_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b4_bt_8_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400EH,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EH,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EHB,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100E,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_1_4000000 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200E,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_2_4000000 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400E,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_4_4000000 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800E,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_8_4000000 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EI,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_2_4000000 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EISI,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_oxsemi_2_4000000 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400V3,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_410V3,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800V3,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800V3B,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_4_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 },
-        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_550,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_bt_8_921600 },
-        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_650,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_bt_8_921600 },
-        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_850,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_bt_8_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_QUATTRO_A,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b0_bt_2_115200 },
-        {       PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATTRO_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 },
-
-        /*
-         * Korenix Jetcard F0/F1 cards (JC1204, JC1208, JC1404, JC1408).
-         * Cards are identified by their subsystem vendor IDs, which
-         * (in hex) match the model number.
-         *
-         * Note that JC140x are RS422/485 cards which require ox950
-         * ACR = 0x10, and as such are not currently fully supported.
-         */
-        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
-                0x1204, 0x0004, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
-                0x1208, 0x0004, 0, 0,
-                pbn_b0_4_921600 },
-/*      {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
-                0x1402, 0x0002, 0, 0,
-                pbn_b0_2_921600 }, */
-/*      {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF0,
-                0x1404, 0x0004, 0, 0,
-                pbn_b0_4_921600 }, */
-        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF1,
-                0x1208, 0x0004, 0, 0,
-                pbn_b0_4_921600 },
-
-        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF2,
-                0x1204, 0x0004, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF2,
-                0x1208, 0x0004, 0, 0,
-                pbn_b0_4_921600 },
-        {       PCI_VENDOR_ID_KORENIX, PCI_DEVICE_ID_KORENIX_JETCARDF3,
-                0x1208, 0x0004, 0, 0,
-                pbn_b0_4_921600 },
-        /*
-         * 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 },
-
-        {       PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b3_2_115200 },
-        {       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 },
-        /*
-         * Exar Corp. XR17V35[248] Dual/Quad/Octal PCIe UARTs
-         */
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V352,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_exar_XR17V352 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V354,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_exar_XR17V354 },
-        {       PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V358,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_exar_XR17V358 },
-
-        /*
-         * 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 },
-        /*
-         * ITE
-         */
-        {       PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8872,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0,
-                pbn_b1_bt_1_115200 },
-
-        /*
-         * IntaShield IS-200
-         */
-        {       PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,   /* 135a.0811 */
-                pbn_b2_2_115200 },
-        /*
-         * IntaShield IS-400
-         */
-        {       PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,    /* 135a.0dc0 */
-                pbn_b2_4_115200 },
-        /*
-         * Perle PCI-RAS cards
-         */
-        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,
-                PCI_SUBVENDOR_ID_PERLE, PCI_SUBDEVICE_ID_PCI_RAS4,
-                0, 0, pbn_b2_4_921600 },
-        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,
-                PCI_SUBVENDOR_ID_PERLE, PCI_SUBDEVICE_ID_PCI_RAS8,
-                0, 0, pbn_b2_8_921600 },
-
-        /*
-         * Mainpine series cards: Fairly standard layout but fools
-         * parts of the autodetect in some cases and uses otherwise
-         * unmatched communications subclasses in the PCI Express case
-         */
-
-        {       /* RockForceDUO */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0200,
-                0, 0, pbn_b0_2_115200 },
-        {       /* RockForceQUATRO */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0300,
-                0, 0, pbn_b0_4_115200 },
-        {       /* RockForceDUO+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0400,
-                0, 0, pbn_b0_2_115200 },
-        {       /* RockForceQUATRO+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0500,
-                0, 0, pbn_b0_4_115200 },
-        {       /* RockForce+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0600,
-                0, 0, pbn_b0_2_115200 },
-        {       /* RockForce+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0700,
-                0, 0, pbn_b0_4_115200 },
-        {       /* RockForceOCTO+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0800,
-                0, 0, pbn_b0_8_115200 },
-        {       /* RockForceDUO+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0C00,
-                0, 0, pbn_b0_2_115200 },
-        {       /* RockForceQUARTRO+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x0D00,
-                0, 0, pbn_b0_4_115200 },
-        {       /* RockForceOCTO+ */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x1D00,
-                0, 0, pbn_b0_8_115200 },
-        {       /* RockForceD1 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2000,
-                0, 0, pbn_b0_1_115200 },
-        {       /* RockForceF1 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2100,
-                0, 0, pbn_b0_1_115200 },
-        {       /* RockForceD2 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2200,
-                0, 0, pbn_b0_2_115200 },
-        {       /* RockForceF2 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2300,
-                0, 0, pbn_b0_2_115200 },
-        {       /* RockForceD4 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2400,
-                0, 0, pbn_b0_4_115200 },
-        {       /* RockForceF4 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2500,
-                0, 0, pbn_b0_4_115200 },
-        {       /* RockForceD8 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2600,
-                0, 0, pbn_b0_8_115200 },
-        {       /* RockForceF8 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x2700,
-                0, 0, pbn_b0_8_115200 },
-        {       /* IQ Express D1 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3000,
-                0, 0, pbn_b0_1_115200 },
-        {       /* IQ Express F1 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3100,
-                0, 0, pbn_b0_1_115200 },
-        {       /* IQ Express D2 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3200,
-                0, 0, pbn_b0_2_115200 },
-        {       /* IQ Express F2 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3300,
-                0, 0, pbn_b0_2_115200 },
-        {       /* IQ Express D4 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3400,
-                0, 0, pbn_b0_4_115200 },
-        {       /* IQ Express F4 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3500,
-                0, 0, pbn_b0_4_115200 },
-        {       /* IQ Express D8 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3C00,
-                0, 0, pbn_b0_8_115200 },
-        {       /* IQ Express F8 */
-                PCI_VENDOR_ID_MAINPINE, PCI_DEVICE_ID_MAINPINE_PBRIDGE,
-                PCI_VENDOR_ID_MAINPINE, 0x3D00,
-                0, 0, pbn_b0_8_115200 },
-
-
-        /*
-         * PA Semi PA6T-1682M on-chip UART
-         */
-        {       PCI_VENDOR_ID_PASEMI, 0xa004,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_pasemi_1682M },
-
-        /*
-         * National Instruments
-         */
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI23216,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_16_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2328,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_8_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_4_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_2_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2324I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_4_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2322I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_2_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_23216,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_16_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_2328,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_8_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_4_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_2_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8422_2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_4_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8422_2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_b1_bt_2_115200 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_2 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_2 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_4 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_4 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_2328,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_8 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_2328,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_8 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_23216,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_16 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_23216,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_16 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8432_2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_2 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8432_2322,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_2 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8432_2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_4 },
-        {       PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8432_2324,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_ni8430_4 },
-
-        /*
-        * ADDI-DATA GmbH communication cards <info@addi-data.com>
-        */
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7500,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_4_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7420,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_2_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7300,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA_OLD,
-                PCI_DEVICE_ID_ADDIDATA_APCI7800,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b1_8_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7500_2,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_4_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7420_2,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_2_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7300_2,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7500_3,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_4_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7420_3,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_2_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7300_3,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCI7800_3,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_b0_8_115200 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCIe7500,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_ADDIDATA_PCIe_4_3906250 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCIe7420,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_ADDIDATA_PCIe_2_3906250 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCIe7300,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_ADDIDATA_PCIe_1_3906250 },
-
-        {       PCI_VENDOR_ID_ADDIDATA,
-                PCI_DEVICE_ID_ADDIDATA_APCIe7800,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                pbn_ADDIDATA_PCIe_8_3906250 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
-                PCI_VENDOR_ID_IBM, 0x0299,
-                0, 0, pbn_b0_bt_2_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,
-                0xA000, 0x1000,
-                0, 0, pbn_b0_1_115200 },
-
-        /* the 9901 is a rebranded 9912 */
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9912,
-                0xA000, 0x1000,
-                0, 0, pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9922,
-                0xA000, 0x1000,
-                0, 0, pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9904,
-                0xA000, 0x1000,
-                0, 0, pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
-                0xA000, 0x1000,
-                0, 0, pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
-                0xA000, 0x3002,
-                0, 0, pbn_NETMOS9900_2s_115200 },
-
-        /*
-         * Best Connectivity and Rosewill PCI Multi I/O cards
-         */
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
-                0xA000, 0x1000,
-                0, 0, pbn_b0_1_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
-                0xA000, 0x3002,
-                0, 0, pbn_b0_bt_2_115200 },
-
-        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
-                0xA000, 0x3004,
-                0, 0, pbn_b0_bt_4_115200 },
-        /* Intel CE4100 */
-        {       PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CE4100_UART,
-                PCI_ANY_ID,  PCI_ANY_ID, 0, 0,
-                pbn_ce4100_1_115200 },
-
-        /*
-         * Cronyx Omega PCI
-         */
-        {       PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-                pbn_omegapci },
-
-        /*
-         * AgeStar as-prs2-009
-         */
-        {       PCI_VENDOR_ID_AGESTAR, PCI_DEVICE_ID_AGESTAR_9375,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, pbn_b0_bt_2_115200 },
-
-        /*
-         * WCH CH353 series devices: The 2S1P is handled by parport_serial
-         * so not listed here.
-         */
-        {       PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_4S,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, pbn_b0_bt_4_115200 },
-
-        {       PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_2S1PF,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, pbn_b0_bt_2_115200 },
-
-        /*
-         * Commtech, Inc. Fastcom adapters
-         */
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_4222PCI335,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_b0_2_1152000_200 },
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_4224PCI335,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_b0_4_1152000_200 },
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_2324PCI335,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_b0_4_1152000_200 },
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_2328PCI335,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_b0_8_1152000_200 },
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_4222PCIE,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_exar_XR17V352 },
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_4224PCIE,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_exar_XR17V354 },
-        {       PCI_VENDOR_ID_COMMTECH, PCI_DEVICE_ID_COMMTECH_4228PCIE,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0,
-                0, pbn_exar_XR17V358 },
-
-        /*
-         * 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 pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev,
-                                                pci_channel_state_t state)
-{
-        struct serial_private *priv = pci_get_drvdata(dev);
-
-        if (state == pci_channel_io_perm_failure)
-                return PCI_ERS_RESULT_DISCONNECT;
-
-        if (priv)
-                pciserial_suspend_ports(priv);
-
-        pci_disable_device(dev);
-
-        return PCI_ERS_RESULT_NEED_RESET;
-}
-
-static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev)
-{
-        int rc;
-
-        rc = pci_enable_device(dev);
-
-        if (rc)
-                return PCI_ERS_RESULT_DISCONNECT;
-
-        pci_restore_state(dev);
-        pci_save_state(dev);
-
-        return PCI_ERS_RESULT_RECOVERED;
-}
-
-static void serial8250_io_resume(struct pci_dev *dev)
-{
-        struct serial_private *priv = pci_get_drvdata(dev);
-
-        if (priv)
-                pciserial_resume_ports(priv);
-}
-
-static const struct pci_error_handlers serial8250_err_handler = {
-        .error_detected = serial8250_io_error_detected,
-        .slot_reset = serial8250_io_slot_reset,
-        .resume = serial8250_io_resume,
-};
-
-static struct pci_driver serial_pci_driver = {
-        .name           = "serial",
-        .probe          = pciserial_init_one,
-        .remove         = pciserial_remove_one,
-#ifdef CONFIG_PM
-        .suspend        = pciserial_suspend_one,
-        .resume         = pciserial_resume_one,
-#endif
-        .id_table       = serial_pci_tbl,
-        .err_handler    = &serial8250_err_handler,
-};
-
-module_pci_driver(serial_pci_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic 8250/16x50 PCI serial probe module");
-MODULE_DEVICE_TABLE(pci, serial_pci_tbl);
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
deleted file mode 100644
index 35d9ab95c5c..00000000000
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- *  Probe 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.
- */
-#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
-#define CIR_PORT        0x0800
-
-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       },
-        /* Davicom ISA 33.6K Modem */
-        {       "DAV0336",              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       },
-        /* Archtek SmartLink Modem 3334BRV 33.6K Data Fax Voice */
-        {       "GVC0303",              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       },
-        /* Intermec */
-        /* Intermec CV60 touchscreen port */
-        {       "PNP4972",              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 336i PnP Voice Modem */
-        {       "SUP1381",              0       },
-        /* SupraExpress 33.6 Data/Fax PnP modem */
-        {       "SUP1421",              0       },
-        /* SupraExpress 33.6 Data/Fax PnP modem */
-        {       "SUP1590",              0       },
-        /* SupraExpress 336i Sp ASVD */
-        {       "SUP1620",              0       },
-        /* SupraExpress 33.6 Data/Fax PnP modem */
-        {       "SUP1760",              0       },
-        /* SupraExpress 56i Sp Intl */
-        {       "SUP2171",              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       },
-        /* Wacom tablets */
-        {       "WACFXXX",              0       },
-        /* Compaq touchscreen */
-        {       "FPI2002",              0 },
-        /* Fujitsu Stylistic touchscreens */
-        {       "FUJ02B2",              0 },
-        {       "FUJ02B3",              0 },
-        /* Fujitsu Stylistic LT touchscreens */
-        {       "FUJ02B4",              0 },
-        /* Passive Fujitsu Stylistic touchscreens */
-        {       "FUJ02B6",              0 },
-        {       "FUJ02B7",              0 },
-        {       "FUJ02B8",              0 },
-        {       "FUJ02B9",              0 },
-        {       "FUJ02BC",              0 },
-        /* Fujitsu Wacom Tablet PC device */
-        {       "FUJ02E5",              0       },
-        /* Fujitsu P-series tablet PC device */
-        {       "FUJ02E6",              0       },
-        /* Fujitsu Wacom 2FGT Tablet PC device */
-        {       "FUJ02E7",              0       },
-        /* Fujitsu Wacom 1FGT Tablet PC device */
-        {       "FUJ02E9",              0       },
-        /*
-         * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in
-         * disguise)
-         */
-        {       "LTS0001",              0       },
-        /* Rockwell's (PORALiNK) 33600 INT PNP */
-        {       "WCI0003",              0       },
-        /* Unknown PnP modems */
-        {       "PNPCXXX",              UNKNOWN_DEV     },
-        /* More unknown PnP modems */
-        {       "PNPDXXX",              UNKNOWN_DEV     },
-        /* Winbond CIR port, should not be probed. We should keep track
-           of it to prevent the legacy serial driver from probing it */
-        {       "WEC1022",              CIR_PORT        },
-        {       "",                     0       }
-};
-
-MODULE_DEVICE_TABLE(pnp, pnp_dev_table);
-
-static char *modem_names[] = {
-        "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 check_name(char *name)
-{
-        char **tmp;
-
-        for (tmp = modem_names; *tmp; tmp++)
-                if (strstr(name, *tmp))
-                        return 1;
-
-        return 0;
-}
-
-static int check_resources(struct pnp_dev *dev)
-{
-        resource_size_t base[] = {0x2f8, 0x3f8, 0x2e8, 0x3e8};
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(base); i++) {
-                if (pnp_possible_config(dev, IORESOURCE_IO, base[i], 8))
-                        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 serial_pnp_guess_board(struct pnp_dev *dev)
-{
-        if (!(check_name(pnp_dev_name(dev)) ||
-                (dev->card && check_name(dev->card->name))))
-                        return -ENODEV;
-
-        if (check_resources(dev))
-                return 0;
-
-        return -ENODEV;
-}
-
-static int
-serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
-{
-        struct uart_8250_port uart;
-        int ret, line, flags = dev_id->driver_data;
-
-        if (flags & UNKNOWN_DEV) {
-                ret = serial_pnp_guess_board(dev);
-                if (ret < 0)
-                        return ret;
-        }
-
-        memset(&uart, 0, sizeof(uart));
-        if (pnp_irq_valid(dev, 0))
-                uart.port.irq = pnp_irq(dev, 0);
-        if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {
-                uart.port.iobase = pnp_port_start(dev, 2);
-                uart.port.iotype = UPIO_PORT;
-        } else if (pnp_port_valid(dev, 0)) {
-                uart.port.iobase = pnp_port_start(dev, 0);
-                uart.port.iotype = UPIO_PORT;
-        } else if (pnp_mem_valid(dev, 0)) {
-                uart.port.mapbase = pnp_mem_start(dev, 0);
-                uart.port.iotype = UPIO_MEM;
-                uart.port.flags = UPF_IOREMAP;
-        } else
-                return -ENODEV;
-
-#ifdef SERIAL_DEBUG_PNP
-        printk(KERN_DEBUG
-                "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
-                       uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype);
-#endif
-        if (flags & CIR_PORT) {
-                uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;
-                uart.port.type = PORT_8250_CIR;
-        }
-
-        uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
-        if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)
-                uart.port.flags |= UPF_SHARE_IRQ;
-        uart.port.uartclk = 1843200;
-        uart.port.dev = &dev->dev;
-
-        line = serial8250_register_8250_port(&uart);
-        if (line < 0 || (flags & CIR_PORT))
-                return -ENODEV;
-
-        pnp_set_drvdata(dev, (void *)((long)line + 1));
-        return 0;
-}
-
-static void serial_pnp_remove(struct pnp_dev *dev)
-{
-        long line = (long)pnp_get_drvdata(dev);
-        if (line)
-                serial8250_unregister_port(line - 1);
-}
-
-#ifdef CONFIG_PM
-static int serial_pnp_suspend(struct pnp_dev *dev, pm_message_t state)
-{
-        long line = (long)pnp_get_drvdata(dev);
-
-        if (!line)
-                return -ENODEV;
-        serial8250_suspend_port(line - 1);
-        return 0;
-}
-
-static int serial_pnp_resume(struct pnp_dev *dev)
-{
-        long line = (long)pnp_get_drvdata(dev);
-
-        if (!line)
-                return -ENODEV;
-        serial8250_resume_port(line - 1);
-        return 0;
-}
-#else
-#define serial_pnp_suspend NULL
-#define serial_pnp_resume NULL
-#endif /* CONFIG_PM */
-
-static struct pnp_driver serial_pnp_driver = {
-        .name           = "serial",
-        .probe          = serial_pnp_probe,
-        .remove         = serial_pnp_remove,
-        .suspend        = serial_pnp_suspend,
-        .resume         = serial_pnp_resume,
-        .id_table       = pnp_dev_table,
-};
-
-int serial8250_pnp_init(void)
-{
-        return pnp_register_driver(&serial_pnp_driver);
-}
-
-void serial8250_pnp_exit(void)
-{
-        pnp_unregister_driver(&serial_pnp_driver);
-}
-
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
deleted file mode 100644
index c31133a6ea8..00000000000
--- a/drivers/tty/serial/8250/Kconfig
+++ /dev/null
@@ -1,279 +0,0 @@
-#
-# The 8250/16550 serial drivers.  You shouldn't be in this list unless
-# you somehow have an implicit or explicit dependency on SERIAL_8250.
-#
-
-config SERIAL_8250
-        tristate "8250/16550 and compatible serial support"
-        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 8250.
-          [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_PNP
-        bool "8250/16550 PNP device support" if EXPERT
-        depends on SERIAL_8250 && PNP
-        default y
-        ---help---
-          This builds standard PNP serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-
-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.
-
-          You can set that using a kernel command line option such as
-          "console=uart8250,io,0x3f8,9600n8"
-          "console=uart8250,mmio,0xff5e0000,115200n8".
-          and it will switch to normal serial console when the corresponding
-          port is ready.
-          "earlycon=uart8250,io,0x3f8,9600n8"
-          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
-          it will not only setup early console.
-
-          If unsure, say N.
-
-config FIX_EARLYCON_MEM
-        bool
-        depends on X86
-        default y
-
-config SERIAL_8250_GSC
-        tristate
-        depends on SERIAL_8250 && GSC
-        default SERIAL_8250
-
-config SERIAL_8250_PCI
-        tristate "8250/16550 PCI device support" if EXPERT
-        depends on SERIAL_8250 && PCI
-        default SERIAL_8250
-        help
-          This builds standard PCI serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-          Saves about 9K.
-
-config SERIAL_8250_HP300
-        tristate
-        depends on SERIAL_8250 && HP300
-        default SERIAL_8250
-
-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_NR_UARTS
-        int "Maximum number of 8250/16550 serial ports"
-        depends on SERIAL_8250
-        default "4"
-        help
-          Set this to the number of 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, or any ISA multi-port serial cards.
-
-config SERIAL_8250_RUNTIME_UARTS
-        int "Number of 8250/16550 serial ports to register at runtime"
-        depends on SERIAL_8250
-        range 0 SERIAL_8250_NR_UARTS
-        default "4"
-        help
-          Set this to the maximum number of serial ports you want
-          the kernel to register at boot time.  This can be overridden
-          with the module parameter "nr_uarts", or boot-time parameter
-          8250.nr_uarts
-
-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.
-
-#
-# Multi-port serial cards
-#
-
-config SERIAL_8250_FOURPORT
-        tristate "Support Fourport cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an AST FourPort serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_fourport.
-
-config SERIAL_8250_ACCENT
-        tristate "Support Accent cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an Accent Async serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_accent.
-
-config SERIAL_8250_BOCA
-        tristate "Support Boca cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a Boca serial board.  Please read the Boca
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_boca.
-
-config SERIAL_8250_EXAR_ST16C554
-        tristate "Support Exar ST16C554/554D Quad UART"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
-          tinkering with your Envoy TU301, or have a machine with this UART,
-          say Y here.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_exar_st16c554.
-
-config SERIAL_8250_HUB6
-        tristate "Support Hub6 cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a HUB6 serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_hub6.
-
-#
-# Misc. options/drivers.
-#
-
-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_RSA
-        bool "Support RSA serial ports"
-        depends on SERIAL_8250_EXTENDED
-        help
-          ::: To be written :::
-
-config SERIAL_8250_ACORN
-        tristate "Acorn expansion card serial port support"
-        depends on 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_8250_RM9K
-        bool "Support for MIPS RM9xxx integrated serial port"
-        depends on SERIAL_8250 != n && SERIAL_RM9000
-        select SERIAL_8250_SHARE_IRQ
-        help
-          Selecting this option will add support for the integrated serial
-          port hardware found on MIPS RM9122 and similar processors.
-          If unsure, say N.
-
-config SERIAL_8250_FSL
-        bool
-        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
-        default PPC
-
-config SERIAL_8250_DW
-        tristate "Support for Synopsys DesignWare 8250 quirks"
-        depends on SERIAL_8250 && OF
-        help
-          Selecting this option will enable handling of the extra features
-          present in the Synopsys DesignWare APB UART.
-
-config SERIAL_8250_EM
-        tristate "Support for Emma Mobile integrated serial port"
-        depends on SERIAL_8250 && ARM && HAVE_CLK
-        help
-          Selecting this option will add support for the integrated serial
-          port hardware found on the Emma Mobile line of processors.
-          If unsure, say N.
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
deleted file mode 100644
index 108fe7fe13e..00000000000
--- a/drivers/tty/serial/8250/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Makefile for the 8250 serial device drivers.
-#
-
-obj-$(CONFIG_SERIAL_8250)               += 8250_core.o
-8250_core-y                             := 8250.o
-8250_core-$(CONFIG_SERIAL_8250_PNP)     += 8250_pnp.o
-obj-$(CONFIG_SERIAL_8250_GSC)           += 8250_gsc.o
-obj-$(CONFIG_SERIAL_8250_PCI)           += 8250_pci.o
-obj-$(CONFIG_SERIAL_8250_HP300)         += 8250_hp300.o
-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_8250_FOURPORT)      += 8250_fourport.o
-obj-$(CONFIG_SERIAL_8250_ACCENT)        += 8250_accent.o
-obj-$(CONFIG_SERIAL_8250_BOCA)          += 8250_boca.o
-obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
-obj-$(CONFIG_SERIAL_8250_HUB6)          += 8250_hub6.o
-obj-$(CONFIG_SERIAL_8250_FSL)           += 8250_fsl.o
-obj-$(CONFIG_SERIAL_8250_DW)            += 8250_dw.o
-obj-$(CONFIG_SERIAL_8250_EM)            += 8250_em.o
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
deleted file mode 100644
index b7d48b34639..00000000000
--- a/drivers/tty/serial/8250/serial_cs.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/*======================================================================
-
-    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/ptrace.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/serial_core.h>
-#include <linux/delay.h>
-#include <linux/major.h>
-#include <asm/io.h>
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ciscode.h>
-#include <pcmcia/ds.h>
-#include <pcmcia/cisreg.h>
-
-#include "8250.h"
-
-
-/*====================================================================*/
-
-/* 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 serial_quirk {
-        unsigned int manfid;
-        unsigned int prodid;
-        int multi;              /* 1 = multifunction, > 1 = # ports */
-        void (*config)(struct pcmcia_device *);
-        void (*setup)(struct pcmcia_device *, struct uart_8250_port *);
-        void (*wakeup)(struct pcmcia_device *);
-        int (*post)(struct pcmcia_device *);
-};
-
-struct serial_info {
-        struct pcmcia_device    *p_dev;
-        int                     ndev;
-        int                     multi;
-        int                     slave;
-        int                     manfid;
-        int                     prodid;
-        int                     c950ctrl;
-        int                     line[4];
-        const struct serial_quirk *quirk;
-};
-
-struct serial_cfg_mem {
-        tuple_t tuple;
-        cisparse_t parse;
-        u_char buf[256];
-};
-
-/*
- * vers_1 5.0, "Brain Boxes", "2-Port RS232 card", "r6"
- * manfid 0x0160, 0x0104
- * This card appears to have a 14.7456MHz clock.
- */
-/* Generic Modem: MD55x (GPRS/EDGE) have
- * Elan VPU16551 UART with 14.7456MHz oscillator
- * manfid 0x015D, 0x4C45
- */
-static void quirk_setup_brainboxes_0104(struct pcmcia_device *link, struct uart_8250_port *uart)
-{
-        uart->port.uartclk = 14745600;
-}
-
-static int quirk_post_ibm(struct pcmcia_device *link)
-{
-        u8 val;
-        int ret;
-
-        ret = pcmcia_read_config_byte(link, 0x800, &val);
-        if (ret)
-                goto failed;
-
-        ret = pcmcia_write_config_byte(link, 0x800, val | 1);
-        if (ret)
-                goto failed;
-        return 0;
-
- failed:
-        return -ENODEV;
-}
-
-/*
- * Nokia cards are not really multiport cards.  Shouldn't this
- * be handled by setting the quirk entry .multi = 0 | 1 ?
- */
-static void quirk_config_nokia(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-
-        if (info->multi > 1)
-                info->multi = 1;
-}
-
-static void quirk_wakeup_oxsemi(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-
-        if (info->c950ctrl)
-                outb(12, info->c950ctrl + 1);
-}
-
-/* request_region? oxsemi branch does no request_region too... */
-/*
- * This sequence is needed to properly initialize MC45 attached to OXCF950.
- * I tried decreasing these msleep()s, but it worked properly (survived
- * 1000 stop/start operations) with these timeouts (or bigger).
- */
-static void quirk_wakeup_possio_gcc(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-        unsigned int ctrl = info->c950ctrl;
-
-        outb(0xA, ctrl + 1);
-        msleep(100);
-        outb(0xE, ctrl + 1);
-        msleep(300);
-        outb(0xC, ctrl + 1);
-        msleep(100);
-        outb(0xE, ctrl + 1);
-        msleep(200);
-        outb(0xF, ctrl + 1);
-        msleep(100);
-        outb(0xE, ctrl + 1);
-        msleep(100);
-        outb(0xC, ctrl + 1);
-}
-
-/*
- * Socket Dual IO: this enables irq's for second port
- */
-static void quirk_config_socket(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-
-        if (info->multi)
-                link->config_flags |= CONF_ENABLE_ESR;
-}
-
-static const struct serial_quirk quirks[] = {
-        {
-                .manfid = 0x0160,
-                .prodid = 0x0104,
-                .multi  = -1,
-                .setup  = quirk_setup_brainboxes_0104,
-        }, {
-                .manfid = 0x015D,
-                .prodid = 0x4C45,
-                .multi  = -1,
-                .setup  = quirk_setup_brainboxes_0104,
-        }, {
-                .manfid = MANFID_IBM,
-                .prodid = ~0,
-                .multi  = -1,
-                .post   = quirk_post_ibm,
-        }, {
-                .manfid = MANFID_INTEL,
-                .prodid = PRODID_INTEL_DUAL_RS232,
-                .multi  = 2,
-        }, {
-                .manfid = MANFID_NATINST,
-                .prodid = PRODID_NATINST_QUAD_RS232,
-                .multi  = 4,
-        }, {
-                .manfid = MANFID_NOKIA,
-                .prodid = ~0,
-                .multi  = -1,
-                .config = quirk_config_nokia,
-        }, {
-                .manfid = MANFID_OMEGA,
-                .prodid = PRODID_OMEGA_QSP_100,
-                .multi  = 4,
-        }, {
-                .manfid = MANFID_OXSEMI,
-                .prodid = ~0,
-                .multi  = -1,
-                .wakeup = quirk_wakeup_oxsemi,
-        }, {
-                .manfid = MANFID_POSSIO,
-                .prodid = PRODID_POSSIO_GCC,
-                .multi  = -1,
-                .wakeup = quirk_wakeup_possio_gcc,
-        }, {
-                .manfid = MANFID_QUATECH,
-                .prodid = PRODID_QUATECH_DUAL_RS232,
-                .multi  = 2,
-        }, {
-                .manfid = MANFID_QUATECH,
-                .prodid = PRODID_QUATECH_DUAL_RS232_D1,
-                .multi  = 2,
-        }, {
-                .manfid = MANFID_QUATECH,
-                .prodid = PRODID_QUATECH_DUAL_RS232_G,
-                .multi  = 2,
-        }, {
-                .manfid = MANFID_QUATECH,
-                .prodid = PRODID_QUATECH_QUAD_RS232,
-                .multi  = 4,
-        }, {
-                .manfid = MANFID_SOCKET,
-                .prodid = PRODID_SOCKET_DUAL_RS232,
-                .multi  = 2,
-                .config = quirk_config_socket,
-        }, {
-                .manfid = MANFID_SOCKET,
-                .prodid = ~0,
-                .multi  = -1,
-                .config = quirk_config_socket,
-        }
-};
-
-
-static int serial_config(struct pcmcia_device * link);
-
-
-static void serial_remove(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-        int i;
-
-        dev_dbg(&link->dev, "serial_release\n");
-
-        /*
-         * Recheck to see if the device is still configured.
-         */
-        for (i = 0; i < info->ndev; i++)
-                serial8250_unregister_port(info->line[i]);
-
-        if (!info->slave)
-                pcmcia_disable_device(link);
-}
-
-static int serial_suspend(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-        int i;
-
-        for (i = 0; i < info->ndev; i++)
-                serial8250_suspend_port(info->line[i]);
-
-        return 0;
-}
-
-static int serial_resume(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-        int i;
-
-        for (i = 0; i < info->ndev; i++)
-                serial8250_resume_port(info->line[i]);
-
-        if (info->quirk && info->quirk->wakeup)
-                info->quirk->wakeup(link);
-
-        return 0;
-}
-
-static int serial_probe(struct pcmcia_device *link)
-{
-        struct serial_info *info;
-
-        dev_dbg(&link->dev, "serial_attach()\n");
-
-        /* Create new serial device */
-        info = kzalloc(sizeof (*info), GFP_KERNEL);
-        if (!info)
-                return -ENOMEM;
-        info->p_dev = link;
-        link->priv = info;
-
-        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
-        if (do_sound)
-                link->config_flags |= CONF_ENABLE_SPKR;
-
-        return serial_config(link);
-}
-
-static void serial_detach(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-
-        dev_dbg(&link->dev, "serial_detach\n");
-
-        /*
-         * Ensure that the ports have been released.
-         */
-        serial_remove(link);
-
-        /* free bits */
-        kfree(info);
-}
-
-/*====================================================================*/
-
-static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
-                        unsigned int iobase, int irq)
-{
-        struct uart_8250_port uart;
-        int line;
-
-        memset(&uart, 0, sizeof(uart));
-        uart.port.iobase = iobase;
-        uart.port.irq = irq;
-        uart.port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
-        uart.port.uartclk = 1843200;
-        uart.port.dev = &handle->dev;
-        if (buggy_uart)
-                uart.port.flags |= UPF_BUGGY_UART;
-
-        if (info->quirk && info->quirk->setup)
-                info->quirk->setup(handle, &uart);
-
-        line = serial8250_register_8250_port(&uart);
-        if (line < 0) {
-                pr_err("serial_cs: serial8250_register_8250_port() at 0x%04lx, irq %d failed\n",
-                                                        (unsigned long)iobase, irq);
-                return -EINVAL;
-        }
-
-        info->line[info->ndev] = line;
-        info->ndev++;
-
-        return 0;
-}
-
-/*====================================================================*/
-
-static int pfc_config(struct pcmcia_device *p_dev)
-{
-        unsigned int port = 0;
-        struct serial_info *info = p_dev->priv;
-
-        if ((p_dev->resource[1]->end != 0) &&
-                (resource_size(p_dev->resource[1]) == 8)) {
-                port = p_dev->resource[1]->start;
-                info->slave = 1;
-        } else if ((info->manfid == MANFID_OSITECH) &&
-                (resource_size(p_dev->resource[0]) == 0x40)) {
-                port = p_dev->resource[0]->start + 0x28;
-                info->slave = 1;
-        }
-        if (info->slave)
-                return setup_serial(p_dev, info, port, p_dev->irq);
-
-        dev_warn(&p_dev->dev, "no usable port range found, giving up\n");
-        return -ENODEV;
-}
-
-static int simple_config_check(struct pcmcia_device *p_dev, void *priv_data)
-{
-        static const int size_table[2] = { 8, 16 };
-        int *try = priv_data;
-
-        if (p_dev->resource[0]->start == 0)
-                return -ENODEV;
-
-        if ((*try & 0x1) == 0)
-                p_dev->io_lines = 16;
-
-        if (p_dev->resource[0]->end != size_table[(*try >> 1)])
-                return -ENODEV;
-
-        p_dev->resource[0]->end = 8;
-        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-
-        return pcmcia_request_io(p_dev);
-}
-
-static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
-                                        void *priv_data)
-{
-        static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
-        int j;
-
-        if (p_dev->io_lines > 3)
-                return -ENODEV;
-
-        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->resource[0]->end = 8;
-
-        for (j = 0; j < 5; j++) {
-                p_dev->resource[0]->start = base[j];
-                p_dev->io_lines = base[j] ? 16 : 3;
-                if (!pcmcia_request_io(p_dev))
-                        return 0;
-        }
-        return -ENODEV;
-}
-
-static int simple_config(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-        int i = -ENODEV, try;
-
-        /* First pass: look for a config entry that looks normal.
-         * Two tries: without IO aliases, then with aliases */
-        link->config_flags |= CONF_AUTO_SET_VPP;
-        for (try = 0; try < 4; try++)
-                if (!pcmcia_loop_config(link, simple_config_check, &try))
-                        goto found_port;
-
-        /* 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. */
-        if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))
-                goto found_port;
-
-        dev_warn(&link->dev, "no usable port range found, giving up\n");
-        return -1;
-
-found_port:
-        if (info->multi && (info->manfid == MANFID_3COM))
-                link->config_index &= ~(0x08);
-
-        /*
-         * Apply any configuration quirks.
-         */
-        if (info->quirk && info->quirk->config)
-                info->quirk->config(link);
-
-        i = pcmcia_enable_device(link);
-        if (i != 0)
-                return -1;
-        return setup_serial(link, info, link->resource[0]->start, link->irq);
-}
-
-static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data)
-{
-        int *multi = priv_data;
-
-        if (p_dev->resource[1]->end)
-                return -EINVAL;
-
-        /* 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 (p_dev->resource[0]->end <= 8)
-                return -EINVAL;
-
-        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->resource[0]->end = *multi * 8;
-
-        if (pcmcia_request_io(p_dev))
-                return -ENODEV;
-        return 0;
-}
-
-static int multi_config_check_notpicky(struct pcmcia_device *p_dev,
-                                       void *priv_data)
-{
-        int *base2 = priv_data;
-
-        if (!p_dev->resource[0]->end || !p_dev->resource[1]->end ||
-                p_dev->resource[0]->start + 8 != p_dev->resource[1]->start)
-                return -ENODEV;
-
-        p_dev->resource[0]->end = p_dev->resource[1]->end = 8;
-        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-
-        if (pcmcia_request_io(p_dev))
-                return -ENODEV;
-
-        *base2 = p_dev->resource[0]->start + 8;
-        return 0;
-}
-
-static int multi_config(struct pcmcia_device *link)
-{
-        struct serial_info *info = link->priv;
-        int i, base2 = 0;
-
-        /* First, look for a generic full-sized window */
-        if (!pcmcia_loop_config(link, multi_config_check, &info->multi))
-                base2 = link->resource[0]->start + 8;
-        else {
-                /* If that didn't work, look for two windows */
-                info->multi = 2;
-                if (pcmcia_loop_config(link, multi_config_check_notpicky,
-                                       &base2)) {
-                        dev_warn(&link->dev, "no usable port range "
-                               "found, giving up\n");
-                        return -ENODEV;
-                }
-        }
-
-        if (!link->irq)
-                dev_warn(&link->dev, "no usable IRQ found, continuing...\n");
-
-        /*
-         * Apply any configuration quirks.
-         */
-        if (info->quirk && info->quirk->config)
-                info->quirk->config(link);
-
-        i = pcmcia_enable_device(link);
-        if (i != 0)
-                return -ENODEV;
-
-        /* The Oxford Semiconductor OXCF950 cards are in fact single-port:
-         * 8 registers are for the UART, the others are extra registers.
-         * Siemen's MC45 PCMCIA (Possio's GCC) is OXCF950 based too.
-         */
-        if (info->manfid == MANFID_OXSEMI || (info->manfid == MANFID_POSSIO &&
-                                info->prodid == PRODID_POSSIO_GCC)) {
-                int err;
-
-                if (link->config_index == 1 ||
-                    link->config_index == 3) {
-                        err = setup_serial(link, info, base2,
-                                        link->irq);
-                        base2 = link->resource[0]->start;
-                } else {
-                        err = setup_serial(link, info, link->resource[0]->start,
-                                        link->irq);
-                }
-                info->c950ctrl = base2;
-
-                /*
-                 * FIXME: We really should wake up the port prior to
-                 * handing it over to the serial layer.
-                 */
-                if (info->quirk && info->quirk->wakeup)
-                        info->quirk->wakeup(link);
-
-                return 0;
-        }
-
-        setup_serial(link, info, link->resource[0]->start, link->irq);
-        for (i = 0; i < info->multi - 1; i++)
-                setup_serial(link, info, base2 + (8 * i),
-                                link->irq);
-        return 0;
-}
-
-static int serial_check_for_multi(struct pcmcia_device *p_dev,  void *priv_data)
-{
-        struct serial_info *info = p_dev->priv;
-
-        if (!p_dev->resource[0]->end)
-                return -EINVAL;
-
-        if ((!p_dev->resource[1]->end) && (p_dev->resource[0]->end % 8 == 0))
-                info->multi = p_dev->resource[0]->end >> 3;
-
-        if ((p_dev->resource[1]->end) && (p_dev->resource[0]->end == 8)
-                && (p_dev->resource[1]->end == 8))
-                info->multi = 2;
-
-        return 0; /* break */
-}
-
-
-static int serial_config(struct pcmcia_device * link)
-{
-        struct serial_info *info = link->priv;
-        int i;
-
-        dev_dbg(&link->dev, "serial_config\n");
-
-        /* Is this a compliant multifunction card? */
-        info->multi = (link->socket->functions > 1);
-
-        /* Is this a multiport card? */
-        info->manfid = link->manf_id;
-        info->prodid = link->card_id;
-
-        for (i = 0; i < ARRAY_SIZE(quirks); i++)
-                if ((quirks[i].manfid == ~0 ||
-                     quirks[i].manfid == info->manfid) &&
-                    (quirks[i].prodid == ~0 ||
-                     quirks[i].prodid == info->prodid)) {
-                        info->quirk = &quirks[i];
-                        break;
-                }
-
-        /* Another check for dual-serial cards: look for either serial or
-           multifunction cards that ask for appropriate IO port ranges */
-        if ((info->multi == 0) &&
-            (link->has_func_id) &&
-            (link->socket->pcmcia_pfc == 0) &&
-            ((link->func_id == CISTPL_FUNCID_MULTI) ||
-             (link->func_id == CISTPL_FUNCID_SERIAL)))
-                pcmcia_loop_config(link, serial_check_for_multi, info);
-
-        /*
-         * Apply any multi-port quirk.
-         */
-        if (info->quirk && info->quirk->multi != -1)
-                info->multi = info->quirk->multi;
-
-        dev_info(&link->dev,
-                "trying to set up [0x%04x:0x%04x] (pfc: %d, multi: %d, quirk: %p)\n",
-                link->manf_id, link->card_id,
-                link->socket->pcmcia_pfc, info->multi, info->quirk);
-        if (link->socket->pcmcia_pfc)
-                i = pfc_config(link);
-        else if (info->multi > 1)
-                i = multi_config(link);
-        else
-                i = simple_config(link);
-
-        if (i || info->ndev == 0)
-                goto failed;
-
-        /*
-         * Apply any post-init quirk.  FIXME: This should really happen
-         * before we register the port, since it might already be in use.
-         */
-        if (info->quirk && info->quirk->post)
-                if (info->quirk->post(link))
-                        goto failed;
-
-        return 0;
-
-failed:
-        dev_warn(&link->dev, "failed to initialize\n");
-        serial_remove(link);
-        return -ENODEV;
-}
-
-static const struct pcmcia_device_id serial_ids[] = {
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0xea15),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0109, 0x0501),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0138, 0x110a),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0140, 0x000a),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0143, 0x3341),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0143, 0xc0ab),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),
-        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),
-        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),
-        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),
-        PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "XJEM1144/CCEM1144", "PCMCIA MODEM", 0xf510db04, 0x52d21e1e, 0xbd6c43ef),
-        PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "CEM28", 0x2e3ee845, 0x0ea978ea),
-        PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "CEM33", 0x2e3ee845, 0x80609023),
-        PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "CEM56", 0x2e3ee845, 0xa650c32a),
-        PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "REM10", 0x2e3ee845, 0x76df1d29),
-        PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "XEM5600", 0x2e3ee845, 0xf1403719),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "AnyCom", "Fast Ethernet + 56K COMBO", 0x578ba6e7, 0xb0ac62c4),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "ATKK", "LM33-PCM-T", 0xba9eb7e2, 0x077c174e),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "D-Link", "DME336T", 0x1a424a1c, 0xb23897ff),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "Gateway 2000", "XJEM3336", 0xdd9989be, 0x662c394c),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "Grey Cell", "GCS3000", 0x2a151fac, 0x48b932ae),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
-        PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0e01),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0b05),
-        PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),
-        PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
-        PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0101, 0x0562),
-        PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0104, 0x0070),
-        PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x016c, 0x0020),
-        PCMCIA_MFC_DEVICE_PROD_ID123(1, "APEX DATA", "MULTICARD", "ETHERNET-MODEM", 0x11c2da09, 0x7289dc5d, 0xaad95e1f),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1, "IBM", "Home and Away 28.8 PC Card       ", 0xb569a6e5, 0x5bd4ff2c),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1, "IBM", "Home and Away Credit Card Adapter", 0xb569a6e5, 0x4bdf15c3),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1, "IBM", "w95 Home and Away Credit Card ", 0xb569a6e5, 0xae911c15),
-        PCMCIA_MFC_DEVICE_PROD_ID1(1, "Motorola MARQUIS", 0xf03e4e77),
-        PCMCIA_MFC_DEVICE_PROD_ID2(1, "FAX/Modem/Ethernet Combo Card ", 0x1ed59302),
-        PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0301),
-        PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x0276),
-        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0039),
-        PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0006),
-        PCMCIA_DEVICE_MANF_CARD(0x0105, 0x0101), /* TDK DF2814 */
-        PCMCIA_DEVICE_MANF_CARD(0x0105, 0x100a), /* Xircom CM-56G */
-        PCMCIA_DEVICE_MANF_CARD(0x0105, 0x3e0a), /* TDK DF5660 */
-        PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a),
-        PCMCIA_DEVICE_MANF_CARD(0x0107, 0x0002), /* USRobotics 14,400 */
-        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d50),
-        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d51),
-        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d52),
-        PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d53),
-        PCMCIA_DEVICE_MANF_CARD(0x010b, 0xd180),
-        PCMCIA_DEVICE_MANF_CARD(0x0115, 0x3330), /* USRobotics/SUN 14,400 */
-        PCMCIA_DEVICE_MANF_CARD(0x0124, 0x0100), /* Nokia DTP-2 ver II */
-        PCMCIA_DEVICE_MANF_CARD(0x0134, 0x5600), /* LASAT COMMUNICATIONS A/S */
-        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x000e),
-        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x001b),
-        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025),
-        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045),
-        PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052),
-        PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */
-        PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */
-        PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae),
-        PCMCIA_DEVICE_PROD_ID124("GATEWAY2000", "CC3144", "PCMCIA MODEM", 0x506bccae, 0xcb3685f1, 0xbd6c43ef),
-        PCMCIA_DEVICE_PROD_ID14("MEGAHERTZ", "PCMCIA MODEM", 0xf510db04, 0xbd6c43ef),
-        PCMCIA_DEVICE_PROD_ID124("TOSHIBA", "T144PF", "PCMCIA MODEM", 0xb4585a1a, 0x7271409c, 0xbd6c43ef),
-        PCMCIA_DEVICE_PROD_ID123("FUJITSU", "FC14F ", "MBH10213", 0x6ee5a3d8, 0x30ead12b, 0xb00f05a0),
-        PCMCIA_DEVICE_PROD_ID123("Novatel Wireless", "Merlin UMTS Modem", "U630", 0x32607776, 0xd9e73b13, 0xe87332e),
-        PCMCIA_DEVICE_PROD_ID13("MEGAHERTZ", "V.34 PCMCIA MODEM", 0xf510db04, 0xbb2cce4a),
-        PCMCIA_DEVICE_PROD_ID12("Brain Boxes", "Bluetooth PC Card", 0xee138382, 0xd4ce9b02),
-        PCMCIA_DEVICE_PROD_ID12("CIRRUS LOGIC", "FAX MODEM", 0xe625f451, 0xcecd6dfa),
-        PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 28800 FAX/DATA MODEM", 0xa3a3062c, 0x8cbd7c76),
-        PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 33600 FAX/DATA MODEM", 0xa3a3062c, 0x5a00ce95),
-        PCMCIA_DEVICE_PROD_ID12("Computerboards, Inc.", "PCM-COM422", 0xd0b78f51, 0x7e2d49ed),
-        PCMCIA_DEVICE_PROD_ID12("Dr. Neuhaus", "FURY CARD 14K4", 0x76942813, 0x8b96ce65),
-        PCMCIA_DEVICE_PROD_ID12("IBM", "ISDN/56K/GSM", 0xb569a6e5, 0xfee5297b),
-        PCMCIA_DEVICE_PROD_ID12("Intelligent", "ANGIA FAX/MODEM", 0xb496e65e, 0xf31602a6),
-        PCMCIA_DEVICE_PROD_ID12("Intel", "MODEM 2400+", 0x816cc815, 0x412729fb),
-        PCMCIA_DEVICE_PROD_ID12("Intertex", "IX34-PCMCIA", 0xf8a097e3, 0x97880447),
-        PCMCIA_DEVICE_PROD_ID12("IOTech Inc ", "PCMCIA Dual RS-232 Serial Port Card", 0x3bd2d898, 0x92abc92f),
-        PCMCIA_DEVICE_PROD_ID12("MACRONIX", "FAX/MODEM", 0x668388b3, 0x3f9bdf2f),
-        PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT1432LT", 0x5f73be51, 0x0b3e2383),
-        PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT2834LT", 0x5f73be51, 0x4cd7c09e),
-        PCMCIA_DEVICE_PROD_ID12("OEM      ", "C288MX     ", 0xb572d360, 0xd2385b7a),
-        PCMCIA_DEVICE_PROD_ID12("Option International", "V34bis GSM/PSTN Data/Fax Modem", 0x9d7cd6f5, 0x5cb8bf41),
-        PCMCIA_DEVICE_PROD_ID12("PCMCIA   ", "C336MX     ", 0x99bcafe9, 0xaa25bcab),
-        PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f),
-        PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d),
-        PCMCIA_DEVICE_PROD_ID12("Telia", "SurfinBird 560P/A+", 0xe2cdd5e, 0xc9314b38),
-        PCMCIA_DEVICE_PROD_ID1("Smart Serial Port", 0x2d8ce292),
-        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"),
-        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"),
-        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"),
-        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "cis/PCMLM28.cis"),
-        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "cis/PCMLM28.cis"),
-        PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "TOSHIBA", "Modem/LAN Card", 0xb4585a1a, 0x53f922f8, "cis/PCMLM28.cis"),
-        PCMCIA_MFC_DEVICE_CIS_PROD_ID12(1, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "cis/DP83903.cis"),
-        PCMCIA_MFC_DEVICE_CIS_PROD_ID4(1, "NSC MF LAN/Modem", 0x58fc6056, "cis/DP83903.cis"),
-        PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0556, "cis/3CCFEM556.cis"),
-        PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "cis/DP83903.cis"),
-        PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "cis/3CXEM556.cis"),
-        PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "cis/3CXEM556.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */
-        PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC860", 0xd85f6206, 0x698f93db, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC860 3G Network Adapter R1 */
-        PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC710/AC750", 0xd85f6206, 0x761b11e0, "cis/SW_7xx_SER.cis"),  /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
-        PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "cis/SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
-        PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "cis/SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
-        PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "cis/COMpad2.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
-        PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
-        PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"),
-        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100  1.00.",0x19ca78af,0xf964f42b),
-        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
-        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232  1.00.",0x19ca78af,0x69fb7490),
-        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232",0x19ca78af,0xb6bc0235),
-        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232",0x63f2e0bd,0xb9e175d3),
-        PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232-5",0x63f2e0bd,0xfce33442),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x171e7190),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x20da4262),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea5dd57d),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd77255fa),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a709903),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18430676),
-        PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f933767),
-        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
-        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
-        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
-        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-        PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
-        PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-        PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-        PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
-        PCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),
-        /* too generic */
-        /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
-        /* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */
-        PCMCIA_DEVICE_FUNC_ID(2),
-        PCMCIA_DEVICE_NULL,
-};
-MODULE_DEVICE_TABLE(pcmcia, serial_ids);
-
-MODULE_FIRMWARE("cis/PCMLM28.cis");
-MODULE_FIRMWARE("cis/DP83903.cis");
-MODULE_FIRMWARE("cis/3CCFEM556.cis");
-MODULE_FIRMWARE("cis/3CXEM556.cis");
-MODULE_FIRMWARE("cis/SW_8xx_SER.cis");
-MODULE_FIRMWARE("cis/SW_7xx_SER.cis");
-MODULE_FIRMWARE("cis/SW_555_SER.cis");
-MODULE_FIRMWARE("cis/MT5634ZLX.cis");
-MODULE_FIRMWARE("cis/COMpad2.cis");
-MODULE_FIRMWARE("cis/COMpad4.cis");
-MODULE_FIRMWARE("cis/RS-COM-2P.cis");
-
-static struct pcmcia_driver serial_cs_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "serial_cs",
-        .probe          = serial_probe,
-        .remove         = serial_detach,
-        .id_table       = serial_ids,
-        .suspend        = serial_suspend,
-        .resume         = serial_resume,
-};
-
-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);
-}
-
-module_init(init_serial_cs);
-module_exit(exit_serial_cs);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 59c23d03810..5c9d9890c9a 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -5,7 +5,267 @@
 menu "Serial drivers"
         depends on HAS_IOMEM
 
-source "drivers/tty/serial/8250/Kconfig"
+#
+# The new 8250/16550 serial drivers
+config SERIAL_8250
+        tristate "8250/16550 and compatible serial support"
+        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 8250.
+          [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.
+
+          You can set that using a kernel command line option such as
+          "console=uart8250,io,0x3f8,9600n8"
+          "console=uart8250,mmio,0xff5e0000,115200n8".
+          and it will switch to normal serial console when the corresponding 
+          port is ready.
+          "earlycon=uart8250,io,0x3f8,9600n8"
+          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
+          it will not only setup early console.
+
+          If unsure, say N.
+
+config FIX_EARLYCON_MEM
+        bool
+        depends on X86
+        default y
+
+config SERIAL_8250_GSC
+        tristate
+        depends on SERIAL_8250 && GSC
+        default SERIAL_8250
+
+config SERIAL_8250_PCI
+        tristate "8250/16550 PCI device support" if EXPERT
+        depends on SERIAL_8250 && PCI
+        default SERIAL_8250
+        help
+          This builds standard PCI serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+          Saves about 9K.
+
+config SERIAL_8250_PNP
+        tristate "8250/16550 PNP device support" if EXPERT
+        depends on SERIAL_8250 && PNP
+        default SERIAL_8250
+        help
+          This builds standard PNP serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+
+config SERIAL_8250_HP300
+        tristate
+        depends on SERIAL_8250 && HP300
+        default SERIAL_8250
+
+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_NR_UARTS
+        int "Maximum number of 8250/16550 serial ports"
+        depends on SERIAL_8250
+        default "4"
+        help
+          Set this to the number of 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, or any ISA multi-port serial cards.
+
+config SERIAL_8250_RUNTIME_UARTS
+        int "Number of 8250/16550 serial ports to register at runtime"
+        depends on SERIAL_8250
+        range 0 SERIAL_8250_NR_UARTS
+        default "4"
+        help
+          Set this to the maximum number of serial ports you want
+          the kernel to register at boot time.  This can be overridden
+          with the module parameter "nr_uarts", or boot-time parameter
+          8250.nr_uarts
+
+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.
+
+#
+# Multi-port serial cards
+#
+
+config SERIAL_8250_FOURPORT
+        tristate "Support Fourport cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an AST FourPort serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_fourport.
+
+config SERIAL_8250_ACCENT
+        tristate "Support Accent cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an Accent Async serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_accent.
+
+config SERIAL_8250_BOCA
+        tristate "Support Boca cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a Boca serial board.  Please read the Boca
+          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_boca.
+
+config SERIAL_8250_EXAR_ST16C554
+        tristate "Support Exar ST16C554/554D Quad UART"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
+          tinkering with your Envoy TU301, or have a machine with this UART,
+          say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_exar_st16c554.
+
+config SERIAL_8250_HUB6
+        tristate "Support Hub6 cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a HUB6 serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_hub6.
+
+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_RSA
+        bool "Support RSA serial ports"
+        depends on SERIAL_8250_EXTENDED
+        help
+          ::: To be written :::
+
+config SERIAL_8250_MCA
+        tristate "Support 8250-type ports on MCA buses"
+        depends on SERIAL_8250 != n && MCA
+        help
+          Say Y here if you have a MCA serial ports.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_mca.
+
+config SERIAL_8250_ACORN
+        tristate "Acorn expansion card serial port support"
+        depends on 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_8250_RM9K
+        bool "Support for MIPS RM9xxx integrated serial port"
+        depends on SERIAL_8250 != n && SERIAL_RM9000
+        select SERIAL_8250_SHARE_IRQ
+        help
+          Selecting this option will add support for the integrated serial
+          port hardware found on MIPS RM9122 and similar processors.
+          If unsure, say N.
 
 comment "Non-8250 serial port support"
 
@@ -93,7 +353,7 @@ config SERIAL_SB1250_DUART_CONSOLE
 
 config SERIAL_ATMEL
         bool "AT91 / AT32 on-chip serial port support"
-        depends on ARCH_AT91 || AVR32
+        depends on (ARM && ARCH_AT91) || AVR32
         select SERIAL_CORE
         help
           This enables the driver for the on-chip UARTs of the Atmel
@@ -141,25 +401,6 @@ config SERIAL_ATMEL_TTYAT
 
           Say Y if you have an external 8250/16C550 UART.  If unsure, say N.
 
-config SERIAL_KGDB_NMI
-        bool "Serial console over KGDB NMI debugger port"
-        depends on KGDB_SERIAL_CONSOLE
-        help
-          This special driver allows you to temporary use NMI debugger port
-          as a normal console (assuming that the port is attached to KGDB).
-
-          Unlike KDB's disable_nmi command, with this driver you are always
-          able to go back to the debugger using KGDB escape sequence ($3#33).
-          This is because this console driver processes the input in NMI
-          context, and thus is able to intercept the magic sequence.
-
-          Note that since the console interprets input and uses polling
-          communication methods, for things like PPP you still must fully
-          detach debugger port from the KGDB NMI (i.e. disable_nmi), and
-          use raw console.
-
-          If unsure, say N.
-
 config SERIAL_KS8695
         bool "Micrel KS8695 (Centaur) serial port support"
         depends on ARCH_KS8695
@@ -179,12 +420,10 @@ config SERIAL_KS8695_CONSOLE
 
 config SERIAL_CLPS711X
         tristate "CLPS711X serial port support"
-        depends on ARCH_CLPS711X
+        depends on ARM && ARCH_CLPS711X
         select SERIAL_CORE
-        default y
         help
-          This enables the driver for the on-chip UARTs of the Cirrus
-          Logic EP711x/EP721x/EP731x processors.
+          ::: To be written :::
 
 config SERIAL_CLPS711X_CONSOLE
         bool "Support for console on CLPS711X serial port"
@@ -194,11 +433,13 @@ config SERIAL_CLPS711X_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=ttyCL1".
+          "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_SAMSUNG
         tristate "Samsung SoC serial support"
-        depends on PLAT_SAMSUNG
+        depends on ARM && PLAT_SAMSUNG
         select SERIAL_CORE
         help
           Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
@@ -208,16 +449,16 @@ config SERIAL_SAMSUNG
 
 config SERIAL_SAMSUNG_UARTS_4
         bool
-        depends on PLAT_SAMSUNG
-        default y if !(CPU_S3C2410 || SERIAL_S3C2412 || CPU_S3C2440 || CPU_S3C2442)
+        depends on ARM && PLAT_SAMSUNG
+        default y if CPU_S3C2443
         help
           Internal node for the common case of 4 Samsung compatible UARTs
 
 config SERIAL_SAMSUNG_UARTS
         int
-        depends on PLAT_SAMSUNG
+        depends on ARM && PLAT_SAMSUNG
         default 6 if ARCH_S5P6450
-        default 4 if SERIAL_SAMSUNG_UARTS_4 || CPU_S3C2416
+        default 4 if SERIAL_SAMSUNG_UARTS_4
         default 3
         help
           Select the number of available UART ports for the Samsung S3C
@@ -247,27 +488,54 @@ config SERIAL_SAMSUNG_CONSOLE
           your boot loader about how to pass options to the kernel at
           boot time.)
 
-config SERIAL_SIRFSOC
-        tristate "SiRF SoC Platform Serial port support"
-        depends on ARCH_PRIMA2
-        select SERIAL_CORE
-        help
-          Support for the on-chip UART on the CSR SiRFprimaII series,
-          providing /dev/ttySiRF0, 1 and 2 (note, some machines may not
-          provide all of these ports, depending on how the serial port
-          pins are configured).
-
-config SERIAL_SIRFSOC_CONSOLE
-        bool "Support for console on SiRF SoC serial port"
-        depends on SERIAL_SIRFSOC=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=ttySiRFx". (Try "man bootparam" or see the documentation of
-          your boot loader about how to pass options to the kernel at
-          boot time.)
+config SERIAL_S3C2410
+        tristate "Samsung S3C2410 Serial port support"
+        depends on SERIAL_SAMSUNG && CPU_S3C2410
+        default y if CPU_S3C2410
+        help
+          Serial port support for the Samsung S3C2410 SoC
+
+config SERIAL_S3C2412
+        tristate "Samsung S3C2412/S3C2413 Serial port support"
+        depends on SERIAL_SAMSUNG && CPU_S3C2412
+        default y if CPU_S3C2412
+        help
+          Serial port support for the Samsung S3C2412 and S3C2413 SoC
+
+config SERIAL_S3C2440
+        tristate "Samsung S3C2440/S3C2442/S3C2416 Serial port support"
+        depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416)
+        default y if CPU_S3C2440
+        default y if CPU_S3C2442
+        select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416
+        help
+          Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC
+
+config SERIAL_S3C6400
+        tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
+        depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
+        select SERIAL_SAMSUNG_UARTS_4
+        default y
+        help
+          Serial port support for the Samsung S3C6400, S3C6410, S5P6440, S5P6450
+          and S5PC100 SoCs
+
+config SERIAL_S5PV210
+        tristate "Samsung S5PV210 Serial port support"
+        depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_EXYNOS4210)
+        select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210)
+        default y
+        help
+          Serial port support for Samsung's S5P Family of SoC's
+
+config SERIAL_TEGRA
+        boolean "High speed serial support for NVIDIA Tegra SoCs"
+        depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA
+        select SERIAL_CORE
+        help
+          Support for the on-chip UARTs on NVIDIA Tegra SoC, providing
+          /dev/ttyHSx, where x is determined by the number of UARTs on the
+          platform
 
 config SERIAL_MAX3100
         tristate "MAX3100 support"
@@ -276,19 +544,21 @@ config SERIAL_MAX3100
         help
           MAX3100 chip support
 
-config SERIAL_MAX310X
-        bool "MAX310X support"
+config SERIAL_MAX3107
+        tristate "MAX3107 support"
         depends on SPI
         select SERIAL_CORE
-        select REGMAP_SPI if SPI
-        default n
         help
-          This selects support for an advanced UART from Maxim (Dallas).
-          Supported ICs are MAX3107, MAX3108.
-          Each IC contains 128 words each of receive and transmit FIFO
-          that can be controlled through I2C or high-speed SPI.
+          MAX3107 chip support
 
-          Say Y here if you want to support this ICs.
+config SERIAL_MAX3107_AAVA
+        tristate "MAX3107 AAVA platform support"
+        depends on X86_MRST && SERIAL_MAX3107 && GPIOLIB
+        select SERIAL_CORE
+        help
+          Support for the MAX3107 chip configuration found on the AAVA
+          platform. Includes the extra initialisation and GPIO support
+          neded for this device.
 
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
@@ -347,7 +617,7 @@ config SERIAL_ZS_CONSOLE
 
 config SERIAL_21285
         tristate "DC21285 serial port support"
-        depends on FOOTBRIDGE
+        depends on ARM && FOOTBRIDGE
         select SERIAL_CORE
         help
           If you have a machine based on a 21285 (Footbridge) StrongARM(R)/
@@ -371,7 +641,7 @@ config SERIAL_21285_CONSOLE
 
 config SERIAL_MPSC
         bool "Marvell MPSC serial port support"
-        depends on MV64X60
+        depends on PPC32 && MV64X60
         select SERIAL_CORE
         help
           Say Y here if you want to use the Marvell MPSC serial controller.
@@ -408,7 +678,7 @@ config SERIAL_PXA_CONSOLE
 
 config SERIAL_SA1100
         bool "SA1100 serial port support"
-        depends on ARCH_SA1100
+        depends on ARM && ARCH_SA1100
         select SERIAL_CORE
         help
           If you have a machine based on a SA1100/SA1110 StrongARM(R) CPU you
@@ -460,7 +730,7 @@ config SERIAL_BFIN
           Add support for the built-in UARTs on the Blackfin.
 
           To compile this driver as a module, choose M here: the
-          module is named bfin_uart.ko.
+          module will be called bfin_5xx.
 
 config SERIAL_BFIN_CONSOLE
         bool "Console on Blackfin serial port"
@@ -539,7 +809,7 @@ config BFIN_UART3_CTSRTS
 
 config SERIAL_IMX
         bool "IMX serial port support"
-        depends on ARCH_MXC
+        depends on ARM && (ARCH_IMX || ARCH_MXC)
         select SERIAL_CORE
         select RATIONAL
         help
@@ -712,11 +982,11 @@ config SERIAL_SH_SCI_CONSOLE
 
 config SERIAL_SH_SCI_DMA
         bool "DMA support"
-        depends on SERIAL_SH_SCI && SH_DMAE
+        depends on SERIAL_SH_SCI && SH_DMAE && EXPERIMENTAL
 
 config SERIAL_PNX8XXX
         bool "Enable PNX8XXX SoCs' UART Support"
-        depends on SOC_PNX8550 || SOC_PNX833X
+        depends on MIPS && (SOC_PNX8550 || SOC_PNX833X)
         select SERIAL_CORE
         help
           If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
@@ -730,25 +1000,6 @@ config SERIAL_PNX8XXX_CONSOLE
           If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
           and you want to use serial console, say Y. Otherwise, say N.
 
-config SERIAL_HS_LPC32XX
-        tristate "LPC32XX high speed serial port support"
-        depends on ARCH_LPC32XX && OF
-        select SERIAL_CORE
-        help
-          Support for the LPC32XX high speed serial ports (up to 900kbps).
-          Those are UARTs completely different from the Standard UARTs on the
-          LPC32XX SoC.
-          Choose M or Y here to build this driver.
-
-config SERIAL_HS_LPC32XX_CONSOLE
-        bool "Enable LPC32XX high speed UART serial console"
-        depends on SERIAL_HS_LPC32XX
-        select SERIAL_CORE_CONSOLE
-        help
-          If you would like to be able to use one of the high speed serial
-          ports on the LPC32XX as the console, you can do so by answering
-          Y to this option.
-
 config SERIAL_CORE
         tristate
 
@@ -792,6 +1043,23 @@ config SERIAL_MCF_CONSOLE
         help
           Enable a ColdFire internal serial port to be the system console.
 
+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 "Mac or PowerMac z85c30 ESCC support"
         depends on (M68K && MAC) || (PPC_OF && PPC_PMAC)
@@ -898,7 +1166,7 @@ config SERIAL_MPC52xx_CONSOLE_BAUD
 
 config SERIAL_ICOM
         tristate "IBM Multiport Serial Adapter"
-        depends on PCI && PPC_PSERIES
+        depends on PCI && (PPC_ISERIES || PPC_PSERIES)
         select SERIAL_CORE
         select FW_LOADER
         help
@@ -1013,7 +1281,7 @@ config SERIAL_SGI_IOC3
 
 config SERIAL_MSM
         bool "MSM on-chip serial port support"
-        depends on ARCH_MSM
+        depends on ARM && ARCH_MSM
         select SERIAL_CORE
 
 config SERIAL_MSM_CONSOLE
@@ -1035,7 +1303,7 @@ config SERIAL_MSM_HS
 
 config SERIAL_VT8500
         bool "VIA VT8500 on-chip serial port support"
-        depends on ARCH_VT8500
+        depends on ARM && ARCH_VT8500
         select SERIAL_CORE
 
 config SERIAL_VT8500_CONSOLE
@@ -1045,7 +1313,7 @@ config SERIAL_VT8500_CONSOLE
 
 config SERIAL_NETX
         tristate "NetX serial port support"
-        depends on ARCH_NETX
+        depends on ARM && ARCH_NETX
         select SERIAL_CORE
         help
           If you have a machine based on a Hilscher NetX SoC you
@@ -1074,7 +1342,7 @@ config SERIAL_OF_PLATFORM
 
 config SERIAL_OMAP
         tristate "OMAP serial port support"
-        depends on ARCH_OMAP2PLUS
+        depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4
         select SERIAL_CORE
         help
           If you have a machine based on an Texas Instruments OMAP CPU you
@@ -1086,7 +1354,7 @@ config SERIAL_OMAP
 
 config SERIAL_OMAP_CONSOLE
         bool "Console on OMAP serial port"
-        depends on SERIAL_OMAP=y
+        depends on SERIAL_OMAP
         select SERIAL_CORE_CONSOLE
         help
           Select this option if you would like to use omap serial port as
@@ -1149,24 +1417,6 @@ config SERIAL_SC26XX_CONSOLE
         help
           Support for Console on SC2681/SC2692 serial ports.
 
-config SERIAL_SCCNXP
-        tristate "SCCNXP serial port support"
-        depends on !SERIAL_SC26XX
-        select SERIAL_CORE
-        default n
-        help
-          This selects support for an advanced UART from NXP (Philips).
-          Supported ICs are SCC2681, SCC2691, SCC2692, SC28L91, SC28L92,
-          SC28L202, SCC68681 and SCC68692.
-          Positioned as a replacement for the driver SC26XX.
-
-config SERIAL_SCCNXP_CONSOLE
-        bool "Console on SCCNXP serial port"
-        depends on SERIAL_SCCNXP=y
-        select SERIAL_CORE_CONSOLE
-        help
-          Support for console on SCCNXP serial ports.
-
 config SERIAL_BFIN_SPORT
         tristate "Blackfin SPORT emulate UART"
         depends on BLACKFIN
@@ -1323,7 +1573,7 @@ config SERIAL_ALTERA_UART_CONSOLE
 
 config SERIAL_IFX6X60
         tristate "SPI protocol driver for Infineon 6x60 modem (EXPERIMENTAL)"
-        depends on GPIOLIB && SPI
+        depends on GPIOLIB && SPI && EXPERIMENTAL
         help
           Support for the IFX6x60 modem devices on Intel MID platforms.
 
@@ -1343,15 +1593,6 @@ config SERIAL_PCH_UART
           ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
           ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
 
-config SERIAL_PCH_UART_CONSOLE
-        bool "Support for console on Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH"
-        depends on SERIAL_PCH_UART=y
-        select SERIAL_CORE_CONSOLE
-        help
-          Say Y here if you wish to use the PCH 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).
-
 config SERIAL_MSM_SMD
         bool "Enable tty device interface for some SMD ports"
         default n
@@ -1376,7 +1617,6 @@ config SERIAL_MXS_AUART_CONSOLE
 
 config SERIAL_XILINX_PS_UART
         tristate "Xilinx PS UART support"
-        depends on OF
         select SERIAL_CORE
         help
           This driver supports the Xilinx PS UART port.
@@ -1388,63 +1628,4 @@ config SERIAL_XILINX_PS_UART_CONSOLE
         help
           Enable a Xilinx PS UART port to be the system console.
 
-config SERIAL_AR933X
-        bool "AR933X serial port support"
-        depends on SOC_AR933X
-        select SERIAL_CORE
-        help
-          If you have an Atheros AR933X SOC based board and want to use the
-          built-in UART of the SoC, say Y to this option.
-
-config SERIAL_AR933X_CONSOLE
-        bool "Console on AR933X serial port"
-        depends on SERIAL_AR933X=y
-        select SERIAL_CORE_CONSOLE
-        help
-          Enable a built-in UART port of the AR933X to be the system console.
-
-config SERIAL_AR933X_NR_UARTS
-        int "Maximum number of AR933X serial ports"
-        depends on SERIAL_AR933X
-        default "2"
-        help
-          Set this to the number of serial ports you want the driver
-          to support.
-
-config SERIAL_EFM32_UART
-        tristate "EFM32 UART/USART port."
-        depends on ARCH_EFM32
-        select SERIAL_CORE
-        help
-          This driver support the USART and UART ports on
-          Energy Micro's efm32 SoCs.
-
-config SERIAL_EFM32_UART_CONSOLE
-        bool "EFM32 UART/USART console support"
-        depends on SERIAL_EFM32_UART=y
-        select SERIAL_CORE_CONSOLE
-
-config SERIAL_ARC
-        tristate "ARC UART driver support"
-        select SERIAL_CORE
-        help
-          Driver for on-chip UART for ARC(Synopsys) for the legacy
-          FPGA Boards (ML50x/ARCAngel4)
-
-config SERIAL_ARC_CONSOLE
-        bool "Console on ARC UART"
-        depends on SERIAL_ARC=y
-        select SERIAL_CORE_CONSOLE
-        help
-          Enable system Console on ARC UART
-
-config SERIAL_ARC_NR_PORTS
-        int "Number of ARC UART ports"
-        depends on SERIAL_ARC
-        range 1 3
-        default "1"
-        help
-          Set this to the number of serial ports you want the driver
-          to support.
-
 endmenu
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index df1b998c436..438af89db55 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -1,6 +1,7 @@
 #
 # Makefile for the kernel serial device drivers.
 #
+GCOV_PROFILE_tegra_hsuart.o := y
 
 obj-$(CONFIG_SERIAL_CORE) += serial_core.o
 obj-$(CONFIG_SERIAL_21285) += 21285.o
@@ -14,9 +15,20 @@ obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
 obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
 obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
 
-# Now bring in any enabled 8250/16450/16550 type drivers.
-obj-$(CONFIG_SERIAL_8250) += 8250/
-
+obj-$(CONFIG_SERIAL_8250) += 8250.o
+obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
+obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
+obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
+obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
+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_8250_FOURPORT) += 8250_fourport.o
+obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
+obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
+obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
+obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
+obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
@@ -24,17 +36,24 @@ obj-$(CONFIG_SERIAL_PXA) += pxa.o
 obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
 obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
 obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
-obj-$(CONFIG_SERIAL_BFIN) += bfin_uart.o
+obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
 obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
+obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
+obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
+obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
+obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
+obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o
+obj-$(CONFIG_SERIAL_TEGRA) += tegra_hsuart.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
-obj-$(CONFIG_SERIAL_MAX310X) += max310x.o
+obj-$(CONFIG_SERIAL_MAX3107) += max3107.o
+obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
 obj-$(CONFIG_SERIAL_MUX) += mux.o
 obj-$(CONFIG_SERIAL_68328) += 68328serial.o
+obj-$(CONFIG_SERIAL_68360) += 68360serial.o
 obj-$(CONFIG_SERIAL_MCF) += mcf.o
 obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o
-obj-$(CONFIG_SERIAL_HS_LPC32XX) += lpc32xx_hs.o
 obj-$(CONFIG_SERIAL_DZ) += dz.o
 obj-$(CONFIG_SERIAL_ZS) += zs.o
 obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
@@ -48,7 +67,6 @@ obj-$(CONFIG_SERIAL_MPSC) += mpsc.o
 obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o
 obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o
 obj-$(CONFIG_SERIAL_SC26XX) += sc26xx.o
-obj-$(CONFIG_SERIAL_SCCNXP) += sccnxp.o
 obj-$(CONFIG_SERIAL_JSM) += jsm/
 obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o
 obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o
@@ -61,15 +79,14 @@ obj-$(CONFIG_SERIAL_MSM_HS) += msm_serial_hs.o
 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o
-obj-$(CONFIG_SERIAL_KGDB_NMI) += kgdb_nmi.o
 obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
-obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
 obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
 obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o
 obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o
 obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o
+obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
 obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o
 obj-$(CONFIG_SERIAL_MRST_MAX3110)       += mrst_max3110.o
 obj-$(CONFIG_SERIAL_MFD_HSU)    += mfd.o
@@ -79,7 +96,3 @@ obj-$(CONFIG_SERIAL_MSM_SMD)	+= msm_smd_tty.o
 obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
 obj-$(CONFIG_SERIAL_LANTIQ)     += lantiq.o
 obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
-obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o
-obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o
-obj-$(CONFIG_SERIAL_EFM32_UART) += efm32-uart.o
-obj-$(CONFIG_SERIAL_ARC)        += arc_uart.o
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index 872f14ae43d..60e049b041a 100644
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/console.h>
-#include <linux/of.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
@@ -219,7 +218,7 @@ static int altera_jtaguart_startup(struct uart_port *port)
         unsigned long flags;
         int ret;
 
-        ret = request_irq(port->irq, altera_jtaguart_interrupt, 0,
+        ret = request_irq(port->irq, altera_jtaguart_interrupt, IRQF_DISABLED,
                         DRV_NAME, port);
         if (ret) {
                 pr_err(DRV_NAME ": unable to attach Altera JTAG UART %d "
@@ -406,7 +405,7 @@ static struct uart_driver altera_jtaguart_driver = {
         .cons           = ALTERA_JTAGUART_CONSOLE,
 };
 
-static int altera_jtaguart_probe(struct platform_device *pdev)
+static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 {
         struct altera_jtaguart_platform_uart *platp = pdev->dev.platform_data;
         struct uart_port *port;
@@ -453,7 +452,7 @@ static int altera_jtaguart_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int altera_jtaguart_remove(struct platform_device *pdev)
+static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 {
         struct uart_port *port;
         int i = pdev->id;
@@ -473,15 +472,17 @@ static struct of_device_id altera_jtaguart_match[] = {
         {},
 };
 MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#else
+#define altera_jtaguart_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver altera_jtaguart_platform_driver = {
         .probe  = altera_jtaguart_probe,
-        .remove = altera_jtaguart_remove,
+        .remove = __devexit_p(altera_jtaguart_remove),
         .driver = {
                 .name           = DRV_NAME,
                 .owner          = THIS_MODULE,
-                .of_match_table = of_match_ptr(altera_jtaguart_match),
+                .of_match_table = altera_jtaguart_match,
         },
 };
 
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 684a0808e1c..50bc5a5ac65 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -315,7 +315,7 @@ static int altera_uart_startup(struct uart_port *port)
                 return 0;
         }
 
-        ret = request_irq(port->irq, altera_uart_interrupt, 0,
+        ret = request_irq(port->irq, altera_uart_interrupt, IRQF_DISABLED,
                         DRV_NAME, port);
         if (ret) {
                 pr_err(DRV_NAME ": unable to attach Altera UART %d "
@@ -377,26 +377,6 @@ static int altera_uart_verify_port(struct uart_port *port,
         return 0;
 }
 
-#ifdef CONFIG_CONSOLE_POLL
-static int altera_uart_poll_get_char(struct uart_port *port)
-{
-        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
-                 ALTERA_UART_STATUS_RRDY_MSK))
-                cpu_relax();
-
-        return altera_uart_readl(port, ALTERA_UART_RXDATA_REG);
-}
-
-static void altera_uart_poll_put_char(struct uart_port *port, unsigned char c)
-{
-        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
-                 ALTERA_UART_STATUS_TRDY_MSK))
-                cpu_relax();
-
-        altera_uart_writel(port, c, ALTERA_UART_TXDATA_REG);
-}
-#endif
-
 /*
  *      Define the basic serial functions we support.
  */
@@ -417,16 +397,35 @@ static struct uart_ops altera_uart_ops = {
         .release_port   = altera_uart_release_port,
         .config_port    = altera_uart_config_port,
         .verify_port    = altera_uart_verify_port,
-#ifdef CONFIG_CONSOLE_POLL
-        .poll_get_char  = altera_uart_poll_get_char,
-        .poll_put_char  = altera_uart_poll_put_char,
-#endif
 };
 
 static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS];
 
 #if defined(CONFIG_SERIAL_ALTERA_UART_CONSOLE)
 
+int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)
+{
+        struct uart_port *port;
+        int i;
+
+        for (i = 0; i < CONFIG_SERIAL_ALTERA_UART_MAXPORTS && platp[i].mapbase; i++) {
+                port = &altera_uart_ports[i].port;
+
+                port->line = i;
+                port->type = PORT_ALTERA_UART;
+                port->mapbase = platp[i].mapbase;
+                port->membase = ioremap(port->mapbase, ALTERA_UART_SIZE);
+                port->iotype = SERIAL_IO_MEM;
+                port->irq = platp[i].irq;
+                port->uartclk = platp[i].uartclk;
+                port->flags = UPF_BOOT_AUTOCONF;
+                port->ops = &altera_uart_ops;
+                port->private_data = platp;
+        }
+
+        return 0;
+}
+
 static void altera_uart_console_putc(struct uart_port *port, const char c)
 {
         while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
@@ -532,7 +531,7 @@ static int altera_uart_get_of_uartclk(struct platform_device *pdev,
 }
 #endif /* CONFIG_OF */
 
-static int altera_uart_probe(struct platform_device *pdev)
+static int __devinit altera_uart_probe(struct platform_device *pdev)
 {
         struct altera_uart_platform_uart *platp = pdev->dev.platform_data;
         struct uart_port *port;
@@ -556,7 +555,7 @@ static int altera_uart_probe(struct platform_device *pdev)
         res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res_mem)
                 port->mapbase = res_mem->start;
-        else if (platp)
+        else if (platp->mapbase)
                 port->mapbase = platp->mapbase;
         else
                 return -EINVAL;
@@ -564,7 +563,7 @@ static int altera_uart_probe(struct platform_device *pdev)
         res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res_irq)
                 port->irq = res_irq->start;
-        else if (platp)
+        else if (platp->irq)
                 port->irq = platp->irq;
 
         /* Check platform data first so we can override device node data */
@@ -591,20 +590,20 @@ static int altera_uart_probe(struct platform_device *pdev)
         port->ops = &altera_uart_ops;
         port->flags = UPF_BOOT_AUTOCONF;
 
-        platform_set_drvdata(pdev, port);
+        dev_set_drvdata(&pdev->dev, port);
 
         uart_add_one_port(&altera_uart_driver, port);
 
         return 0;
 }
 
-static int altera_uart_remove(struct platform_device *pdev)
+static int __devexit altera_uart_remove(struct platform_device *pdev)
 {
-        struct uart_port *port = platform_get_drvdata(pdev);
+        struct uart_port *port = dev_get_drvdata(&pdev->dev);
 
         if (port) {
                 uart_remove_one_port(&altera_uart_driver, port);
-                platform_set_drvdata(pdev, NULL);
+                dev_set_drvdata(&pdev->dev, NULL);
                 port->mapbase = 0;
         }
 
@@ -617,15 +616,17 @@ static struct of_device_id altera_uart_match[] = {
         {},
 };
 MODULE_DEVICE_TABLE(of, altera_uart_match);
+#else
+#define altera_uart_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver altera_uart_platform_driver = {
         .probe  = altera_uart_probe,
-        .remove = altera_uart_remove,
+        .remove = __devexit_p(altera_uart_remove),
         .driver = {
                 .name           = DRV_NAME,
                 .owner          = THIS_MODULE,
-                .of_match_table = of_match_ptr(altera_uart_match),
+                .of_match_table = altera_uart_match,
         },
 };
 
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 22317dd1647..c0d10c4ddb7 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -315,7 +315,7 @@ static int pl010_startup(struct uart_port *port)
         /*
          * Try to enable the clock producer.
          */
-        retval = clk_prepare_enable(uap->clk);
+        retval = clk_enable(uap->clk);
         if (retval)
                 goto out;
 
@@ -342,7 +342,7 @@ static int pl010_startup(struct uart_port *port)
         return 0;
 
  clk_dis:
-        clk_disable_unprepare(uap->clk);
+        clk_disable(uap->clk);
  out:
         return retval;
 }
@@ -369,7 +369,7 @@ static void pl010_shutdown(struct uart_port *port)
         /*
          * Shut down the clock producer
          */
-        clk_disable_unprepare(uap->clk);
+        clk_disable(uap->clk);
 }
 
 static void
@@ -626,7 +626,6 @@ static int __init pl010_console_setup(struct console *co, char *options)
         int bits = 8;
         int parity = 'n';
         int flow = 'n';
-        int ret;
 
         /*
          * Check whether an invalid uart number has been specified, and
@@ -639,10 +638,6 @@ static int __init pl010_console_setup(struct console *co, char *options)
         if (!uap)
                 return -ENODEV;
 
-        ret = clk_prepare(uap->clk);
-        if (ret)
-                return ret;
-
         uap->port.uartclk = clk_get_rate(uap->clk);
 
         if (options)
@@ -788,8 +783,6 @@ static struct amba_id pl010_ids[] = {
         { 0, 0 },
 };
 
-MODULE_DEVICE_TABLE(amba, pl010_ids);
-
 static struct amba_driver pl010_driver = {
         .drv = {
                 .name   = "uart-pl010",
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 7fca4022a8b..4a4733e601d 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -51,12 +51,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
-#include <linux/types.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/sizes.h>
-#include <linux/io.h>
+
+#include <asm/io.h>
+#include <asm/sizes.h>
 
 #define UART_NR                 14
 
@@ -69,6 +66,30 @@
 #define UART_DR_ERROR           (UART011_DR_OE|UART011_DR_BE|UART011_DR_PE|UART011_DR_FE)
 #define UART_DUMMY_DR_RX        (1 << 16)
 
+
+#define UART_WA_SAVE_NR 14
+
+static void pl011_lockup_wa(unsigned long data);
+static const u32 uart_wa_reg[UART_WA_SAVE_NR] = {
+        ST_UART011_DMAWM,
+        ST_UART011_TIMEOUT,
+        ST_UART011_LCRH_RX,
+        UART011_IBRD,
+        UART011_FBRD,
+        ST_UART011_LCRH_TX,
+        UART011_IFLS,
+        ST_UART011_XFCR,
+        ST_UART011_XON1,
+        ST_UART011_XON2,
+        ST_UART011_XOFF1,
+        ST_UART011_XOFF2,
+        UART011_CR,
+        UART011_IMSC
+};
+
+static u32 uart_wa_regdata[UART_WA_SAVE_NR];
+static DECLARE_TASKLET(pl011_lockup_tlet, pl011_lockup_wa, 0);
+
 /* There is by now at least one vendor with differing details, so handle it */
 struct vendor_data {
         unsigned int            ifls;
@@ -76,8 +97,8 @@ struct vendor_data {
         unsigned int            lcrh_tx;
         unsigned int            lcrh_rx;
         bool                    oversampling;
+        bool                    interrupt_may_hang;   /* vendor-specific */
         bool                    dma_threshold;
-        bool                    cts_event_workaround;
 };
 
 static struct vendor_data vendor_arm = {
@@ -87,7 +108,6 @@ static struct vendor_data vendor_arm = {
         .lcrh_rx                = UART011_LCRH,
         .oversampling           = false,
         .dma_threshold          = false,
-        .cts_event_workaround   = false,
 };
 
 static struct vendor_data vendor_st = {
@@ -96,8 +116,8 @@ static struct vendor_data vendor_st = {
         .lcrh_tx                = ST_UART011_LCRH_TX,
         .lcrh_rx                = ST_UART011_LCRH_RX,
         .oversampling           = true,
+        .interrupt_may_hang     = true,
         .dma_threshold          = true,
-        .cts_event_workaround   = true,
 };
 
 static struct uart_amba_port *amba_ports[UART_NR];
@@ -132,10 +152,6 @@ struct pl011_dmatx_data {
 struct uart_amba_port {
         struct uart_port        port;
         struct clk              *clk;
-        /* Two optional pin states - default & sleep */
-        struct pinctrl          *pinctrl;
-        struct pinctrl_state    *pins_default;
-        struct pinctrl_state    *pins_sleep;
         const struct vendor_data *vendor;
         unsigned int            dmacr;          /* dma control reg */
         unsigned int            im;             /* interrupt mask */
@@ -143,9 +159,9 @@ struct uart_amba_port {
         unsigned int            fifosize;       /* vendor-specific */
         unsigned int            lcrh_tx;        /* vendor-specific */
         unsigned int            lcrh_rx;        /* vendor-specific */
-        unsigned int            old_cr;         /* state during shutdown */
         bool                    autorts;
         char                    type[12];
+        bool                    interrupt_may_hang; /* vendor-specific */
 #ifdef CONFIG_DMA_ENGINE
         /* DMA stuff */
         bool                    using_tx_dma;
@@ -252,9 +268,8 @@ static void pl011_dma_probe_initcall(struct uart_amba_port *uap)
         struct dma_slave_config tx_conf = {
                 .dst_addr = uap->port.mapbase + UART01x_DR,
                 .dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
-                .direction = DMA_MEM_TO_DEV,
+                .direction = DMA_TO_DEVICE,
                 .dst_maxburst = uap->fifosize >> 1,
-                .device_fc = false,
         };
         struct dma_chan *chan;
         dma_cap_mask_t mask;
@@ -286,9 +301,8 @@ static void pl011_dma_probe_initcall(struct uart_amba_port *uap)
                 struct dma_slave_config rx_conf = {
                         .src_addr = uap->port.mapbase + UART01x_DR,
                         .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
-                        .direction = DMA_DEV_TO_MEM,
+                        .direction = DMA_FROM_DEVICE,
                         .src_maxburst = uap->fifosize >> 1,
-                        .device_fc = false,
                 };
 
                 chan = dma_request_channel(mask, plat->dma_filter, plat->dma_rx_param);
@@ -466,7 +480,7 @@ static int pl011_dma_tx_refill(struct uart_amba_port *uap)
                 return -EBUSY;
         }
 
-        desc = dmaengine_prep_slave_sg(chan, &dmatx->sg, 1, DMA_MEM_TO_DEV,
+        desc = dma_dev->device_prep_slave_sg(chan, &dmatx->sg, 1, DMA_TO_DEVICE,
                                              DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 dma_unmap_sg(dma_dev->dev, &dmatx->sg, 1, DMA_TO_DEVICE);
@@ -649,6 +663,7 @@ static void pl011_dma_rx_callback(void *data);
 static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap)
 {
         struct dma_chan *rxchan = uap->dmarx.chan;
+        struct dma_device *dma_dev;
         struct pl011_dmarx_data *dmarx = &uap->dmarx;
         struct dma_async_tx_descriptor *desc;
         struct pl011_sgbuf *sgbuf;
@@ -659,8 +674,9 @@ static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap)
         /* Start the RX DMA job */
         sgbuf = uap->dmarx.use_buf_b ?
                 &uap->dmarx.sgbuf_b : &uap->dmarx.sgbuf_a;
-        desc = dmaengine_prep_slave_sg(rxchan, &sgbuf->sg, 1,
-                                        DMA_DEV_TO_MEM,
+        dma_dev = rxchan->device;
+        desc = rxchan->device->device_prep_slave_sg(rxchan, &sgbuf->sg, 1,
+                                        DMA_FROM_DEVICE,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         /*
          * If the DMA engine is busy and cannot prepare a
@@ -810,12 +826,7 @@ static void pl011_dma_rx_callback(void *data)
 {
         struct uart_amba_port *uap = data;
         struct pl011_dmarx_data *dmarx = &uap->dmarx;
-        struct dma_chan *rxchan = dmarx->chan;
         bool lastbuf = dmarx->use_buf_b;
-        struct pl011_sgbuf *sgbuf = dmarx->use_buf_b ?
-                &dmarx->sgbuf_b : &dmarx->sgbuf_a;
-        size_t pending;
-        struct dma_tx_state state;
         int ret;
 
         /*
@@ -826,21 +837,11 @@ static void pl011_dma_rx_callback(void *data)
          * we immediately trigger the next DMA job.
          */
         spin_lock_irq(&uap->port.lock);
-        /*
-         * Rx data can be taken by the UART interrupts during
-         * the DMA irq handler. So we check the residue here.
-         */
-        rxchan->device->device_tx_status(rxchan, dmarx->cookie, &state);
-        pending = sgbuf->sg.length - state.residue;
-        BUG_ON(pending > PL011_DMA_BUFFER_SIZE);
-        /* Then we terminate the transfer - we now know our residue */
-        dmaengine_terminate_all(rxchan);
-
         uap->dmarx.running = false;
         dmarx->use_buf_b = !lastbuf;
         ret = pl011_dma_rx_trigger_dma(uap);
 
-        pl011_dma_rx_chars(uap, pending, lastbuf, false);
+        pl011_dma_rx_chars(uap, PL011_DMA_BUFFER_SIZE, lastbuf, false);
         spin_unlock_irq(&uap->port.lock);
         /*
          * Do this check after we picked the DMA chars so we don't
@@ -1036,6 +1037,69 @@ static inline bool pl011_dma_rx_running(struct uart_amba_port *uap)
 #define pl011_dma_flush_buffer  NULL
 #endif
 
+
+/*
+ * pl011_lockup_wa
+ * This workaround aims to break the deadlock situation
+ * when after long transfer over uart in hardware flow
+ * control, uart interrupt registers cannot be cleared.
+ * Hence uart transfer gets blocked.
+ *
+ * It is seen that during such deadlock condition ICR
+ * don't get cleared even on multiple write. This leads
+ * pass_counter to decrease and finally reach zero. This
+ * can be taken as trigger point to run this UART_BT_WA.
+ *
+ */
+static void pl011_lockup_wa(unsigned long data)
+{
+        struct uart_amba_port *uap = amba_ports[0];
+        void __iomem *base = uap->port.membase;
+        struct circ_buf *xmit = &uap->port.state->xmit;
+        struct tty_struct *tty = uap->port.state->port.tty;
+        int buf_empty_retries = 200;
+        int loop;
+
+        /* Stop HCI layer from submitting data for tx */
+        tty->hw_stopped = 1;
+        while (!uart_circ_empty(xmit)) {
+                if (buf_empty_retries-- == 0)
+                        break;
+                udelay(100);
+        }
+
+        /* Backup registers */
+        for (loop = 0; loop < UART_WA_SAVE_NR; loop++)
+                uart_wa_regdata[loop] = readl(base + uart_wa_reg[loop]);
+
+        /* Disable UART so that FIFO data is flushed out */
+        writew(0x00, uap->port.membase + UART011_CR);
+
+        /* Soft reset UART module */
+        if (uap->port.dev->platform_data) {
+                struct amba_pl011_data *plat;
+
+                plat = uap->port.dev->platform_data;
+                if (plat->reset)
+                        plat->reset();
+        }
+
+        /* Restore registers */
+        for (loop = 0; loop < UART_WA_SAVE_NR; loop++)
+                writew(uart_wa_regdata[loop] ,
+                                uap->port.membase + uart_wa_reg[loop]);
+
+        /* Initialise the old status of the modem signals */
+        uap->old_status = readw(uap->port.membase + UART01x_FR) &
+                UART01x_FR_MODEM_ANY;
+
+        if (readl(base + UART011_MIS) & 0x2)
+                printk(KERN_EMERG "UART_BT_WA: ***FAILED***\n");
+
+        /* Start Tx/Rx */
+        tty->hw_stopped = 0;
+}
+
 static void pl011_stop_tx(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
@@ -1164,26 +1228,12 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
         unsigned long flags;
         unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;
         int handled = 0;
-        unsigned int dummy_read;
 
         spin_lock_irqsave(&uap->port.lock, flags);
 
         status = readw(uap->port.membase + UART011_MIS);
         if (status) {
                 do {
-                        if (uap->vendor->cts_event_workaround) {
-                                /* workaround to make sure that all bits are unlocked.. */
-                                writew(0x00, uap->port.membase + UART011_ICR);
-
-                                /*
-                                 * WA: introduce 26ns(1 uart clk) delay before W1C;
-                                 * single apb access will incur 2 pclk(133.12Mhz) delay,
-                                 * so add 2 dummy reads
-                                 */
-                                dummy_read = readw(uap->port.membase + UART011_ICR);
-                                dummy_read = readw(uap->port.membase + UART011_ICR);
-                        }
-
                         writew(status & ~(UART011_TXIS|UART011_RTIS|
                                           UART011_RXIS),
                                uap->port.membase + UART011_ICR);
@@ -1200,8 +1250,11 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
                         if (status & UART011_TXIS)
                                 pl011_tx_chars(uap);
 
-                        if (pass_counter-- == 0)
+                        if (pass_counter-- == 0) {
+                                if (uap->interrupt_may_hang)
+                                        tasklet_schedule(&pl011_lockup_tlet);
                                 break;
+                        }
 
                         status = readw(uap->port.membase + UART011_MIS);
                 } while (status != 0);
@@ -1213,14 +1266,14 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
         return IRQ_RETVAL(handled);
 }
 
-static unsigned int pl011_tx_empty(struct uart_port *port)
+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 pl011_get_mctrl(struct uart_port *port)
+static unsigned int pl01x_get_mctrl(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int result = 0;
@@ -1283,40 +1336,11 @@ static void pl011_break_ctl(struct uart_port *port, int break_state)
 }
 
 #ifdef CONFIG_CONSOLE_POLL
-
-static void pl011_quiesce_irqs(struct uart_port *port)
-{
-        struct uart_amba_port *uap = (struct uart_amba_port *)port;
-        unsigned char __iomem *regs = uap->port.membase;
-
-        writew(readw(regs + UART011_MIS), regs + UART011_ICR);
-        /*
-         * There is no way to clear TXIM as this is "ready to transmit IRQ", so
-         * we simply mask it. start_tx() will unmask it.
-         *
-         * Note we can race with start_tx(), and if the race happens, the
-         * polling user might get another interrupt just after we clear it.
-         * But it should be OK and can happen even w/o the race, e.g.
-         * controller immediately got some new data and raised the IRQ.
-         *
-         * And whoever uses polling routines assumes that it manages the device
-         * (including tx queue), so we're also fine with start_tx()'s caller
-         * side.
-         */
-        writew(readw(regs + UART011_IMSC) & ~UART011_TXIM, regs + UART011_IMSC);
-}
-
-static int pl011_get_poll_char(struct uart_port *port)
+static int pl010_get_poll_char(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int status;
 
-        /*
-         * The caller might need IRQs lowered, e.g. if used with KDB NMI
-         * debugger.
-         */
-        pl011_quiesce_irqs(port);
-
         status = readw(uap->port.membase + UART01x_FR);
         if (status & UART01x_FR_RXFE)
                 return NO_POLL_CHAR;
@@ -1324,7 +1348,7 @@ static int pl011_get_poll_char(struct uart_port *port)
         return readw(uap->port.membase + UART01x_DR);
 }
 
-static void pl011_put_poll_char(struct uart_port *port,
+static void pl010_put_poll_char(struct uart_port *port,
                          unsigned char ch)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
@@ -1337,63 +1361,21 @@ static void pl011_put_poll_char(struct uart_port *port,
 
 #endif /* CONFIG_CONSOLE_POLL */
 
-static int pl011_hwinit(struct uart_port *port)
+static int pl011_startup(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int cr;
         int retval;
 
-        /* Optionaly enable pins to be muxed in and configured */
-        if (!IS_ERR(uap->pins_default)) {
-                retval = pinctrl_select_state(uap->pinctrl, uap->pins_default);
-                if (retval)
-                        dev_err(port->dev,
-                                "could not set default pins\n");
-        }
-
         /*
          * Try to enable the clock producer.
          */
-        retval = clk_prepare_enable(uap->clk);
+        retval = clk_enable(uap->clk);
         if (retval)
                 goto out;
 
         uap->port.uartclk = clk_get_rate(uap->clk);
 
-        /* Clear pending error and receive interrupts */
-        writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS |
-               UART011_RTIS | UART011_RXIS, uap->port.membase + UART011_ICR);
-
-        /*
-         * Save interrupts enable mask, and enable RX interrupts in case if
-         * the interrupt is used for NMI entry.
-         */
-        uap->im = readw(uap->port.membase + UART011_IMSC);
-        writew(UART011_RTIM | UART011_RXIM, uap->port.membase + UART011_IMSC);
-
-        if (uap->port.dev->platform_data) {
-                struct amba_pl011_data *plat;
-
-                plat = uap->port.dev->platform_data;
-                if (plat->init)
-                        plat->init();
-        }
-        return 0;
- out:
-        return retval;
-}
-
-static int pl011_startup(struct uart_port *port)
-{
-        struct uart_amba_port *uap = (struct uart_amba_port *)port;
-        unsigned int cr;
-        int retval;
-
-        retval = pl011_hwinit(port);
-        if (retval)
-                goto clk_dis;
-
-        writew(uap->im, uap->port.membase + UART011_IMSC);
-
         /*
          * Allocate the IRQ
          */
@@ -1425,11 +1407,13 @@ static int pl011_startup(struct uart_port *port)
         while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
                 barrier();
 
-        /* restore RTS and DTR */
-        cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR);
-        cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
+        cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
         writew(cr, uap->port.membase + UART011_CR);
 
+        /* Clear pending error interrupts */
+        writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS,
+               uap->port.membase + UART011_ICR);
+
         /*
          * initialise the old status of the modem signals
          */
@@ -1444,19 +1428,25 @@ static int pl011_startup(struct uart_port *port)
          * as well.
          */
         spin_lock_irq(&uap->port.lock);
-        /* Clear out any spuriously appearing RX interrupts */
-         writew(UART011_RTIS | UART011_RXIS,
-                uap->port.membase + UART011_ICR);
         uap->im = UART011_RTIM;
         if (!pl011_dma_rx_running(uap))
                 uap->im |= UART011_RXIM;
         writew(uap->im, uap->port.membase + UART011_IMSC);
         spin_unlock_irq(&uap->port.lock);
 
+        if (uap->port.dev->platform_data) {
+                struct amba_pl011_data *plat;
+
+                plat = uap->port.dev->platform_data;
+                if (plat->init)
+                        plat->init();
+        }
+
         return 0;
 
  clk_dis:
-        clk_disable_unprepare(uap->clk);
+        clk_disable(uap->clk);
+ out:
         return retval;
 }
 
@@ -1473,8 +1463,6 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap,
 static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
-        unsigned int cr;
-        int retval;
 
         /*
          * disable all interrupts
@@ -1494,16 +1482,9 @@ static void pl011_shutdown(struct uart_port *port)
 
         /*
          * disable the port
-         * disable the port. It should not disable RTS and DTR.
-         * Also RTS and DTR state should be preserved to restore
-         * it during startup().
          */
         uap->autorts = false;
-        cr = readw(uap->port.membase + UART011_CR);
-        uap->old_cr = cr;
-        cr &= UART011_CR_RTS | UART011_CR_DTR;
-        cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
-        writew(cr, uap->port.membase + UART011_CR);
+        writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
 
         /*
          * disable break condition and fifos
@@ -1515,15 +1496,7 @@ static void pl011_shutdown(struct uart_port *port)
         /*
          * Shut down the clock producer
          */
-        clk_disable_unprepare(uap->clk);
-        /* Optionally let pins go into sleep states */
-        if (!IS_ERR(uap->pins_sleep)) {
-                retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep);
-                if (retval)
-                        dev_err(port->dev,
-                                "could not set pins to sleep state\n");
-        }
-
+        clk_disable(uap->clk);
 
         if (uap->port.dev->platform_data) {
                 struct amba_pl011_data *plat;
@@ -1644,26 +1617,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
                         old_cr &= ~ST_UART011_CR_OVSFACT;
         }
 
-        /*
-         * Workaround for the ST Micro oversampling variants to
-         * increase the bitrate slightly, by lowering the divisor,
-         * to avoid delayed sampling of start bit at high speeds,
-         * else we see data corruption.
-         */
-        if (uap->vendor->oversampling) {
-                if ((baud >= 3000000) && (baud < 3250000) && (quot > 1))
-                        quot -= 1;
-                else if ((baud > 3250000) && (quot > 2))
-                        quot -= 2;
-        }
         /* Set baud rate */
         writew(quot & 0x3f, port->membase + UART011_FBRD);
         writew(quot >> 6, port->membase + UART011_IBRD);
 
         /*
          * ----------v----------v----------v----------v-----
-         * NOTE: lcrh_tx and lcrh_rx MUST BE WRITTEN AFTER
-         * UART011_FBRD & UART011_IBRD.
+         * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
          * ----------^----------^----------^----------^-----
          */
         writew(lcr_h, port->membase + uap->lcrh_rx);
@@ -1691,7 +1651,7 @@ static const char *pl011_type(struct uart_port *port)
 /*
  * Release the memory region(s) being used by 'port'
  */
-static void pl011_release_port(struct uart_port *port)
+static void pl010_release_port(struct uart_port *port)
 {
         release_mem_region(port->mapbase, SZ_4K);
 }
@@ -1699,7 +1659,7 @@ static void pl011_release_port(struct uart_port *port)
 /*
  * Request the memory region(s) being used by 'port'
  */
-static int pl011_request_port(struct uart_port *port)
+static int pl010_request_port(struct uart_port *port)
 {
         return request_mem_region(port->mapbase, SZ_4K, "uart-pl011")
                         != NULL ? 0 : -EBUSY;
@@ -1708,18 +1668,18 @@ static int pl011_request_port(struct uart_port *port)
 /*
  * Configure/autoconfigure the port.
  */
-static void pl011_config_port(struct uart_port *port, int flags)
+static void pl010_config_port(struct uart_port *port, int flags)
 {
         if (flags & UART_CONFIG_TYPE) {
                 port->type = PORT_AMBA;
-                pl011_request_port(port);
+                pl010_request_port(port);
         }
 }
 
 /*
  * verify the new serial_struct (for TIOCSSERIAL).
  */
-static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)
+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)
@@ -1732,9 +1692,9 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)
 }
 
 static struct uart_ops amba_pl011_pops = {
-        .tx_empty       = pl011_tx_empty,
+        .tx_empty       = pl01x_tx_empty,
         .set_mctrl      = pl011_set_mctrl,
-        .get_mctrl      = pl011_get_mctrl,
+        .get_mctrl      = pl01x_get_mctrl,
         .stop_tx        = pl011_stop_tx,
         .start_tx       = pl011_start_tx,
         .stop_rx        = pl011_stop_rx,
@@ -1745,14 +1705,13 @@ static struct uart_ops amba_pl011_pops = {
         .flush_buffer   = pl011_dma_flush_buffer,
         .set_termios    = pl011_set_termios,
         .type           = pl011_type,
-        .release_port   = pl011_release_port,
-        .request_port   = pl011_request_port,
-        .config_port    = pl011_config_port,
-        .verify_port    = pl011_verify_port,
+        .release_port   = pl010_release_port,
+        .request_port   = pl010_request_port,
+        .config_port    = pl010_config_port,
+        .verify_port    = pl010_verify_port,
 #ifdef CONFIG_CONSOLE_POLL
-        .poll_init     = pl011_hwinit,
-        .poll_get_char = pl011_get_poll_char,
-        .poll_put_char = pl011_put_poll_char,
+        .poll_get_char = pl010_get_poll_char,
+        .poll_put_char = pl010_put_poll_char,
 #endif
 };
 
@@ -1855,7 +1814,6 @@ static int __init pl011_console_setup(struct console *co, char *options)
         int bits = 8;
         int parity = 'n';
         int flow = 'n';
-        int ret;
 
         /*
          * Check whether an invalid uart number has been specified, and
@@ -1868,18 +1826,6 @@ static int __init pl011_console_setup(struct console *co, char *options)
         if (!uap)
                 return -ENODEV;
 
-        /* Allow pins to be muxed in and configured */
-        if (!IS_ERR(uap->pins_default)) {
-                ret = pinctrl_select_state(uap->pinctrl, uap->pins_default);
-                if (ret)
-                        dev_err(uap->port.dev,
-                                "could not set default pins\n");
-        }
-
-        ret = clk_prepare(uap->clk);
-        if (ret)
-                return ret;
-
         if (uap->port.dev->platform_data) {
                 struct amba_pl011_data *plat;
 
@@ -1924,38 +1870,6 @@ static struct uart_driver amba_reg = {
         .cons                   = AMBA_CONSOLE,
 };
 
-static int pl011_probe_dt_alias(int index, struct device *dev)
-{
-        struct device_node *np;
-        static bool seen_dev_with_alias = false;
-        static bool seen_dev_without_alias = false;
-        int ret = index;
-
-        if (!IS_ENABLED(CONFIG_OF))
-                return ret;
-
-        np = dev->of_node;
-        if (!np)
-                return ret;
-
-        ret = of_alias_get_id(np, "serial");
-        if (IS_ERR_VALUE(ret)) {
-                seen_dev_without_alias = true;
-                ret = index;
-        } else {
-                seen_dev_with_alias = true;
-                if (ret >= ARRAY_SIZE(amba_ports) || amba_ports[ret] != NULL) {
-                        dev_warn(dev, "requested serial port %d  not available.\n", ret);
-                        ret = index;
-                }
-        }
-
-        if (seen_dev_with_alias && seen_dev_without_alias)
-                dev_warn(dev, "aliased and non-aliased serial devices found in device tree. Serial port enumeration may be unpredictable.\n");
-
-        return ret;
-}
-
 static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 {
         struct uart_amba_port *uap;
@@ -1972,48 +1886,29 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                 goto out;
         }
 
-        uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port),
-                           GFP_KERNEL);
+        uap = kzalloc(sizeof(struct uart_amba_port), GFP_KERNEL);
         if (uap == NULL) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        i = pl011_probe_dt_alias(i, &dev->dev);
-
-        base = devm_ioremap(&dev->dev, dev->res.start,
-                            resource_size(&dev->res));
+        base = ioremap(dev->res.start, resource_size(&dev->res));
         if (!base) {
                 ret = -ENOMEM;
-                goto out;
+                goto free;
         }
 
-        uap->pinctrl = devm_pinctrl_get(&dev->dev);
-        if (IS_ERR(uap->pinctrl)) {
-                ret = PTR_ERR(uap->pinctrl);
-                goto out;
-        }
-        uap->pins_default = pinctrl_lookup_state(uap->pinctrl,
-                                                 PINCTRL_STATE_DEFAULT);
-        if (IS_ERR(uap->pins_default))
-                dev_err(&dev->dev, "could not get default pinstate\n");
-
-        uap->pins_sleep = pinctrl_lookup_state(uap->pinctrl,
-                                               PINCTRL_STATE_SLEEP);
-        if (IS_ERR(uap->pins_sleep))
-                dev_dbg(&dev->dev, "could not get sleep pinstate\n");
-
-        uap->clk = devm_clk_get(&dev->dev, NULL);
+        uap->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(uap->clk)) {
                 ret = PTR_ERR(uap->clk);
-                goto out;
+                goto unmap;
         }
 
         uap->vendor = vendor;
         uap->lcrh_rx = vendor->lcrh_rx;
         uap->lcrh_tx = vendor->lcrh_tx;
-        uap->old_cr = 0;
         uap->fifosize = vendor->fifosize;
+        uap->interrupt_may_hang = vendor->interrupt_may_hang;
         uap->port.dev = &dev->dev;
         uap->port.mapbase = dev->res.start;
         uap->port.membase = base;
@@ -2025,10 +1920,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
         uap->port.line = i;
         pl011_dma_probe(uap);
 
-        /* Ensure interrupts from this UART are masked and cleared */
-        writew(0, uap->port.membase + UART011_IMSC);
-        writew(0xffff, uap->port.membase + UART011_ICR);
-
         snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev));
 
         amba_ports[i] = uap;
@@ -2039,6 +1930,11 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                 amba_set_drvdata(dev, NULL);
                 amba_ports[i] = NULL;
                 pl011_dma_remove(uap);
+                clk_put(uap->clk);
+ unmap:
+                iounmap(base);
+ free:
+                kfree(uap);
         }
  out:
         return ret;
@@ -2058,6 +1954,9 @@ static int pl011_remove(struct amba_device *dev)
                         amba_ports[i] = NULL;
 
         pl011_dma_remove(uap);
+        iounmap(uap->port.membase);
+        clk_put(uap->clk);
+        kfree(uap);
         return 0;
 }
 
@@ -2097,8 +1996,6 @@ static struct amba_id pl011_ids[] = {
         { 0, 0 },
 };
 
-MODULE_DEVICE_TABLE(amba, pl011_ids);
-
 static struct amba_driver pl011_driver = {
         .drv = {
                 .name   = "uart-pl011",
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index 59ae2b53e76..19a943693e4 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -16,7 +16,6 @@
 
 #include <linux/module.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/serial.h>
@@ -554,7 +553,7 @@ static struct uart_driver grlib_apbuart_driver = {
 /* OF Platform Driver                                                       */
 /* ======================================================================== */
 
-static int apbuart_probe(struct platform_device *op)
+static int __devinit apbuart_probe(struct platform_device *op)
 {
         int i;
         struct uart_port *port = NULL;
@@ -577,7 +576,7 @@ static int apbuart_probe(struct platform_device *op)
         return 0;
 }
 
-static struct of_device_id apbuart_match[] = {
+static struct of_device_id __initdata apbuart_match[] = {
         {
          .name = "GAISLER_APBUART",
          },
@@ -597,7 +596,7 @@ static struct platform_driver grlib_apbuart_of_driver = {
 };
 
 
-static int __init grlib_apbuart_configure(void)
+static int grlib_apbuart_configure(void)
 {
         struct device_node *np;
         int line = 0;
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
deleted file mode 100644
index 505c490c0b4..00000000000
--- a/drivers/tty/serial/ar933x_uart.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
- *  Atheros AR933X SoC built-in UART driver
- *
- *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
- *
- *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
- *
- *  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/ioport.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/slab.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-
-#include <asm/div64.h>
-
-#include <asm/mach-ath79/ar933x_uart.h>
-#include <asm/mach-ath79/ar933x_uart_platform.h>
-
-#define DRIVER_NAME "ar933x-uart"
-
-#define AR933X_UART_MAX_SCALE   0xff
-#define AR933X_UART_MAX_STEP    0xffff
-
-#define AR933X_UART_MIN_BAUD    300
-#define AR933X_UART_MAX_BAUD    3000000
-
-#define AR933X_DUMMY_STATUS_RD  0x01
-
-static struct uart_driver ar933x_uart_driver;
-
-struct ar933x_uart_port {
-        struct uart_port        port;
-        unsigned int            ier;    /* shadow Interrupt Enable Register */
-        unsigned int            min_baud;
-        unsigned int            max_baud;
-};
-
-static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up,
-                                            int offset)
-{
-        return readl(up->port.membase + offset);
-}
-
-static inline void ar933x_uart_write(struct ar933x_uart_port *up,
-                                     int offset, unsigned int value)
-{
-        writel(value, up->port.membase + offset);
-}
-
-static inline void ar933x_uart_rmw(struct ar933x_uart_port *up,
-                                  unsigned int offset,
-                                  unsigned int mask,
-                                  unsigned int val)
-{
-        unsigned int t;
-
-        t = ar933x_uart_read(up, offset);
-        t &= ~mask;
-        t |= val;
-        ar933x_uart_write(up, offset, t);
-}
-
-static inline void ar933x_uart_rmw_set(struct ar933x_uart_port *up,
-                                       unsigned int offset,
-                                       unsigned int val)
-{
-        ar933x_uart_rmw(up, offset, 0, val);
-}
-
-static inline void ar933x_uart_rmw_clear(struct ar933x_uart_port *up,
-                                         unsigned int offset,
-                                         unsigned int val)
-{
-        ar933x_uart_rmw(up, offset, val, 0);
-}
-
-static inline void ar933x_uart_start_tx_interrupt(struct ar933x_uart_port *up)
-{
-        up->ier |= AR933X_UART_INT_TX_EMPTY;
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);
-}
-
-static inline void ar933x_uart_stop_tx_interrupt(struct ar933x_uart_port *up)
-{
-        up->ier &= ~AR933X_UART_INT_TX_EMPTY;
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);
-}
-
-static inline void ar933x_uart_putc(struct ar933x_uart_port *up, int ch)
-{
-        unsigned int rdata;
-
-        rdata = ch & AR933X_UART_DATA_TX_RX_MASK;
-        rdata |= AR933X_UART_DATA_TX_CSR;
-        ar933x_uart_write(up, AR933X_UART_DATA_REG, rdata);
-}
-
-static unsigned int ar933x_uart_tx_empty(struct uart_port *port)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-        unsigned long flags;
-        unsigned int rdata;
-
-        spin_lock_irqsave(&up->port.lock, flags);
-        rdata = ar933x_uart_read(up, AR933X_UART_DATA_REG);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        return (rdata & AR933X_UART_DATA_TX_CSR) ? 0 : TIOCSER_TEMT;
-}
-
-static unsigned int ar933x_uart_get_mctrl(struct uart_port *port)
-{
-        return TIOCM_CAR;
-}
-
-static void ar933x_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-}
-
-static void ar933x_uart_start_tx(struct uart_port *port)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-
-        ar933x_uart_start_tx_interrupt(up);
-}
-
-static void ar933x_uart_stop_tx(struct uart_port *port)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-
-        ar933x_uart_stop_tx_interrupt(up);
-}
-
-static void ar933x_uart_stop_rx(struct uart_port *port)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-
-        up->ier &= ~AR933X_UART_INT_RX_VALID;
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);
-}
-
-static void ar933x_uart_break_ctl(struct uart_port *port, int break_state)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-        unsigned long flags;
-
-        spin_lock_irqsave(&up->port.lock, flags);
-        if (break_state == -1)
-                ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
-                                    AR933X_UART_CS_TX_BREAK);
-        else
-                ar933x_uart_rmw_clear(up, AR933X_UART_CS_REG,
-                                      AR933X_UART_CS_TX_BREAK);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-}
-
-static void ar933x_uart_enable_ms(struct uart_port *port)
-{
-}
-
-/*
- * baudrate = (clk / (scale + 1)) * (step * (1 / 2^17))
- */
-static unsigned long ar933x_uart_get_baud(unsigned int clk,
-                                          unsigned int scale,
-                                          unsigned int step)
-{
-        u64 t;
-        u32 div;
-
-        div = (2 << 16) * (scale + 1);
-        t = clk;
-        t *= step;
-        t += (div / 2);
-        do_div(t, div);
-
-        return t;
-}
-
-static void ar933x_uart_get_scale_step(unsigned int clk,
-                                       unsigned int baud,
-                                       unsigned int *scale,
-                                       unsigned int *step)
-{
-        unsigned int tscale;
-        long min_diff;
-
-        *scale = 0;
-        *step = 0;
-
-        min_diff = baud;
-        for (tscale = 0; tscale < AR933X_UART_MAX_SCALE; tscale++) {
-                u64 tstep;
-                int diff;
-
-                tstep = baud * (tscale + 1);
-                tstep *= (2 << 16);
-                do_div(tstep, clk);
-
-                if (tstep > AR933X_UART_MAX_STEP)
-                        break;
-
-                diff = abs(ar933x_uart_get_baud(clk, tscale, tstep) - baud);
-                if (diff < min_diff) {
-                        min_diff = diff;
-                        *scale = tscale;
-                        *step = tstep;
-                }
-        }
-}
-
-static void ar933x_uart_set_termios(struct uart_port *port,
-                                    struct ktermios *new,
-                                    struct ktermios *old)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-        unsigned int cs;
-        unsigned long flags;
-        unsigned int baud, scale, step;
-
-        /* Only CS8 is supported */
-        new->c_cflag &= ~CSIZE;
-        new->c_cflag |= CS8;
-
-        /* Only one stop bit is supported */
-        new->c_cflag &= ~CSTOPB;
-
-        cs = 0;
-        if (new->c_cflag & PARENB) {
-                if (!(new->c_cflag & PARODD))
-                        cs |= AR933X_UART_CS_PARITY_EVEN;
-                else
-                        cs |= AR933X_UART_CS_PARITY_ODD;
-        } else {
-                cs |= AR933X_UART_CS_PARITY_NONE;
-        }
-
-        /* Mark/space parity is not supported */
-        new->c_cflag &= ~CMSPAR;
-
-        baud = uart_get_baud_rate(port, new, old, up->min_baud, up->max_baud);
-        ar933x_uart_get_scale_step(port->uartclk, baud, &scale, &step);
-
-        /*
-         * Ok, we're now changing the port state. Do it with
-         * interrupts disabled.
-         */
-        spin_lock_irqsave(&up->port.lock, flags);
-
-        /* disable the UART */
-        ar933x_uart_rmw_clear(up, AR933X_UART_CS_REG,
-                      AR933X_UART_CS_IF_MODE_M << AR933X_UART_CS_IF_MODE_S);
-
-        /* Update the per-port timeout. */
-        uart_update_timeout(port, new->c_cflag, baud);
-
-        up->port.ignore_status_mask = 0;
-
-        /* ignore all characters if CREAD is not set */
-        if ((new->c_cflag & CREAD) == 0)
-                up->port.ignore_status_mask |= AR933X_DUMMY_STATUS_RD;
-
-        ar933x_uart_write(up, AR933X_UART_CLOCK_REG,
-                          scale << AR933X_UART_CLOCK_SCALE_S | step);
-
-        /* setup configuration register */
-        ar933x_uart_rmw(up, AR933X_UART_CS_REG, AR933X_UART_CS_PARITY_M, cs);
-
-        /* enable host interrupt */
-        ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
-                            AR933X_UART_CS_HOST_INT_EN);
-
-        /* reenable the UART */
-        ar933x_uart_rmw(up, AR933X_UART_CS_REG,
-                        AR933X_UART_CS_IF_MODE_M << AR933X_UART_CS_IF_MODE_S,
-                        AR933X_UART_CS_IF_MODE_DCE << AR933X_UART_CS_IF_MODE_S);
-
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        if (tty_termios_baud_rate(new))
-                tty_termios_encode_baud_rate(new, baud, baud);
-}
-
-static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
-{
-        struct tty_struct *tty;
-        int max_count = 256;
-
-        tty = tty_port_tty_get(&up->port.state->port);
-        do {
-                unsigned int rdata;
-                unsigned char ch;
-
-                rdata = ar933x_uart_read(up, AR933X_UART_DATA_REG);
-                if ((rdata & AR933X_UART_DATA_RX_CSR) == 0)
-                        break;
-
-                /* remove the character from the FIFO */
-                ar933x_uart_write(up, AR933X_UART_DATA_REG,
-                                  AR933X_UART_DATA_RX_CSR);
-
-                if (!tty) {
-                        /* discard the data if no tty available */
-                        continue;
-                }
-
-                up->port.icount.rx++;
-                ch = rdata & AR933X_UART_DATA_TX_RX_MASK;
-
-                if (uart_handle_sysrq_char(&up->port, ch))
-                        continue;
-
-                if ((up->port.ignore_status_mask & AR933X_DUMMY_STATUS_RD) == 0)
-                        tty_insert_flip_char(tty, ch, TTY_NORMAL);
-        } while (max_count-- > 0);
-
-        if (tty) {
-                tty_flip_buffer_push(tty);
-                tty_kref_put(tty);
-        }
-}
-
-static void ar933x_uart_tx_chars(struct ar933x_uart_port *up)
-{
-        struct circ_buf *xmit = &up->port.state->xmit;
-        int count;
-
-        if (uart_tx_stopped(&up->port))
-                return;
-
-        count = up->port.fifosize;
-        do {
-                unsigned int rdata;
-
-                rdata = ar933x_uart_read(up, AR933X_UART_DATA_REG);
-                if ((rdata & AR933X_UART_DATA_TX_CSR) == 0)
-                        break;
-
-                if (up->port.x_char) {
-                        ar933x_uart_putc(up, up->port.x_char);
-                        up->port.icount.tx++;
-                        up->port.x_char = 0;
-                        continue;
-                }
-
-                if (uart_circ_empty(xmit))
-                        break;
-
-                ar933x_uart_putc(up, xmit->buf[xmit->tail]);
-
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                up->port.icount.tx++;
-        } while (--count > 0);
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&up->port);
-
-        if (!uart_circ_empty(xmit))
-                ar933x_uart_start_tx_interrupt(up);
-}
-
-static irqreturn_t ar933x_uart_interrupt(int irq, void *dev_id)
-{
-        struct ar933x_uart_port *up = dev_id;
-        unsigned int status;
-
-        status = ar933x_uart_read(up, AR933X_UART_CS_REG);
-        if ((status & AR933X_UART_CS_HOST_INT) == 0)
-                return IRQ_NONE;
-
-        spin_lock(&up->port.lock);
-
-        status = ar933x_uart_read(up, AR933X_UART_INT_REG);
-        status &= ar933x_uart_read(up, AR933X_UART_INT_EN_REG);
-
-        if (status & AR933X_UART_INT_RX_VALID) {
-                ar933x_uart_write(up, AR933X_UART_INT_REG,
-                                  AR933X_UART_INT_RX_VALID);
-                ar933x_uart_rx_chars(up);
-        }
-
-        if (status & AR933X_UART_INT_TX_EMPTY) {
-                ar933x_uart_write(up, AR933X_UART_INT_REG,
-                                  AR933X_UART_INT_TX_EMPTY);
-                ar933x_uart_stop_tx_interrupt(up);
-                ar933x_uart_tx_chars(up);
-        }
-
-        spin_unlock(&up->port.lock);
-
-        return IRQ_HANDLED;
-}
-
-static int ar933x_uart_startup(struct uart_port *port)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-        unsigned long flags;
-        int ret;
-
-        ret = request_irq(up->port.irq, ar933x_uart_interrupt,
-                          up->port.irqflags, dev_name(up->port.dev), up);
-        if (ret)
-                return ret;
-
-        spin_lock_irqsave(&up->port.lock, flags);
-
-        /* Enable HOST interrupts */
-        ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
-                            AR933X_UART_CS_HOST_INT_EN);
-
-        /* Enable RX interrupts */
-        up->ier = AR933X_UART_INT_RX_VALID;
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);
-
-        spin_unlock_irqrestore(&up->port.lock, flags);
-
-        return 0;
-}
-
-static void ar933x_uart_shutdown(struct uart_port *port)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-
-        /* Disable all interrupts */
-        up->ier = 0;
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);
-
-        /* Disable break condition */
-        ar933x_uart_rmw_clear(up, AR933X_UART_CS_REG,
-                              AR933X_UART_CS_TX_BREAK);
-
-        free_irq(up->port.irq, up);
-}
-
-static const char *ar933x_uart_type(struct uart_port *port)
-{
-        return (port->type == PORT_AR933X) ? "AR933X UART" : NULL;
-}
-
-static void ar933x_uart_release_port(struct uart_port *port)
-{
-        /* Nothing to release ... */
-}
-
-static int ar933x_uart_request_port(struct uart_port *port)
-{
-        /* UARTs always present */
-        return 0;
-}
-
-static void ar933x_uart_config_port(struct uart_port *port, int flags)
-{
-        if (flags & UART_CONFIG_TYPE)
-                port->type = PORT_AR933X;
-}
-
-static int ar933x_uart_verify_port(struct uart_port *port,
-                                   struct serial_struct *ser)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-
-        if (ser->type != PORT_UNKNOWN &&
-            ser->type != PORT_AR933X)
-                return -EINVAL;
-
-        if (ser->irq < 0 || ser->irq >= NR_IRQS)
-                return -EINVAL;
-
-        if (ser->baud_base < up->min_baud ||
-            ser->baud_base > up->max_baud)
-                return -EINVAL;
-
-        return 0;
-}
-
-static struct uart_ops ar933x_uart_ops = {
-        .tx_empty       = ar933x_uart_tx_empty,
-        .set_mctrl      = ar933x_uart_set_mctrl,
-        .get_mctrl      = ar933x_uart_get_mctrl,
-        .stop_tx        = ar933x_uart_stop_tx,
-        .start_tx       = ar933x_uart_start_tx,
-        .stop_rx        = ar933x_uart_stop_rx,
-        .enable_ms      = ar933x_uart_enable_ms,
-        .break_ctl      = ar933x_uart_break_ctl,
-        .startup        = ar933x_uart_startup,
-        .shutdown       = ar933x_uart_shutdown,
-        .set_termios    = ar933x_uart_set_termios,
-        .type           = ar933x_uart_type,
-        .release_port   = ar933x_uart_release_port,
-        .request_port   = ar933x_uart_request_port,
-        .config_port    = ar933x_uart_config_port,
-        .verify_port    = ar933x_uart_verify_port,
-};
-
-#ifdef CONFIG_SERIAL_AR933X_CONSOLE
-
-static struct ar933x_uart_port *
-ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];
-
-static void ar933x_uart_wait_xmitr(struct ar933x_uart_port *up)
-{
-        unsigned int status;
-        unsigned int timeout = 60000;
-
-        /* Wait up to 60ms for the character(s) to be sent. */
-        do {
-                status = ar933x_uart_read(up, AR933X_UART_DATA_REG);
-                if (--timeout == 0)
-                        break;
-                udelay(1);
-        } while ((status & AR933X_UART_DATA_TX_CSR) == 0);
-}
-
-static void ar933x_uart_console_putchar(struct uart_port *port, int ch)
-{
-        struct ar933x_uart_port *up = (struct ar933x_uart_port *) port;
-
-        ar933x_uart_wait_xmitr(up);
-        ar933x_uart_putc(up, ch);
-}
-
-static void ar933x_uart_console_write(struct console *co, const char *s,
-                                      unsigned int count)
-{
-        struct ar933x_uart_port *up = ar933x_console_ports[co->index];
-        unsigned long flags;
-        unsigned int int_en;
-        int locked = 1;
-
-        local_irq_save(flags);
-
-        if (up->port.sysrq)
-                locked = 0;
-        else if (oops_in_progress)
-                locked = spin_trylock(&up->port.lock);
-        else
-                spin_lock(&up->port.lock);
-
-        /*
-         * First save the IER then disable the interrupts
-         */
-        int_en = ar933x_uart_read(up, AR933X_UART_INT_EN_REG);
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, 0);
-
-        uart_console_write(&up->port, s, count, ar933x_uart_console_putchar);
-
-        /*
-         * Finally, wait for transmitter to become empty
-         * and restore the IER
-         */
-        ar933x_uart_wait_xmitr(up);
-        ar933x_uart_write(up, AR933X_UART_INT_EN_REG, int_en);
-
-        ar933x_uart_write(up, AR933X_UART_INT_REG, AR933X_UART_INT_ALLINTS);
-
-        if (locked)
-                spin_unlock(&up->port.lock);
-
-        local_irq_restore(flags);
-}
-
-static int ar933x_uart_console_setup(struct console *co, char *options)
-{
-        struct ar933x_uart_port *up;
-        int baud = 115200;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        if (co->index < 0 || co->index >= CONFIG_SERIAL_AR933X_NR_UARTS)
-                return -EINVAL;
-
-        up = ar933x_console_ports[co->index];
-        if (!up)
-                return -ENODEV;
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-        return uart_set_options(&up->port, co, baud, parity, bits, flow);
-}
-
-static struct console ar933x_uart_console = {
-        .name           = "ttyATH",
-        .write          = ar933x_uart_console_write,
-        .device         = uart_console_device,
-        .setup          = ar933x_uart_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-        .data           = &ar933x_uart_driver,
-};
-
-static void ar933x_uart_add_console_port(struct ar933x_uart_port *up)
-{
-        ar933x_console_ports[up->port.line] = up;
-}
-
-#define AR933X_SERIAL_CONSOLE   (&ar933x_uart_console)
-
-#else
-
-static inline void ar933x_uart_add_console_port(struct ar933x_uart_port *up) {}
-
-#define AR933X_SERIAL_CONSOLE   NULL
-
-#endif /* CONFIG_SERIAL_AR933X_CONSOLE */
-
-static struct uart_driver ar933x_uart_driver = {
-        .owner          = THIS_MODULE,
-        .driver_name    = DRIVER_NAME,
-        .dev_name       = "ttyATH",
-        .nr             = CONFIG_SERIAL_AR933X_NR_UARTS,
-        .cons           = AR933X_SERIAL_CONSOLE,
-};
-
-static int ar933x_uart_probe(struct platform_device *pdev)
-{
-        struct ar933x_uart_platform_data *pdata;
-        struct ar933x_uart_port *up;
-        struct uart_port *port;
-        struct resource *mem_res;
-        struct resource *irq_res;
-        unsigned int baud;
-        int id;
-        int ret;
-
-        pdata = pdev->dev.platform_data;
-        if (!pdata)
-                return -EINVAL;
-
-        id = pdev->id;
-        if (id == -1)
-                id = 0;
-
-        if (id > CONFIG_SERIAL_AR933X_NR_UARTS)
-                return -EINVAL;
-
-        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!mem_res) {
-                dev_err(&pdev->dev, "no MEM resource\n");
-                return -EINVAL;
-        }
-
-        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (!irq_res) {
-                dev_err(&pdev->dev, "no IRQ resource\n");
-                return -EINVAL;
-        }
-
-        up = kzalloc(sizeof(struct ar933x_uart_port), GFP_KERNEL);
-        if (!up)
-                return -ENOMEM;
-
-        port = &up->port;
-        port->mapbase = mem_res->start;
-
-        port->membase = ioremap(mem_res->start, AR933X_UART_REGS_SIZE);
-        if (!port->membase) {
-                ret = -ENOMEM;
-                goto err_free_up;
-        }
-
-        port->line = id;
-        port->irq = irq_res->start;
-        port->dev = &pdev->dev;
-        port->type = PORT_AR933X;
-        port->iotype = UPIO_MEM32;
-        port->uartclk = pdata->uartclk;
-
-        port->regshift = 2;
-        port->fifosize = AR933X_UART_FIFO_SIZE;
-        port->ops = &ar933x_uart_ops;
-
-        baud = ar933x_uart_get_baud(port->uartclk, AR933X_UART_MAX_SCALE, 1);
-        up->min_baud = max_t(unsigned int, baud, AR933X_UART_MIN_BAUD);
-
-        baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP);
-        up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD);
-
-        ar933x_uart_add_console_port(up);
-
-        ret = uart_add_one_port(&ar933x_uart_driver, &up->port);
-        if (ret)
-                goto err_unmap;
-
-        platform_set_drvdata(pdev, up);
-        return 0;
-
-err_unmap:
-        iounmap(up->port.membase);
-err_free_up:
-        kfree(up);
-        return ret;
-}
-
-static int ar933x_uart_remove(struct platform_device *pdev)
-{
-        struct ar933x_uart_port *up;
-
-        up = platform_get_drvdata(pdev);
-        platform_set_drvdata(pdev, NULL);
-
-        if (up) {
-                uart_remove_one_port(&ar933x_uart_driver, &up->port);
-                iounmap(up->port.membase);
-                kfree(up);
-        }
-
-        return 0;
-}
-
-static struct platform_driver ar933x_uart_platform_driver = {
-        .probe          = ar933x_uart_probe,
-        .remove         = ar933x_uart_remove,
-        .driver         = {
-                .name           = DRIVER_NAME,
-                .owner          = THIS_MODULE,
-        },
-};
-
-static int __init ar933x_uart_init(void)
-{
-        int ret;
-
-        ar933x_uart_driver.nr = CONFIG_SERIAL_AR933X_NR_UARTS;
-        ret = uart_register_driver(&ar933x_uart_driver);
-        if (ret)
-                goto err_out;
-
-        ret = platform_driver_register(&ar933x_uart_platform_driver);
-        if (ret)
-                goto err_unregister_uart_driver;
-
-        return 0;
-
-err_unregister_uart_driver:
-        uart_unregister_driver(&ar933x_uart_driver);
-err_out:
-        return ret;
-}
-
-static void __exit ar933x_uart_exit(void)
-{
-        platform_driver_unregister(&ar933x_uart_platform_driver);
-        uart_unregister_driver(&ar933x_uart_driver);
-}
-
-module_init(ar933x_uart_init);
-module_exit(ar933x_uart_exit);
-
-MODULE_DESCRIPTION("Atheros AR933X UART driver");
-MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
deleted file mode 100644
index 3e0b3fac6a0..00000000000
--- a/drivers/tty/serial/arc_uart.c
+++ /dev/null
@@ -1,746 +0,0 @@
-/*
- * ARC On-Chip(fpga) UART Driver
- *
- * Copyright (C) 2010-2012 Synopsys, Inc. (www.synopsys.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.
- *
- * vineetg: July 10th 2012
- *  -Decoupled the driver from arch/arc
- *    +Using platform_get_resource() for irq/membase (thx to bfin_uart.c)
- *    +Using early_platform_xxx() for early console (thx to mach-shmobile/xxx)
- *
- * Vineetg: Aug 21st 2010
- *  -Is uart_tx_stopped() not done in tty write path as it has already been
- *   taken care of, in serial core
- *
- * Vineetg: Aug 18th 2010
- *  -New Serial Core based ARC UART driver
- *  -Derived largely from blackfin driver albiet with some major tweaks
- *
- * TODO:
- *  -check if sysreq works
- */
-
-#if defined(CONFIG_SERIAL_ARC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/module.h>
-#include <linux/serial.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial_core.h>
-#include <linux/io.h>
-
-/*************************************
- * ARC UART Hardware Specs
- ************************************/
-#define ARC_UART_TX_FIFO_SIZE  1
-
-/*
- * UART Register set (this is not a Standards Compliant IP)
- * Also each reg is Word aligned, but only 8 bits wide
- */
-#define R_ID0   0
-#define R_ID1   4
-#define R_ID2   8
-#define R_ID3   12
-#define R_DATA  16
-#define R_STS   20
-#define R_BAUDL 24
-#define R_BAUDH 28
-
-/* Bits for UART Status Reg (R/W) */
-#define RXIENB  0x04    /* Receive Interrupt Enable */
-#define TXIENB  0x40    /* Transmit Interrupt Enable */
-
-#define RXEMPTY 0x20    /* Receive FIFO Empty: No char receivede */
-#define TXEMPTY 0x80    /* Transmit FIFO Empty, thus char can be written into */
-
-#define RXFULL  0x08    /* Receive FIFO full */
-#define RXFULL1 0x10    /* Receive FIFO has space for 1 char (tot space=4) */
-
-#define RXFERR  0x01    /* Frame Error: Stop Bit not detected */
-#define RXOERR  0x02    /* OverFlow Err: Char recv but RXFULL still set */
-
-/* Uart bit fiddling helpers: lowest level */
-#define RBASE(uart, reg)      (uart->port.membase + reg)
-#define UART_REG_SET(u, r, v) writeb((v), RBASE(u, r))
-#define UART_REG_GET(u, r)    readb(RBASE(u, r))
-
-#define UART_REG_OR(u, r, v)  UART_REG_SET(u, r, UART_REG_GET(u, r) | (v))
-#define UART_REG_CLR(u, r, v) UART_REG_SET(u, r, UART_REG_GET(u, r) & ~(v))
-
-/* Uart bit fiddling helpers: API level */
-#define UART_SET_DATA(uart, val)   UART_REG_SET(uart, R_DATA, val)
-#define UART_GET_DATA(uart)        UART_REG_GET(uart, R_DATA)
-
-#define UART_SET_BAUDH(uart, val)  UART_REG_SET(uart, R_BAUDH, val)
-#define UART_SET_BAUDL(uart, val)  UART_REG_SET(uart, R_BAUDL, val)
-
-#define UART_CLR_STATUS(uart, val) UART_REG_CLR(uart, R_STS, val)
-#define UART_GET_STATUS(uart)      UART_REG_GET(uart, R_STS)
-
-#define UART_ALL_IRQ_DISABLE(uart) UART_REG_CLR(uart, R_STS, RXIENB|TXIENB)
-#define UART_RX_IRQ_DISABLE(uart)  UART_REG_CLR(uart, R_STS, RXIENB)
-#define UART_TX_IRQ_DISABLE(uart)  UART_REG_CLR(uart, R_STS, TXIENB)
-
-#define UART_ALL_IRQ_ENABLE(uart)  UART_REG_OR(uart, R_STS, RXIENB|TXIENB)
-#define UART_RX_IRQ_ENABLE(uart)   UART_REG_OR(uart, R_STS, RXIENB)
-#define UART_TX_IRQ_ENABLE(uart)   UART_REG_OR(uart, R_STS, TXIENB)
-
-#define ARC_SERIAL_DEV_NAME     "ttyARC"
-
-struct arc_uart_port {
-        struct uart_port port;
-        unsigned long baud;
-        int is_emulated;        /* H/w vs. Instruction Set Simulator */
-};
-
-#define to_arc_port(uport)  container_of(uport, struct arc_uart_port, port)
-
-static struct arc_uart_port arc_uart_ports[CONFIG_SERIAL_ARC_NR_PORTS];
-
-#ifdef CONFIG_SERIAL_ARC_CONSOLE
-static struct console arc_console;
-#endif
-
-#define DRIVER_NAME     "arc-uart"
-
-static struct uart_driver arc_uart_driver = {
-        .owner          = THIS_MODULE,
-        .driver_name    = DRIVER_NAME,
-        .dev_name       = ARC_SERIAL_DEV_NAME,
-        .major          = 0,
-        .minor          = 0,
-        .nr             = CONFIG_SERIAL_ARC_NR_PORTS,
-#ifdef CONFIG_SERIAL_ARC_CONSOLE
-        .cons           = &arc_console,
-#endif
-};
-
-static void arc_serial_stop_rx(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        UART_RX_IRQ_DISABLE(uart);
-}
-
-static void arc_serial_stop_tx(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        while (!(UART_GET_STATUS(uart) & TXEMPTY))
-                cpu_relax();
-
-        UART_TX_IRQ_DISABLE(uart);
-}
-
-/*
- * Return TIOCSER_TEMT when transmitter is not busy.
- */
-static unsigned int arc_serial_tx_empty(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-        unsigned int stat;
-
-        stat = UART_GET_STATUS(uart);
-        if (stat & TXEMPTY)
-                return TIOCSER_TEMT;
-
-        return 0;
-}
-
-/*
- * Driver internal routine, used by both tty(serial core) as well as tx-isr
- *  -Called under spinlock in either cases
- *  -also tty->stopped / tty->hw_stopped has already been checked
- *     = by uart_start( ) before calling us
- *     = tx_ist checks that too before calling
- */
-static void arc_serial_tx_chars(struct arc_uart_port *uart)
-{
-        struct circ_buf *xmit = &uart->port.state->xmit;
-        int sent = 0;
-        unsigned char ch;
-
-        if (unlikely(uart->port.x_char)) {
-                UART_SET_DATA(uart, uart->port.x_char);
-                uart->port.icount.tx++;
-                uart->port.x_char = 0;
-                sent = 1;
-        } else if (xmit->tail != xmit->head) {  /* TODO: uart_circ_empty */
-                ch = xmit->buf[xmit->tail];
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                uart->port.icount.tx++;
-                while (!(UART_GET_STATUS(uart) & TXEMPTY))
-                        cpu_relax();
-                UART_SET_DATA(uart, ch);
-                sent = 1;
-        }
-
-        /*
-         * If num chars in xmit buffer are too few, ask tty layer for more.
-         * By Hard ISR to schedule processing in software interrupt part
-         */
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&uart->port);
-
-        if (sent)
-                UART_TX_IRQ_ENABLE(uart);
-}
-
-/*
- * port is locked and interrupts are disabled
- * uart_start( ) calls us under the port spinlock irqsave
- */
-static void arc_serial_start_tx(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        arc_serial_tx_chars(uart);
-}
-
-static void arc_serial_rx_chars(struct arc_uart_port *uart)
-{
-        struct tty_struct *tty = tty_port_tty_get(&uart->port.state->port);
-        unsigned int status, ch, flg = 0;
-
-        if (!tty)
-                return;
-
-        /*
-         * UART has 4 deep RX-FIFO. Driver's recongnition of this fact
-         * is very subtle. Here's how ...
-         * Upon getting a RX-Intr, such that RX-EMPTY=0, meaning data available,
-         * driver reads the DATA Reg and keeps doing that in a loop, until
-         * RX-EMPTY=1. Multiple chars being avail, with a single Interrupt,
-         * before RX-EMPTY=0, implies some sort of buffering going on in the
-         * controller, which is indeed the Rx-FIFO.
-         */
-        while (!((status = UART_GET_STATUS(uart)) & RXEMPTY)) {
-
-                ch = UART_GET_DATA(uart);
-                uart->port.icount.rx++;
-
-                if (unlikely(status & (RXOERR | RXFERR))) {
-                        if (status & RXOERR) {
-                                uart->port.icount.overrun++;
-                                flg = TTY_OVERRUN;
-                                UART_CLR_STATUS(uart, RXOERR);
-                        }
-
-                        if (status & RXFERR) {
-                                uart->port.icount.frame++;
-                                flg = TTY_FRAME;
-                                UART_CLR_STATUS(uart, RXFERR);
-                        }
-                } else
-                        flg = TTY_NORMAL;
-
-                if (unlikely(uart_handle_sysrq_char(&uart->port, ch)))
-                        goto done;
-
-                uart_insert_char(&uart->port, status, RXOERR, ch, flg);
-
-done:
-                tty_flip_buffer_push(tty);
-        }
-
-        tty_kref_put(tty);
-}
-
-/*
- * A note on the Interrupt handling state machine of this driver
- *
- * kernel printk writes funnel thru the console driver framework and in order
- * to keep things simple as well as efficient, it writes to UART in polled
- * mode, in one shot, and exits.
- *
- * OTOH, Userland output (via tty layer), uses interrupt based writes as there
- * can be undeterministic delay between char writes.
- *
- * Thus Rx-interrupts are always enabled, while tx-interrupts are by default
- * disabled.
- *
- * When tty has some data to send out, serial core calls driver's start_tx
- * which
- *   -checks-if-tty-buffer-has-char-to-send
- *   -writes-data-to-uart
- *   -enable-tx-intr
- *
- * Once data bits are pushed out, controller raises the Tx-room-avail-Interrupt.
- * The first thing Tx ISR does is disable further Tx interrupts (as this could
- * be the last char to send, before settling down into the quiet polled mode).
- * It then calls the exact routine used by tty layer write to send out any
- * more char in tty buffer. In case of sending, it re-enables Tx-intr. In case
- * of no data, it remains disabled.
- * This is how the transmit state machine is dynamically switched on/off
- */
-
-static irqreturn_t arc_serial_isr(int irq, void *dev_id)
-{
-        struct arc_uart_port *uart = dev_id;
-        unsigned int status;
-
-        status = UART_GET_STATUS(uart);
-
-        /*
-         * Single IRQ for both Rx (data available) Tx (room available) Interrupt
-         * notifications from the UART Controller.
-         * To demultiplex between the two, we check the relevant bits
-         */
-        if ((status & RXIENB) && !(status & RXEMPTY)) {
-
-                /* already in ISR, no need of xx_irqsave */
-                spin_lock(&uart->port.lock);
-                arc_serial_rx_chars(uart);
-                spin_unlock(&uart->port.lock);
-        }
-
-        if ((status & TXIENB) && (status & TXEMPTY)) {
-
-                /* Unconditionally disable further Tx-Interrupts.
-                 * will be enabled by tx_chars() if needed.
-                 */
-                UART_TX_IRQ_DISABLE(uart);
-
-                spin_lock(&uart->port.lock);
-
-                if (!uart_tx_stopped(&uart->port))
-                        arc_serial_tx_chars(uart);
-
-                spin_unlock(&uart->port.lock);
-        }
-
-        return IRQ_HANDLED;
-}
-
-static unsigned int arc_serial_get_mctrl(struct uart_port *port)
-{
-        /*
-         * Pretend we have a Modem status reg and following bits are
-         *  always set, to satify the serial core state machine
-         *  (DSR) Data Set Ready
-         *  (CTS) Clear To Send
-         *  (CAR) Carrier Detect
-         */
-        return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-}
-
-static void arc_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        /* MCR not present */
-}
-
-/* Enable Modem Status Interrupts */
-
-static void arc_serial_enable_ms(struct uart_port *port)
-{
-        /* MSR not present */
-}
-
-static void arc_serial_break_ctl(struct uart_port *port, int break_state)
-{
-        /* ARC UART doesn't support sending Break signal */
-}
-
-static int arc_serial_startup(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        /* Before we hook up the ISR, Disable all UART Interrupts */
-        UART_ALL_IRQ_DISABLE(uart);
-
-        if (request_irq(uart->port.irq, arc_serial_isr, 0, "arc uart rx-tx",
-                        uart)) {
-                dev_warn(uart->port.dev, "Unable to attach ARC UART intr\n");
-                return -EBUSY;
-        }
-
-        UART_RX_IRQ_ENABLE(uart); /* Only Rx IRQ enabled to begin with */
-
-        return 0;
-}
-
-/* This is not really needed */
-static void arc_serial_shutdown(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-        free_irq(uart->port.irq, uart);
-}
-
-static void
-arc_serial_set_termios(struct uart_port *port, struct ktermios *new,
-                       struct ktermios *old)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-        unsigned int baud, uartl, uarth, hw_val;
-        unsigned long flags;
-
-        /*
-         * Use the generic handler so that any specially encoded baud rates
-         * such as SPD_xx flags or "%B0" can be handled
-         * Max Baud I suppose will not be more than current 115K * 4
-         * Formula for ARC UART is: hw-val = ((CLK/(BAUD*4)) -1)
-         * spread over two 8-bit registers
-         */
-        baud = uart_get_baud_rate(port, new, old, 0, 460800);
-
-        hw_val = port->uartclk / (uart->baud * 4) - 1;
-        uartl = hw_val & 0xFF;
-        uarth = (hw_val >> 8) & 0xFF;
-
-        /*
-         * UART ISS(Instruction Set simulator) emulation has a subtle bug:
-         * A existing value of Baudh = 0 is used as a indication to startup
-         * it's internal state machine.
-         * Thus if baudh is set to 0, 2 times, it chokes.
-         * This happens with BAUD=115200 and the formaula above
-         * Until that is fixed, when running on ISS, we will set baudh to !0
-         */
-        if (uart->is_emulated)
-                uarth = 1;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        UART_ALL_IRQ_DISABLE(uart);
-
-        UART_SET_BAUDL(uart, uartl);
-        UART_SET_BAUDH(uart, uarth);
-
-        UART_RX_IRQ_ENABLE(uart);
-
-        /*
-         * UART doesn't support Parity/Hardware Flow Control;
-         * Only supports 8N1 character size
-         */
-        new->c_cflag &= ~(CMSPAR|CRTSCTS|CSIZE);
-        new->c_cflag |= CS8;
-
-        if (old)
-                tty_termios_copy_hw(new, old);
-
-        /* Don't rewrite B0 */
-        if (tty_termios_baud_rate(new))
-                tty_termios_encode_baud_rate(new, baud, baud);
-
-        uart_update_timeout(port, new->c_cflag, baud);
-
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static const char *arc_serial_type(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        return uart->port.type == PORT_ARC ? DRIVER_NAME : NULL;
-}
-
-static void arc_serial_release_port(struct uart_port *port)
-{
-}
-
-static int arc_serial_request_port(struct uart_port *port)
-{
-        return 0;
-}
-
-/*
- * Verify the new serial_struct (for TIOCSSERIAL).
- */
-static int
-arc_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-        if (port->type != PORT_UNKNOWN && ser->type != PORT_ARC)
-                return -EINVAL;
-
-        return 0;
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void arc_serial_config_port(struct uart_port *port, int flags)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        if (flags & UART_CONFIG_TYPE)
-                uart->port.type = PORT_ARC;
-}
-
-#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_ARC_CONSOLE)
-
-static void arc_serial_poll_putchar(struct uart_port *port, unsigned char chr)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-
-        while (!(UART_GET_STATUS(uart) & TXEMPTY))
-                cpu_relax();
-
-        UART_SET_DATA(uart, chr);
-}
-#endif
-
-#ifdef CONFIG_CONSOLE_POLL
-static int arc_serial_poll_getchar(struct uart_port *port)
-{
-        struct arc_uart_port *uart = to_arc_port(port);
-        unsigned char chr;
-
-        while (!(UART_GET_STATUS(uart) & RXEMPTY))
-                cpu_relax();
-
-        chr = UART_GET_DATA(uart);
-        return chr;
-}
-#endif
-
-static struct uart_ops arc_serial_pops = {
-        .tx_empty       = arc_serial_tx_empty,
-        .set_mctrl      = arc_serial_set_mctrl,
-        .get_mctrl      = arc_serial_get_mctrl,
-        .stop_tx        = arc_serial_stop_tx,
-        .start_tx       = arc_serial_start_tx,
-        .stop_rx        = arc_serial_stop_rx,
-        .enable_ms      = arc_serial_enable_ms,
-        .break_ctl      = arc_serial_break_ctl,
-        .startup        = arc_serial_startup,
-        .shutdown       = arc_serial_shutdown,
-        .set_termios    = arc_serial_set_termios,
-        .type           = arc_serial_type,
-        .release_port   = arc_serial_release_port,
-        .request_port   = arc_serial_request_port,
-        .config_port    = arc_serial_config_port,
-        .verify_port    = arc_serial_verify_port,
-#ifdef CONFIG_CONSOLE_POLL
-        .poll_put_char = arc_serial_poll_putchar,
-        .poll_get_char = arc_serial_poll_getchar,
-#endif
-};
-
-static int
-arc_uart_init_one(struct platform_device *pdev, struct arc_uart_port *uart)
-{
-        struct resource *res, *res2;
-        unsigned long *plat_data;
-
-        if (pdev->id < 0 || pdev->id >= CONFIG_SERIAL_ARC_NR_PORTS) {
-                dev_err(&pdev->dev, "Wrong uart platform device id.\n");
-                return -ENOENT;
-        }
-
-        plat_data = ((unsigned long *)(pdev->dev.platform_data));
-        uart->baud = plat_data[0];
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -ENODEV;
-
-        res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (!res2)
-                return -ENODEV;
-
-        uart->port.mapbase = res->start;
-        uart->port.membase = ioremap_nocache(res->start, resource_size(res));
-        if (!uart->port.membase)
-                /* No point of dev_err since UART itself is hosed here */
-                return -ENXIO;
-
-        uart->port.irq = res2->start;
-        uart->port.dev = &pdev->dev;
-        uart->port.iotype = UPIO_MEM;
-        uart->port.flags = UPF_BOOT_AUTOCONF;
-        uart->port.line = pdev->id;
-        uart->port.ops = &arc_serial_pops;
-
-        uart->port.uartclk = plat_data[1];
-        uart->port.fifosize = ARC_UART_TX_FIFO_SIZE;
-
-        /*
-         * uart_insert_char( ) uses it in decideding whether to ignore a
-         * char or not. Explicitly setting it here, removes the subtelty
-         */
-        uart->port.ignore_status_mask = 0;
-
-        /* Real Hardware vs. emulated to work around a bug */
-        uart->is_emulated = !!plat_data[2];
-
-        return 0;
-}
-
-#ifdef CONFIG_SERIAL_ARC_CONSOLE
-
-static int arc_serial_console_setup(struct console *co, char *options)
-{
-        struct uart_port *port;
-        int baud = 115200;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        if (co->index < 0 || co->index >= CONFIG_SERIAL_ARC_NR_PORTS)
-                return -ENODEV;
-
-        /*
-         * The uart port backing the console (e.g. ttyARC1) might not have been
-         * init yet. If so, defer the console setup to after the port.
-         */
-        port = &arc_uart_ports[co->index].port;
-        if (!port->membase)
-                return -ENODEV;
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-        /*
-         * Serial core will call port->ops->set_termios( )
-         * which will set the baud reg
-         */
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-static void arc_serial_console_putchar(struct uart_port *port, int ch)
-{
-        arc_serial_poll_putchar(port, (unsigned char)ch);
-}
-
-/*
- * Interrupts are disabled on entering
- */
-static void arc_serial_console_write(struct console *co, const char *s,
-                                     unsigned int count)
-{
-        struct uart_port *port = &arc_uart_ports[co->index].port;
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-        uart_console_write(port, s, count, arc_serial_console_putchar);
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static struct console arc_console = {
-        .name   = ARC_SERIAL_DEV_NAME,
-        .write  = arc_serial_console_write,
-        .device = uart_console_device,
-        .setup  = arc_serial_console_setup,
-        .flags  = CON_PRINTBUFFER,
-        .index  = -1,
-        .data   = &arc_uart_driver
-};
-
-static __init void early_serial_write(struct console *con, const char *s,
-                                        unsigned int n)
-{
-        struct uart_port *port = &arc_uart_ports[con->index].port;
-        unsigned int i;
-
-        for (i = 0; i < n; i++, s++) {
-                if (*s == '\n')
-                        arc_serial_poll_putchar(port, '\r');
-                arc_serial_poll_putchar(port, *s);
-        }
-}
-
-static struct __initdata console arc_early_serial_console = {
-        .name = "early_ARCuart",
-        .write = early_serial_write,
-        .flags = CON_PRINTBUFFER | CON_BOOT,
-        .index = -1
-};
-
-static int arc_serial_probe_earlyprintk(struct platform_device *pdev)
-{
-        arc_early_serial_console.index = pdev->id;
-
-        arc_uart_init_one(pdev, &arc_uart_ports[pdev->id]);
-
-        arc_serial_console_setup(&arc_early_serial_console, NULL);
-
-        register_console(&arc_early_serial_console);
-        return 0;
-}
-#else
-static int arc_serial_probe_earlyprintk(struct platform_device *pdev)
-{
-        return -ENODEV;
-}
-#endif  /* CONFIG_SERIAL_ARC_CONSOLE */
-
-static int arc_serial_probe(struct platform_device *pdev)
-{
-        struct arc_uart_port *uart;
-        int rc;
-
-        if (is_early_platform_device(pdev))
-                return arc_serial_probe_earlyprintk(pdev);
-
-        uart = &arc_uart_ports[pdev->id];
-        rc = arc_uart_init_one(pdev, uart);
-        if (rc)
-                return rc;
-
-        return uart_add_one_port(&arc_uart_driver, &uart->port);
-}
-
-static int arc_serial_remove(struct platform_device *pdev)
-{
-        /* This will never be called */
-        return 0;
-}
-
-static struct platform_driver arc_platform_driver = {
-        .probe = arc_serial_probe,
-        .remove = arc_serial_remove,
-        .driver = {
-                .name = DRIVER_NAME,
-                .owner = THIS_MODULE,
-         },
-};
-
-#ifdef CONFIG_SERIAL_ARC_CONSOLE
-/*
- * Register an early platform driver of "earlyprintk" class.
- * ARCH platform code installs the driver and probes the early devices
- * The installation could rely on user specifying earlyprintk=xyx in cmd line
- * or it could be done independently, for all "earlyprintk" class drivers.
- * [see arch/arc/plat-arcfpga/platform.c]
- */
-early_platform_init("earlyprintk", &arc_platform_driver);
-
-#endif  /* CONFIG_SERIAL_ARC_CONSOLE */
-
-static int __init arc_serial_init(void)
-{
-        int ret;
-
-        ret = uart_register_driver(&arc_uart_driver);
-        if (ret)
-                return ret;
-
-        ret = platform_driver_register(&arc_platform_driver);
-        if (ret)
-                uart_unregister_driver(&arc_uart_driver);
-
-        return ret;
-}
-
-static void __exit arc_serial_exit(void)
-{
-        platform_driver_unregister(&arc_platform_driver);
-        uart_unregister_driver(&arc_uart_driver);
-}
-
-module_init(arc_serial_init);
-module_exit(arc_serial_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("plat-arcfpga/uart");
-MODULE_AUTHOR("Vineet Gupta");
-MODULE_DESCRIPTION("ARC(Synopsys) On-Chip(fpga) serial driver");
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 922e85aeb63..948fc77b647 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -33,21 +33,20 @@
 #include <linux/sysrq.h>
 #include <linux/tty_flip.h>
 #include <linux/platform_device.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/atmel_pdc.h>
 #include <linux/atmel_serial.h>
 #include <linux/uaccess.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/platform_data/atmel.h>
 
 #include <asm/io.h>
 #include <asm/ioctls.h>
 
+#include <asm/mach/serial_at91.h>
+#include <mach/board.h>
+
 #ifdef CONFIG_ARM
 #include <mach/cpu.h>
-#include <asm/gpio.h>
+#include <mach/gpio.h>
 #endif
 
 #define PDC_BUFFER_SIZE         512
@@ -158,22 +157,11 @@ struct atmel_uart_port {
 };
 
 static struct atmel_uart_port atmel_ports[ATMEL_MAX_UART];
-static unsigned long atmel_ports_in_use;
 
 #ifdef SUPPORT_SYSRQ
 static struct console atmel_console;
 #endif
 
-#if defined(CONFIG_OF)
-static const struct of_device_id atmel_serial_dt_ids[] = {
-        { .compatible = "atmel,at91rm9200-usart" },
-        { .compatible = "atmel,at91sam9260-usart" },
-        { /* sentinel */ }
-};
-
-MODULE_DEVICE_TABLE(of, atmel_serial_dt_ids);
-#endif
-
 static inline struct atmel_uart_port *
 to_atmel_uart_port(struct uart_port *uart)
 {
@@ -228,7 +216,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
         if (rs485conf->flags & SER_RS485_ENABLED) {
                 dev_dbg(port->dev, "Setting UART to RS485\n");
                 atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
-                if ((rs485conf->delay_rts_after_send) > 0)
+                if (rs485conf->flags & SER_RS485_RTS_AFTER_SEND)
                         UART_PUT_TTGR(port, rs485conf->delay_rts_after_send);
                 mode |= ATMEL_US_USMODE_RS485;
         } else {
@@ -304,7 +292,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
 
         if (atmel_port->rs485.flags & SER_RS485_ENABLED) {
                 dev_dbg(port->dev, "Setting UART to RS485\n");
-                if ((atmel_port->rs485.delay_rts_after_send) > 0)
+                if (atmel_port->rs485.flags & SER_RS485_RTS_AFTER_SEND)
                         UART_PUT_TTGR(port,
                                         atmel_port->rs485.delay_rts_after_send);
                 mode |= ATMEL_US_USMODE_RS485;
@@ -352,8 +340,7 @@ static void atmel_stop_tx(struct uart_port *port)
         /* Disable interrupts */
         UART_PUT_IDR(port, atmel_port->tx_done_mask);
 
-        if ((atmel_port->rs485.flags & SER_RS485_ENABLED) &&
-            !(atmel_port->rs485.flags & SER_RS485_RX_DURING_TX))
+        if (atmel_port->rs485.flags & SER_RS485_ENABLED)
                 atmel_start_rx(port);
 }
 
@@ -370,8 +357,7 @@ static void atmel_start_tx(struct uart_port *port)
                            really need this.*/
                         return;
 
-                if ((atmel_port->rs485.flags & SER_RS485_ENABLED) &&
-                    !(atmel_port->rs485.flags & SER_RS485_RX_DURING_TX))
+                if (atmel_port->rs485.flags & SER_RS485_ENABLED)
                         atmel_stop_rx(port);
 
                 /* re-enable PDC transmit */
@@ -388,8 +374,6 @@ static void atmel_start_rx(struct uart_port *port)
 {
         UART_PUT_CR(port, ATMEL_US_RSTSTA);  /* reset status and receiver */
 
-        UART_PUT_CR(port, ATMEL_US_RXEN);
-
         if (atmel_use_dma_rx(port)) {
                 /* enable PDC controller */
                 UART_PUT_IER(port, ATMEL_US_ENDRX | ATMEL_US_TIMEOUT |
@@ -405,8 +389,6 @@ static void atmel_start_rx(struct uart_port *port)
  */
 static void atmel_stop_rx(struct uart_port *port)
 {
-        UART_PUT_CR(port, ATMEL_US_RXDIS);
-
         if (atmel_use_dma_rx(port)) {
                 /* disable PDC receive */
                 UART_PUT_PTCR(port, ATMEL_PDC_RXTDIS);
@@ -699,8 +681,7 @@ static void atmel_tx_dma(struct uart_port *port)
                 /* Enable interrupts */
                 UART_PUT_IER(port, atmel_port->tx_done_mask);
         } else {
-                if ((atmel_port->rs485.flags & SER_RS485_ENABLED) &&
-                    !(atmel_port->rs485.flags & SER_RS485_RX_DURING_TX)) {
+                if (atmel_port->rs485.flags & SER_RS485_ENABLED) {
                         /* DMA done, stop TX, start RX for RS485 */
                         atmel_start_rx(port);
                 }
@@ -1232,7 +1213,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 
         if (atmel_port->rs485.flags & SER_RS485_ENABLED) {
                 dev_dbg(port->dev, "Setting UART to RS485\n");
-                if ((atmel_port->rs485.delay_rts_after_send) > 0)
+                if (atmel_port->rs485.flags & SER_RS485_RTS_AFTER_SEND)
                         UART_PUT_TTGR(port,
                                         atmel_port->rs485.delay_rts_after_send);
                 mode |= ATMEL_US_USMODE_RS485;
@@ -1260,7 +1241,12 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 
 static void atmel_set_ldisc(struct uart_port *port, int new)
 {
-        if (new == N_PPS) {
+        int line = port->line;
+
+        if (line >= port->state->port.tty->driver->num)
+                return;
+
+        if (port->state->port.tty->ldisc->ops->num == N_PPS) {
                 port->flags |= UPF_HARDPPS_CD;
                 atmel_enable_ms(port);
         } else {
@@ -1422,59 +1408,20 @@ static struct uart_ops atmel_pops = {
 #endif
 };
 
-static void atmel_of_init_port(struct atmel_uart_port *atmel_port,
-                                         struct device_node *np)
-{
-        u32 rs485_delay[2];
-
-        /* DMA/PDC usage specification */
-        if (of_get_property(np, "atmel,use-dma-rx", NULL))
-                atmel_port->use_dma_rx  = 1;
-        else
-                atmel_port->use_dma_rx  = 0;
-        if (of_get_property(np, "atmel,use-dma-tx", NULL))
-                atmel_port->use_dma_tx  = 1;
-        else
-                atmel_port->use_dma_tx  = 0;
-
-        /* rs485 properties */
-        if (of_property_read_u32_array(np, "rs485-rts-delay",
-                                            rs485_delay, 2) == 0) {
-                struct serial_rs485 *rs485conf = &atmel_port->rs485;
-
-                rs485conf->delay_rts_before_send = rs485_delay[0];
-                rs485conf->delay_rts_after_send = rs485_delay[1];
-                rs485conf->flags = 0;
-
-                if (of_get_property(np, "rs485-rx-during-tx", NULL))
-                        rs485conf->flags |= SER_RS485_RX_DURING_TX;
-
-                if (of_get_property(np, "linux,rs485-enabled-at-boot-time", NULL))
-                        rs485conf->flags |= SER_RS485_ENABLED;
-        }
-}
-
 /*
  * Configure the port from the platform device resource info.
  */
-static void atmel_init_port(struct atmel_uart_port *atmel_port,
+static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
                                       struct platform_device *pdev)
 {
         struct uart_port *port = &atmel_port->uart;
-        struct atmel_uart_data *pdata = pdev->dev.platform_data;
-
-        if (pdev->dev.of_node) {
-                atmel_of_init_port(atmel_port, pdev->dev.of_node);
-        } else {
-                atmel_port->use_dma_rx  = pdata->use_dma_rx;
-                atmel_port->use_dma_tx  = pdata->use_dma_tx;
-                atmel_port->rs485       = pdata->rs485;
-        }
+        struct atmel_uart_data *data = pdev->dev.platform_data;
 
         port->iotype            = UPIO_MEM;
         port->flags             = UPF_BOOT_AUTOCONF;
         port->ops               = &atmel_pops;
         port->fifosize          = 1;
+        port->line              = data->num;
         port->dev               = &pdev->dev;
         port->mapbase   = pdev->resource[0].start;
         port->irq       = pdev->resource[1].start;
@@ -1484,10 +1431,10 @@ static void atmel_init_port(struct atmel_uart_port *atmel_port,
 
         memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring));
 
-        if (pdata && pdata->regs) {
+        if (data->regs)
                 /* Already mapped by setup code */
-                port->membase = pdata->regs;
-        } else {
+                port->membase = data->regs;
+        else {
                 port->flags     |= UPF_IOREMAP;
                 port->membase   = NULL;
         }
@@ -1501,6 +1448,9 @@ static void atmel_init_port(struct atmel_uart_port *atmel_port,
                 /* only enable clock when USART is in use */
         }
 
+        atmel_port->use_dma_rx = data->use_dma_rx;
+        atmel_port->use_dma_tx = data->use_dma_tx;
+        atmel_port->rs485       = data->rs485;
         /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */
         if (atmel_port->rs485.flags & SER_RS485_ENABLED)
                 atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
@@ -1512,7 +1462,22 @@ static void atmel_init_port(struct atmel_uart_port *atmel_port,
         }
 }
 
-struct platform_device *atmel_default_console_device;   /* the serial console device */
+/*
+ * Register board-specific modem-control line handlers.
+ */
+void __init atmel_register_uart_fns(struct atmel_port_fns *fns)
+{
+        if (fns->enable_ms)
+                atmel_pops.enable_ms = fns->enable_ms;
+        if (fns->get_mctrl)
+                atmel_pops.get_mctrl = fns->get_mctrl;
+        if (fns->set_mctrl)
+                atmel_pops.set_mctrl = fns->set_mctrl;
+        atmel_open_hook         = fns->open;
+        atmel_close_hook        = fns->close;
+        atmel_pops.pm           = fns->pm;
+        atmel_pops.set_wake     = fns->set_wake;
+}
 
 #ifdef CONFIG_SERIAL_ATMEL_CONSOLE
 static void atmel_console_putchar(struct uart_port *port, int ch)
@@ -1647,14 +1612,10 @@ static int __init atmel_console_init(void)
         if (atmel_default_console_device) {
                 struct atmel_uart_data *pdata =
                         atmel_default_console_device->dev.platform_data;
-                int id = pdata->num;
-                struct atmel_uart_port *port = &atmel_ports[id];
-
-                port->backup_imr = 0;
-                port->uart.line = id;
 
-                add_preferred_console(ATMEL_DEVICENAME, id, NULL);
-                atmel_init_port(port, atmel_default_console_device);
+                add_preferred_console(ATMEL_DEVICENAME, pdata->num, NULL);
+                atmel_init_port(&atmel_ports[pdata->num],
+                                atmel_default_console_device);
                 register_console(&atmel_console);
         }
 
@@ -1748,52 +1709,20 @@ static int atmel_serial_resume(struct platform_device *pdev)
 #define atmel_serial_resume NULL
 #endif
 
-static int atmel_serial_probe(struct platform_device *pdev)
+static int __devinit atmel_serial_probe(struct platform_device *pdev)
 {
         struct atmel_uart_port *port;
-        struct device_node *np = pdev->dev.of_node;
         struct atmel_uart_data *pdata = pdev->dev.platform_data;
         void *data;
-        int ret = -ENODEV;
-        struct pinctrl *pinctrl;
+        int ret;
 
         BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));
 
-        if (np)
-                ret = of_alias_get_id(np, "serial");
-        else
-                if (pdata)
-                        ret = pdata->num;
-
-        if (ret < 0)
-                /* port id not found in platform data nor device-tree aliases:
-                 * auto-enumerate it */
-                ret = find_first_zero_bit(&atmel_ports_in_use,
-                                sizeof(atmel_ports_in_use));
-
-        if (ret > ATMEL_MAX_UART) {
-                ret = -ENODEV;
-                goto err;
-        }
-
-        if (test_and_set_bit(ret, &atmel_ports_in_use)) {
-                /* port already in use */
-                ret = -EBUSY;
-                goto err;
-        }
-
-        port = &atmel_ports[ret];
+        port = &atmel_ports[pdata->num];
         port->backup_imr = 0;
-        port->uart.line = ret;
 
         atmel_init_port(port, pdev);
 
-        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-        if (IS_ERR(pinctrl)) {
-                ret = PTR_ERR(pinctrl);
-                goto err;
-        }
-
         if (!atmel_use_dma_rx(&port->uart)) {
                 ret = -ENOMEM;
                 data = kmalloc(sizeof(struct atmel_uart_char)
@@ -1836,11 +1765,11 @@ err_alloc_ring:
                 clk_put(port->clk);
                 port->clk = NULL;
         }
-err:
+
         return ret;
 }
 
-static int atmel_serial_remove(struct platform_device *pdev)
+static int __devexit atmel_serial_remove(struct platform_device *pdev)
 {
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
@@ -1856,8 +1785,6 @@ static int atmel_serial_remove(struct platform_device *pdev)
 
         /* "port" is allocated statically, so we shouldn't free it */
 
-        clear_bit(port->line, &atmel_ports_in_use);
-
         clk_put(atmel_port->clk);
 
         return ret;
@@ -1865,13 +1792,12 @@ static int atmel_serial_remove(struct platform_device *pdev)
 
 static struct platform_driver atmel_serial_driver = {
         .probe          = atmel_serial_probe,
-        .remove         = atmel_serial_remove,
+        .remove         = __devexit_p(atmel_serial_remove),
         .suspend        = atmel_serial_suspend,
         .resume         = atmel_serial_resume,
         .driver         = {
                 .name   = "atmel_usart",
                 .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(atmel_serial_dt_ids),
         },
 };
 
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index c76a226080f..c0b68b9cad9 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -801,7 +801,7 @@ static struct uart_driver bcm_uart_driver = {
 /*
  * platform driver probe/remove callback
  */
-static int bcm_uart_probe(struct platform_device *pdev)
+static int __devinit bcm_uart_probe(struct platform_device *pdev)
 {
         struct resource *res_mem, *res_irq;
         struct uart_port *port;
@@ -848,7 +848,7 @@ static int bcm_uart_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int bcm_uart_remove(struct platform_device *pdev)
+static int __devexit bcm_uart_remove(struct platform_device *pdev)
 {
         struct uart_port *port;
 
@@ -865,7 +865,7 @@ static int bcm_uart_remove(struct platform_device *pdev)
  */
 static struct platform_driver bcm_uart_platform_driver = {
         .probe  = bcm_uart_probe,
-        .remove = bcm_uart_remove,
+        .remove = __devexit_p(bcm_uart_remove),
         .driver = {
                 .owner = THIS_MODULE,
                 .name  = "bcm63xx_uart",
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index f5d117379b6..891d194ae75 100644
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -294,18 +294,13 @@ static int sport_startup(struct uart_port *port)
                 if (request_irq(gpio_to_irq(up->cts_pin),
                         sport_mctrl_cts_int,
                         IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
-                        0, "BFIN_SPORT_UART_CTS", up)) {
+                        IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) {
                         up->cts_pin = -1;
                         dev_info(port->dev, "Unable to attach BlackFin UART over SPORT CTS interrupt. So, disable it.\n");
                 }
         }
-        if (up->rts_pin >= 0) {
-                if (gpio_request(up->rts_pin, DRV_NAME)) {
-                        dev_info(port->dev, "fail to request RTS PIN at GPIO_%d\n", up->rts_pin);
-                        up->rts_pin = -1;
-                } else
-                        gpio_direction_output(up->rts_pin, 0);
-        }
+        if (up->rts_pin >= 0)
+                gpio_direction_output(up->rts_pin, 0);
 #endif
 
         return 0;
@@ -450,8 +445,6 @@ static void sport_shutdown(struct uart_port *port)
 #ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
         if (up->cts_pin >= 0)
                 free_irq(gpio_to_irq(up->cts_pin), up);
-        if (up->rts_pin >= 0)
-                gpio_free(up->rts_pin);
 #endif
 }
 
@@ -740,7 +733,7 @@ static struct dev_pm_ops bfin_sport_uart_dev_pm_ops = {
 };
 #endif
 
-static int sport_uart_probe(struct platform_device *pdev)
+static int __devinit sport_uart_probe(struct platform_device *pdev)
 {
         struct resource *res;
         struct sport_uart_port *sport;
@@ -810,16 +803,17 @@ static int sport_uart_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_IO, 0);
                 if (res == NULL)
                         sport->cts_pin = -1;
-                else {
+                else
                         sport->cts_pin = res->start;
-                        sport->port.flags |= ASYNC_CTS_FLOW;
-                }
 
                 res = platform_get_resource(pdev, IORESOURCE_IO, 1);
                 if (res == NULL)
                         sport->rts_pin = -1;
                 else
                         sport->rts_pin = res->start;
+
+                if (sport->rts_pin >= 0)
+                        gpio_request(sport->rts_pin, DRV_NAME);
 #endif
         }
 
@@ -850,7 +844,7 @@ out_error_free_mem:
         return ret;
 }
 
-static int sport_uart_remove(struct platform_device *pdev)
+static int __devexit sport_uart_remove(struct platform_device *pdev)
 {
         struct sport_uart_port *sport = platform_get_drvdata(pdev);
 
@@ -859,6 +853,10 @@ static int sport_uart_remove(struct platform_device *pdev)
 
         if (sport) {
                 uart_remove_one_port(&sport_uart_reg, &sport->port);
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+                if (sport->rts_pin >= 0)
+                        gpio_free(sport->rts_pin);
+#endif
                 iounmap(sport->port.membase);
                 peripheral_free_list(
                         (unsigned short *)pdev->dev.platform_data);
@@ -871,7 +869,7 @@ static int sport_uart_remove(struct platform_device *pdev)
 
 static struct platform_driver sport_uart_driver = {
         .probe          = sport_uart_probe,
-        .remove         = sport_uart_remove,
+        .remove         = __devexit_p(sport_uart_remove),
         .driver         = {
                 .name   = DRV_NAME,
 #ifdef CONFIG_PM
diff --git a/drivers/tty/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
index e4510ea135c..6d06ce1d567 100644
--- a/drivers/tty/serial/bfin_sport_uart.h
+++ b/drivers/tty/serial/bfin_sport_uart.h
@@ -45,12 +45,11 @@
 #define SPORT_GET_RX32(sport) \
 ({ \
         unsigned int __ret; \
-        unsigned long flags; \
         if (ANOMALY_05000473) \
-                local_irq_save(flags); \
+                local_irq_disable(); \
         __ret = bfin_read32((sport)->port.membase + OFFSET_RX); \
         if (ANOMALY_05000473) \
-                local_irq_restore(flags); \
+                local_irq_enable(); \
         __ret; \
 })
 #define SPORT_GET_RCR1(sport)           bfin_read16(((sport)->port.membase + OFFSET_RCR1))
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
deleted file mode 100644
index 2e2b2c1cb72..00000000000
--- a/drivers/tty/serial/bfin_uart.c
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
- * Blackfin On-Chip Serial Driver
- *
- * Copyright 2006-2011 Analog Devices Inc.
- *
- * Enter bugs at http://blackfin.uclinux.org/
- *
- * Licensed under the GPL-2 or later.
- */
-
-#if defined(CONFIG_SERIAL_BFIN_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#define DRIVER_NAME "bfin-uart"
-#define pr_fmt(fmt) DRIVER_NAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/gfp.h>
-#include <linux/io.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/platform_device.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/serial_core.h>
-#include <linux/gpio.h>
-#include <linux/irq.h>
-#include <linux/kgdb.h>
-#include <linux/slab.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/portmux.h>
-#include <asm/cacheflush.h>
-#include <asm/dma.h>
-#include <asm/bfin_serial.h>
-
-#ifdef CONFIG_SERIAL_BFIN_MODULE
-# undef CONFIG_EARLY_PRINTK
-#endif
-
-#ifdef CONFIG_SERIAL_BFIN_MODULE
-# undef CONFIG_EARLY_PRINTK
-#endif
-
-/* UART name and device definitions */
-#define BFIN_SERIAL_DEV_NAME    "ttyBF"
-#define BFIN_SERIAL_MAJOR       204
-#define BFIN_SERIAL_MINOR       64
-
-static struct bfin_serial_port *bfin_serial_ports[BFIN_UART_NR_PORTS];
-
-#if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
-        defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-
-# ifndef CONFIG_SERIAL_BFIN_PIO
-#  error KGDB only support UART in PIO mode.
-# endif
-
-static int kgdboc_port_line;
-static int kgdboc_break_enabled;
-#endif
-/*
- * Setup for console. Argument comes from the menuconfig
- */
-#define DMA_RX_XCOUNT           512
-#define DMA_RX_YCOUNT           (PAGE_SIZE / DMA_RX_XCOUNT)
-
-#define DMA_RX_FLUSH_JIFFIES    (HZ / 50)
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart);
-#else
-static void bfin_serial_tx_chars(struct bfin_serial_port *uart);
-#endif
-
-static void bfin_serial_reset_irda(struct uart_port *port);
-
-#if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
-        defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
-static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        if (uart->cts_pin < 0)
-                return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-
-        /* CTS PIN is negative assertive. */
-        if (UART_GET_CTS(uart))
-                return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-        else
-                return TIOCM_DSR | TIOCM_CAR;
-}
-
-static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        if (uart->rts_pin < 0)
-                return;
-
-        /* RTS PIN is negative assertive. */
-        if (mctrl & TIOCM_RTS)
-                UART_ENABLE_RTS(uart);
-        else
-                UART_DISABLE_RTS(uart);
-}
-
-/*
- * Handle any change of modem status signal.
- */
-static irqreturn_t bfin_serial_mctrl_cts_int(int irq, void *dev_id)
-{
-        struct bfin_serial_port *uart = dev_id;
-        unsigned int status = bfin_serial_get_mctrl(&uart->port);
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        struct tty_struct *tty = uart->port.state->port.tty;
-
-        UART_CLEAR_SCTS(uart);
-        if (tty->hw_stopped) {
-                if (status) {
-                        tty->hw_stopped = 0;
-                        uart_write_wakeup(&uart->port);
-                }
-        } else {
-                if (!status)
-                        tty->hw_stopped = 1;
-        }
-#endif
-        uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
-
-        return IRQ_HANDLED;
-}
-#else
-static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
-{
-        return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
-}
-
-static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-}
-#endif
-
-/*
- * interrupts are disabled on entry
- */
-static void bfin_serial_stop_tx(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        struct circ_buf *xmit = &uart->port.state->xmit;
-#endif
-
-        while (!(UART_GET_LSR(uart) & TEMT))
-                cpu_relax();
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        disable_dma(uart->tx_dma_channel);
-        xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1);
-        uart->port.icount.tx += uart->tx_count;
-        uart->tx_count = 0;
-        uart->tx_done = 1;
-#else
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
-        /* Clear TFI bit */
-        UART_PUT_LSR(uart, TFI);
-#endif
-        UART_CLEAR_IER(uart, ETBEI);
-#endif
-}
-
-/*
- * port is locked and interrupts are disabled
- */
-static void bfin_serial_start_tx(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        struct tty_struct *tty = uart->port.state->port.tty;
-
-        /*
-         * To avoid losting RX interrupt, we reset IR function
-         * before sending data.
-         */
-        if (tty->termios.c_line == N_IRDA)
-                bfin_serial_reset_irda(port);
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        if (uart->tx_done)
-                bfin_serial_dma_tx_chars(uart);
-#else
-        UART_SET_IER(uart, ETBEI);
-        bfin_serial_tx_chars(uart);
-#endif
-}
-
-/*
- * Interrupts are enabled
- */
-static void bfin_serial_stop_rx(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-
-        UART_CLEAR_IER(uart, ERBFI);
-}
-
-/*
- * Set the modem control timer to fire immediately.
- */
-static void bfin_serial_enable_ms(struct uart_port *port)
-{
-}
-
-
-#if ANOMALY_05000363 && defined(CONFIG_SERIAL_BFIN_PIO)
-# define UART_GET_ANOMALY_THRESHOLD(uart)    ((uart)->anomaly_threshold)
-# define UART_SET_ANOMALY_THRESHOLD(uart, v) ((uart)->anomaly_threshold = (v))
-#else
-# define UART_GET_ANOMALY_THRESHOLD(uart)    0
-# define UART_SET_ANOMALY_THRESHOLD(uart, v)
-#endif
-
-#ifdef CONFIG_SERIAL_BFIN_PIO
-static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
-{
-        struct tty_struct *tty = NULL;
-        unsigned int status, ch, flg;
-        static struct timeval anomaly_start = { .tv_sec = 0 };
-
-        status = UART_GET_LSR(uart);
-        UART_CLEAR_LSR(uart);
-
-        ch = UART_GET_CHAR(uart);
-        uart->port.icount.rx++;
-
-#if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
-        defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-        if (kgdb_connected && kgdboc_port_line == uart->port.line
-                && kgdboc_break_enabled)
-                if (ch == 0x3) {/* Ctrl + C */
-                        kgdb_breakpoint();
-                        return;
-                }
-
-        if (!uart->port.state || !uart->port.state->port.tty)
-                return;
-#endif
-        tty = uart->port.state->port.tty;
-
-        if (ANOMALY_05000363) {
-                /* The BF533 (and BF561) family of processors have a nice anomaly
-                 * where they continuously generate characters for a "single" break.
-                 * We have to basically ignore this flood until the "next" valid
-                 * character comes across.  Due to the nature of the flood, it is
-                 * not possible to reliably catch bytes that are sent too quickly
-                 * after this break.  So application code talking to the Blackfin
-                 * which sends a break signal must allow at least 1.5 character
-                 * times after the end of the break for things to stabilize.  This
-                 * timeout was picked as it must absolutely be larger than 1
-                 * character time +/- some percent.  So 1.5 sounds good.  All other
-                 * Blackfin families operate properly.  Woo.
-                 */
-                if (anomaly_start.tv_sec) {
-                        struct timeval curr;
-                        suseconds_t usecs;
-
-                        if ((~ch & (~ch + 1)) & 0xff)
-                                goto known_good_char;
-
-                        do_gettimeofday(&curr);
-                        if (curr.tv_sec - anomaly_start.tv_sec > 1)
-                                goto known_good_char;
-
-                        usecs = 0;
-                        if (curr.tv_sec != anomaly_start.tv_sec)
-                                usecs += USEC_PER_SEC;
-                        usecs += curr.tv_usec - anomaly_start.tv_usec;
-
-                        if (usecs > UART_GET_ANOMALY_THRESHOLD(uart))
-                                goto known_good_char;
-
-                        if (ch)
-                                anomaly_start.tv_sec = 0;
-                        else
-                                anomaly_start = curr;
-
-                        return;
-
- known_good_char:
-                        status &= ~BI;
-                        anomaly_start.tv_sec = 0;
-                }
-        }
-
-        if (status & BI) {
-                if (ANOMALY_05000363)
-                        if (bfin_revid() < 5)
-                                do_gettimeofday(&anomaly_start);
-                uart->port.icount.brk++;
-                if (uart_handle_break(&uart->port))
-                        goto ignore_char;
-                status &= ~(PE | FE);
-        }
-        if (status & PE)
-                uart->port.icount.parity++;
-        if (status & OE)
-                uart->port.icount.overrun++;
-        if (status & FE)
-                uart->port.icount.frame++;
-
-        status &= uart->port.read_status_mask;
-
-        if (status & BI)
-                flg = TTY_BREAK;
-        else if (status & PE)
-                flg = TTY_PARITY;
-        else if (status & FE)
-                flg = TTY_FRAME;
-        else
-                flg = TTY_NORMAL;
-
-        if (uart_handle_sysrq_char(&uart->port, ch))
-                goto ignore_char;
-
-        uart_insert_char(&uart->port, status, OE, ch, flg);
-
- ignore_char:
-        tty_flip_buffer_push(tty);
-}
-
-static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
-{
-        struct circ_buf *xmit = &uart->port.state->xmit;
-
-        if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
-                /* Clear TFI bit */
-                UART_PUT_LSR(uart, TFI);
-#endif
-                /* Anomaly notes:
-                 *  05000215 -  we always clear ETBEI within last UART TX
-                 *              interrupt to end a string. It is always set
-                 *              when start a new tx.
-                 */
-                UART_CLEAR_IER(uart, ETBEI);
-                return;
-        }
-
-        if (uart->port.x_char) {
-                UART_PUT_CHAR(uart, uart->port.x_char);
-                uart->port.icount.tx++;
-                uart->port.x_char = 0;
-        }
-
-        while ((UART_GET_LSR(uart) & THRE) && xmit->tail != xmit->head) {
-                UART_PUT_CHAR(uart, xmit->buf[xmit->tail]);
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                uart->port.icount.tx++;
-        }
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&uart->port);
-}
-
-static irqreturn_t bfin_serial_rx_int(int irq, void *dev_id)
-{
-        struct bfin_serial_port *uart = dev_id;
-
-        while (UART_GET_LSR(uart) & DR)
-                bfin_serial_rx_chars(uart);
-
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id)
-{
-        struct bfin_serial_port *uart = dev_id;
-
-        spin_lock(&uart->port.lock);
-        if (UART_GET_LSR(uart) & THRE)
-                bfin_serial_tx_chars(uart);
-        spin_unlock(&uart->port.lock);
-
-        return IRQ_HANDLED;
-}
-#endif
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
-{
-        struct circ_buf *xmit = &uart->port.state->xmit;
-
-        uart->tx_done = 0;
-
-        if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
-                uart->tx_count = 0;
-                uart->tx_done = 1;
-                return;
-        }
-
-        if (uart->port.x_char) {
-                UART_PUT_CHAR(uart, uart->port.x_char);
-                uart->port.icount.tx++;
-                uart->port.x_char = 0;
-        }
-
-        uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE);
-        if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail))
-                uart->tx_count = UART_XMIT_SIZE - xmit->tail;
-        blackfin_dcache_flush_range((unsigned long)(xmit->buf+xmit->tail),
-                                        (unsigned long)(xmit->buf+xmit->tail+uart->tx_count));
-        set_dma_config(uart->tx_dma_channel,
-                set_bfin_dma_config(DIR_READ, DMA_FLOW_STOP,
-                        INTR_ON_BUF,
-                        DIMENSION_LINEAR,
-                        DATA_SIZE_8,
-                        DMA_SYNC_RESTART));
-        set_dma_start_addr(uart->tx_dma_channel, (unsigned long)(xmit->buf+xmit->tail));
-        set_dma_x_count(uart->tx_dma_channel, uart->tx_count);
-        set_dma_x_modify(uart->tx_dma_channel, 1);
-        SSYNC();
-        enable_dma(uart->tx_dma_channel);
-
-        UART_SET_IER(uart, ETBEI);
-}
-
-static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
-{
-        struct tty_struct *tty = uart->port.state->port.tty;
-        int i, flg, status;
-
-        status = UART_GET_LSR(uart);
-        UART_CLEAR_LSR(uart);
-
-        uart->port.icount.rx +=
-                CIRC_CNT(uart->rx_dma_buf.head, uart->rx_dma_buf.tail,
-                UART_XMIT_SIZE);
-
-        if (status & BI) {
-                uart->port.icount.brk++;
-                if (uart_handle_break(&uart->port))
-                        goto dma_ignore_char;
-                status &= ~(PE | FE);
-        }
-        if (status & PE)
-                uart->port.icount.parity++;
-        if (status & OE)
-                uart->port.icount.overrun++;
-        if (status & FE)
-                uart->port.icount.frame++;
-
-        status &= uart->port.read_status_mask;
-
-        if (status & BI)
-                flg = TTY_BREAK;
-        else if (status & PE)
-                flg = TTY_PARITY;
-        else if (status & FE)
-                flg = TTY_FRAME;
-        else
-                flg = TTY_NORMAL;
-
-        for (i = uart->rx_dma_buf.tail; ; i++) {
-                if (i >= UART_XMIT_SIZE)
-                        i = 0;
-                if (i == uart->rx_dma_buf.head)
-                        break;
-                if (!uart_handle_sysrq_char(&uart->port, uart->rx_dma_buf.buf[i]))
-                        uart_insert_char(&uart->port, status, OE,
-                                uart->rx_dma_buf.buf[i], flg);
-        }
-
- dma_ignore_char:
-        tty_flip_buffer_push(tty);
-}
-
-void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
-{
-        int x_pos, pos;
-        unsigned long flags;
-
-        spin_lock_irqsave(&uart->rx_lock, flags);
-
-        /* 2D DMA RX buffer ring is used. Because curr_y_count and
-         * curr_x_count can't be read as an atomic operation,
-         * curr_y_count should be read before curr_x_count. When
-         * curr_x_count is read, curr_y_count may already indicate
-         * next buffer line. But, the position calculated here is
-         * still indicate the old line. The wrong position data may
-         * be smaller than current buffer tail, which cause garbages
-         * are received if it is not prohibit.
-         */
-        uart->rx_dma_nrows = get_dma_curr_ycount(uart->rx_dma_channel);
-        x_pos = get_dma_curr_xcount(uart->rx_dma_channel);
-        uart->rx_dma_nrows = DMA_RX_YCOUNT - uart->rx_dma_nrows;
-        if (uart->rx_dma_nrows == DMA_RX_YCOUNT || x_pos == 0)
-                uart->rx_dma_nrows = 0;
-        x_pos = DMA_RX_XCOUNT - x_pos;
-        if (x_pos == DMA_RX_XCOUNT)
-                x_pos = 0;
-
-        pos = uart->rx_dma_nrows * DMA_RX_XCOUNT + x_pos;
-        /* Ignore receiving data if new position is in the same line of
-         * current buffer tail and small.
-         */
-        if (pos > uart->rx_dma_buf.tail ||
-                uart->rx_dma_nrows < (uart->rx_dma_buf.tail/DMA_RX_XCOUNT)) {
-                uart->rx_dma_buf.head = pos;
-                bfin_serial_dma_rx_chars(uart);
-                uart->rx_dma_buf.tail = uart->rx_dma_buf.head;
-        }
-
-        spin_unlock_irqrestore(&uart->rx_lock, flags);
-
-        mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES);
-}
-
-static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
-{
-        struct bfin_serial_port *uart = dev_id;
-        struct circ_buf *xmit = &uart->port.state->xmit;
-
-        spin_lock(&uart->port.lock);
-        if (!(get_dma_curr_irqstat(uart->tx_dma_channel)&DMA_RUN)) {
-                disable_dma(uart->tx_dma_channel);
-                clear_dma_irqstat(uart->tx_dma_channel);
-                /* Anomaly notes:
-                 *  05000215 -  we always clear ETBEI within last UART TX
-                 *              interrupt to end a string. It is always set
-                 *              when start a new tx.
-                 */
-                UART_CLEAR_IER(uart, ETBEI);
-                uart->port.icount.tx += uart->tx_count;
-                if (!(xmit->tail == 0 && xmit->head == 0)) {
-                        xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1);
-
-                        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                                uart_write_wakeup(&uart->port);
-                }
-
-                bfin_serial_dma_tx_chars(uart);
-        }
-
-        spin_unlock(&uart->port.lock);
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t bfin_serial_dma_rx_int(int irq, void *dev_id)
-{
-        struct bfin_serial_port *uart = dev_id;
-        unsigned int irqstat;
-        int x_pos, pos;
-
-        spin_lock(&uart->rx_lock);
-        irqstat = get_dma_curr_irqstat(uart->rx_dma_channel);
-        clear_dma_irqstat(uart->rx_dma_channel);
-
-        uart->rx_dma_nrows = get_dma_curr_ycount(uart->rx_dma_channel);
-        x_pos = get_dma_curr_xcount(uart->rx_dma_channel);
-        uart->rx_dma_nrows = DMA_RX_YCOUNT - uart->rx_dma_nrows;
-        if (uart->rx_dma_nrows == DMA_RX_YCOUNT || x_pos == 0)
-                uart->rx_dma_nrows = 0;
-
-        pos = uart->rx_dma_nrows * DMA_RX_XCOUNT;
-        if (pos > uart->rx_dma_buf.tail ||
-                uart->rx_dma_nrows < (uart->rx_dma_buf.tail/DMA_RX_XCOUNT)) {
-                uart->rx_dma_buf.head = pos;
-                bfin_serial_dma_rx_chars(uart);
-                uart->rx_dma_buf.tail = uart->rx_dma_buf.head;
-        }
-
-        spin_unlock(&uart->rx_lock);
-
-        return IRQ_HANDLED;
-}
-#endif
-
-/*
- * Return TIOCSER_TEMT when transmitter is not busy.
- */
-static unsigned int bfin_serial_tx_empty(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        unsigned int lsr;
-
-        lsr = UART_GET_LSR(uart);
-        if (lsr & TEMT)
-                return TIOCSER_TEMT;
-        else
-                return 0;
-}
-
-static void bfin_serial_break_ctl(struct uart_port *port, int break_state)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        u32 lcr = UART_GET_LCR(uart);
-        if (break_state)
-                lcr |= SB;
-        else
-                lcr &= ~SB;
-        UART_PUT_LCR(uart, lcr);
-        SSYNC();
-}
-
-static int bfin_serial_startup(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        dma_addr_t dma_handle;
-
-        if (request_dma(uart->rx_dma_channel, "BFIN_UART_RX") < 0) {
-                printk(KERN_NOTICE "Unable to attach Blackfin UART RX DMA channel\n");
-                return -EBUSY;
-        }
-
-        if (request_dma(uart->tx_dma_channel, "BFIN_UART_TX") < 0) {
-                printk(KERN_NOTICE "Unable to attach Blackfin UART TX DMA channel\n");
-                free_dma(uart->rx_dma_channel);
-                return -EBUSY;
-        }
-
-        set_dma_callback(uart->rx_dma_channel, bfin_serial_dma_rx_int, uart);
-        set_dma_callback(uart->tx_dma_channel, bfin_serial_dma_tx_int, uart);
-
-        uart->rx_dma_buf.buf = (unsigned char *)dma_alloc_coherent(NULL, PAGE_SIZE, &dma_handle, GFP_DMA);
-        uart->rx_dma_buf.head = 0;
-        uart->rx_dma_buf.tail = 0;
-        uart->rx_dma_nrows = 0;
-
-        set_dma_config(uart->rx_dma_channel,
-                set_bfin_dma_config(DIR_WRITE, DMA_FLOW_AUTO,
-                                INTR_ON_ROW, DIMENSION_2D,
-                                DATA_SIZE_8,
-                                DMA_SYNC_RESTART));
-        set_dma_x_count(uart->rx_dma_channel, DMA_RX_XCOUNT);
-        set_dma_x_modify(uart->rx_dma_channel, 1);
-        set_dma_y_count(uart->rx_dma_channel, DMA_RX_YCOUNT);
-        set_dma_y_modify(uart->rx_dma_channel, 1);
-        set_dma_start_addr(uart->rx_dma_channel, (unsigned long)uart->rx_dma_buf.buf);
-        enable_dma(uart->rx_dma_channel);
-
-        uart->rx_dma_timer.data = (unsigned long)(uart);
-        uart->rx_dma_timer.function = (void *)bfin_serial_rx_dma_timeout;
-        uart->rx_dma_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES;
-        add_timer(&(uart->rx_dma_timer));
-#else
-# if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
-        defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-        if (kgdboc_port_line == uart->port.line && kgdboc_break_enabled)
-                kgdboc_break_enabled = 0;
-        else {
-# endif
-        if (request_irq(uart->rx_irq, bfin_serial_rx_int, 0,
-             "BFIN_UART_RX", uart)) {
-                printk(KERN_NOTICE "Unable to attach BlackFin UART RX interrupt\n");
-                return -EBUSY;
-        }
-
-        if (request_irq
-            (uart->tx_irq, bfin_serial_tx_int, 0,
-             "BFIN_UART_TX", uart)) {
-                printk(KERN_NOTICE "Unable to attach BlackFin UART TX interrupt\n");
-                free_irq(uart->rx_irq, uart);
-                return -EBUSY;
-        }
-
-# ifdef CONFIG_BF54x
-        {
-                /*
-                 * UART2 and UART3 on BF548 share interrupt PINs and DMA
-                 * controllers with SPORT2 and SPORT3. UART rx and tx
-                 * interrupts are generated in PIO mode only when configure
-                 * their peripheral mapping registers properly, which means
-                 * request corresponding DMA channels in PIO mode as well.
-                 */
-                unsigned uart_dma_ch_rx, uart_dma_ch_tx;
-
-                switch (uart->rx_irq) {
-                case IRQ_UART3_RX:
-                        uart_dma_ch_rx = CH_UART3_RX;
-                        uart_dma_ch_tx = CH_UART3_TX;
-                        break;
-                case IRQ_UART2_RX:
-                        uart_dma_ch_rx = CH_UART2_RX;
-                        uart_dma_ch_tx = CH_UART2_TX;
-                        break;
-                default:
-                        uart_dma_ch_rx = uart_dma_ch_tx = 0;
-                        break;
-                };
-
-                if (uart_dma_ch_rx &&
-                        request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) {
-                        printk(KERN_NOTICE"Fail to attach UART interrupt\n");
-                        free_irq(uart->rx_irq, uart);
-                        free_irq(uart->tx_irq, uart);
-                        return -EBUSY;
-                }
-                if (uart_dma_ch_tx &&
-                        request_dma(uart_dma_ch_tx, "BFIN_UART_TX") < 0) {
-                        printk(KERN_NOTICE "Fail to attach UART interrupt\n");
-                        free_dma(uart_dma_ch_rx);
-                        free_irq(uart->rx_irq, uart);
-                        free_irq(uart->tx_irq, uart);
-                        return -EBUSY;
-                }
-        }
-# endif
-# if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
-        defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-        }
-# endif
-#endif
-
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        if (uart->cts_pin >= 0) {
-                if (request_irq(gpio_to_irq(uart->cts_pin),
-                        bfin_serial_mctrl_cts_int,
-                        IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
-                        0, "BFIN_UART_CTS", uart)) {
-                        uart->cts_pin = -1;
-                        pr_info("Unable to attach BlackFin UART CTS interrupt. So, disable it.\n");
-                }
-        }
-        if (uart->rts_pin >= 0) {
-                if (gpio_request(uart->rts_pin, DRIVER_NAME)) {
-                        pr_info("fail to request RTS PIN at GPIO_%d\n", uart->rts_pin);
-                        uart->rts_pin = -1;
-                } else
-                        gpio_direction_output(uart->rts_pin, 0);
-        }
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        if (uart->cts_pin >= 0) {
-                if (request_irq(uart->status_irq, bfin_serial_mctrl_cts_int,
-                        IRQF_DISABLED, "BFIN_UART_MODEM_STATUS", uart)) {
-                        uart->cts_pin = -1;
-                        dev_info(port->dev, "Unable to attach BlackFin UART Modem Status interrupt.\n");
-                }
-
-                /* CTS RTS PINs are negative assertive. */
-                UART_PUT_MCR(uart, UART_GET_MCR(uart) | ACTS);
-                UART_SET_IER(uart, EDSSI);
-        }
-#endif
-
-        UART_SET_IER(uart, ERBFI);
-        return 0;
-}
-
-static void bfin_serial_shutdown(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        disable_dma(uart->tx_dma_channel);
-        free_dma(uart->tx_dma_channel);
-        disable_dma(uart->rx_dma_channel);
-        free_dma(uart->rx_dma_channel);
-        del_timer(&(uart->rx_dma_timer));
-        dma_free_coherent(NULL, PAGE_SIZE, uart->rx_dma_buf.buf, 0);
-#else
-#ifdef CONFIG_BF54x
-        switch (uart->port.irq) {
-        case IRQ_UART3_RX:
-                free_dma(CH_UART3_RX);
-                free_dma(CH_UART3_TX);
-                break;
-        case IRQ_UART2_RX:
-                free_dma(CH_UART2_RX);
-                free_dma(CH_UART2_TX);
-                break;
-        default:
-                break;
-        };
-#endif
-        free_irq(uart->rx_irq, uart);
-        free_irq(uart->tx_irq, uart);
-#endif
-
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        if (uart->cts_pin >= 0)
-                free_irq(gpio_to_irq(uart->cts_pin), uart);
-        if (uart->rts_pin >= 0)
-                gpio_free(uart->rts_pin);
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        if (uart->cts_pin >= 0)
-                free_irq(uart->status_irq, uart);
-#endif
-}
-
-static void
-bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
-                   struct ktermios *old)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        unsigned long flags;
-        unsigned int baud, quot;
-        unsigned int ier, lcr = 0;
-        unsigned long timeout;
-
-        switch (termios->c_cflag & CSIZE) {
-        case CS8:
-                lcr = WLS(8);
-                break;
-        case CS7:
-                lcr = WLS(7);
-                break;
-        case CS6:
-                lcr = WLS(6);
-                break;
-        case CS5:
-                lcr = WLS(5);
-                break;
-        default:
-                printk(KERN_ERR "%s: word length not supported\n",
-                        __func__);
-        }
-
-        /* Anomaly notes:
-         *  05000231 -  STOP bit is always set to 1 whatever the user is set.
-         */
-        if (termios->c_cflag & CSTOPB) {
-                if (ANOMALY_05000231)
-                        printk(KERN_WARNING "STOP bits other than 1 is not "
-                                "supported in case of anomaly 05000231.\n");
-                else
-                        lcr |= STB;
-        }
-        if (termios->c_cflag & PARENB)
-                lcr |= PEN;
-        if (!(termios->c_cflag & PARODD))
-                lcr |= EPS;
-        if (termios->c_cflag & CMSPAR)
-                lcr |= STP;
-
-        spin_lock_irqsave(&uart->port.lock, flags);
-
-        port->read_status_mask = OE;
-        if (termios->c_iflag & INPCK)
-                port->read_status_mask |= (FE | PE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= BI;
-
-        /*
-         * Characters to ignore
-         */
-        port->ignore_status_mask = 0;
-        if (termios->c_iflag & IGNPAR)
-                port->ignore_status_mask |= FE | PE;
-        if (termios->c_iflag & IGNBRK) {
-                port->ignore_status_mask |= BI;
-                /*
-                 * If we're ignoring parity and break indicators,
-                 * ignore overruns too (for real raw support).
-                 */
-                if (termios->c_iflag & IGNPAR)
-                        port->ignore_status_mask |= OE;
-        }
-
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
-        quot = uart_get_divisor(port, baud);
-
-        /* If discipline is not IRDA, apply ANOMALY_05000230 */
-        if (termios->c_line != N_IRDA)
-                quot -= ANOMALY_05000230;
-
-        UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15);
-
-        /* Wait till the transfer buffer is empty */
-        timeout = jiffies + msecs_to_jiffies(10);
-        while (UART_GET_GCTL(uart) & UCEN && !(UART_GET_LSR(uart) & TEMT))
-                if (time_after(jiffies, timeout)) {
-                        dev_warn(port->dev, "timeout waiting for TX buffer empty\n");
-                        break;
-                }
-
-        /* Disable UART */
-        ier = UART_GET_IER(uart);
-        UART_PUT_GCTL(uart, UART_GET_GCTL(uart) & ~UCEN);
-        UART_DISABLE_INTS(uart);
-
-        /* Set DLAB in LCR to Access CLK */
-        UART_SET_DLAB(uart);
-
-        UART_PUT_CLK(uart, quot);
-        SSYNC();
-
-        /* Clear DLAB in LCR to Access THR RBR IER */
-        UART_CLEAR_DLAB(uart);
-
-        UART_PUT_LCR(uart, (UART_GET_LCR(uart) & ~LCR_MASK) | lcr);
-
-        /* Enable UART */
-        UART_ENABLE_INTS(uart, ier);
-        UART_PUT_GCTL(uart, UART_GET_GCTL(uart) | UCEN);
-
-        /* Port speed changed, update the per-port timeout. */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        spin_unlock_irqrestore(&uart->port.lock, flags);
-}
-
-static const char *bfin_serial_type(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-
-        return uart->port.type == PORT_BFIN ? "BFIN-UART" : NULL;
-}
-
-/*
- * Release the memory region(s) being used by 'port'.
- */
-static void bfin_serial_release_port(struct uart_port *port)
-{
-}
-
-/*
- * Request the memory region(s) being used by 'port'.
- */
-static int bfin_serial_request_port(struct uart_port *port)
-{
-        return 0;
-}
-
-/*
- * Configure/autoconfigure the port.
- */
-static void bfin_serial_config_port(struct uart_port *port, int flags)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-
-        if (flags & UART_CONFIG_TYPE &&
-            bfin_serial_request_port(&uart->port) == 0)
-                uart->port.type = PORT_BFIN;
-}
-
-/*
- * Verify the new serial_struct (for TIOCSSERIAL).
- * The only change we allow are to the flags and type, and
- * even then only between PORT_BFIN and PORT_UNKNOWN
- */
-static int
-bfin_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-        return 0;
-}
-
-/*
- * Enable the IrDA function if tty->ldisc.num is N_IRDA.
- * In other cases, disable IrDA function.
- */
-static void bfin_serial_set_ldisc(struct uart_port *port, int ld)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        unsigned int val;
-
-        switch (ld) {
-        case N_IRDA:
-                val = UART_GET_GCTL(uart);
-                val |= (UMOD_IRDA | RPOLC);
-                UART_PUT_GCTL(uart, val);
-                break;
-        default:
-                val = UART_GET_GCTL(uart);
-                val &= ~(UMOD_MASK | RPOLC);
-                UART_PUT_GCTL(uart, val);
-        }
-}
-
-static void bfin_serial_reset_irda(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        unsigned int val;
-
-        val = UART_GET_GCTL(uart);
-        val &= ~(UMOD_MASK | RPOLC);
-        UART_PUT_GCTL(uart, val);
-        SSYNC();
-        val |= (UMOD_IRDA | RPOLC);
-        UART_PUT_GCTL(uart, val);
-        SSYNC();
-}
-
-#ifdef CONFIG_CONSOLE_POLL
-/* Anomaly notes:
- *  05000099 -  Because we only use THRE in poll_put and DR in poll_get,
- *              losing other bits of UART_LSR is not a problem here.
- */
-static void bfin_serial_poll_put_char(struct uart_port *port, unsigned char chr)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-
-        while (!(UART_GET_LSR(uart) & THRE))
-                cpu_relax();
-
-        UART_CLEAR_DLAB(uart);
-        UART_PUT_CHAR(uart, (unsigned char)chr);
-}
-
-static int bfin_serial_poll_get_char(struct uart_port *port)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        unsigned char chr;
-
-        while (!(UART_GET_LSR(uart) & DR))
-                cpu_relax();
-
-        UART_CLEAR_DLAB(uart);
-        chr = UART_GET_CHAR(uart);
-
-        return chr;
-}
-#endif
-
-#if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
-        defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-static void bfin_kgdboc_port_shutdown(struct uart_port *port)
-{
-        if (kgdboc_break_enabled) {
-                kgdboc_break_enabled = 0;
-                bfin_serial_shutdown(port);
-        }
-}
-
-static int bfin_kgdboc_port_startup(struct uart_port *port)
-{
-        kgdboc_port_line = port->line;
-        kgdboc_break_enabled = !bfin_serial_startup(port);
-        return 0;
-}
-#endif
-
-static struct uart_ops bfin_serial_pops = {
-        .tx_empty       = bfin_serial_tx_empty,
-        .set_mctrl      = bfin_serial_set_mctrl,
-        .get_mctrl      = bfin_serial_get_mctrl,
-        .stop_tx        = bfin_serial_stop_tx,
-        .start_tx       = bfin_serial_start_tx,
-        .stop_rx        = bfin_serial_stop_rx,
-        .enable_ms      = bfin_serial_enable_ms,
-        .break_ctl      = bfin_serial_break_ctl,
-        .startup        = bfin_serial_startup,
-        .shutdown       = bfin_serial_shutdown,
-        .set_termios    = bfin_serial_set_termios,
-        .set_ldisc      = bfin_serial_set_ldisc,
-        .type           = bfin_serial_type,
-        .release_port   = bfin_serial_release_port,
-        .request_port   = bfin_serial_request_port,
-        .config_port    = bfin_serial_config_port,
-        .verify_port    = bfin_serial_verify_port,
-#if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \
-        defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE)
-        .kgdboc_port_startup    = bfin_kgdboc_port_startup,
-        .kgdboc_port_shutdown   = bfin_kgdboc_port_shutdown,
-#endif
-#ifdef CONFIG_CONSOLE_POLL
-        .poll_put_char  = bfin_serial_poll_put_char,
-        .poll_get_char  = bfin_serial_poll_get_char,
-#endif
-};
-
-#if defined(CONFIG_SERIAL_BFIN_CONSOLE) || defined(CONFIG_EARLY_PRINTK)
-/*
- * If the port was already initialised (eg, by a boot loader),
- * try to determine the current setup.
- */
-static void __init
-bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud,
-                           int *parity, int *bits)
-{
-        unsigned int status;
-
-        status = UART_GET_IER(uart) & (ERBFI | ETBEI);
-        if (status == (ERBFI | ETBEI)) {
-                /* ok, the port was enabled */
-                u32 lcr, clk;
-
-                lcr = UART_GET_LCR(uart);
-
-                *parity = 'n';
-                if (lcr & PEN) {
-                        if (lcr & EPS)
-                                *parity = 'e';
-                        else
-                                *parity = 'o';
-                }
-                *bits = ((lcr & WLS_MASK) >> WLS_OFFSET) + 5;
-
-                /* Set DLAB in LCR to Access CLK */
-                UART_SET_DLAB(uart);
-
-                clk = UART_GET_CLK(uart);
-
-                /* Clear DLAB in LCR to Access THR RBR IER */
-                UART_CLEAR_DLAB(uart);
-
-                *baud = get_sclk() / (16*clk);
-        }
-        pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __func__, *baud, *parity, *bits);
-}
-
-static struct uart_driver bfin_serial_reg;
-
-static void bfin_serial_console_putchar(struct uart_port *port, int ch)
-{
-        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        while (!(UART_GET_LSR(uart) & THRE))
-                barrier();
-        UART_PUT_CHAR(uart, ch);
-}
-
-#endif /* defined (CONFIG_SERIAL_BFIN_CONSOLE) ||
-                 defined (CONFIG_EARLY_PRINTK) */
-
-#ifdef CONFIG_SERIAL_BFIN_CONSOLE
-#define CLASS_BFIN_CONSOLE      "bfin-console"
-/*
- * Interrupts are disabled on entering
- */
-static void
-bfin_serial_console_write(struct console *co, const char *s, unsigned int count)
-{
-        struct bfin_serial_port *uart = bfin_serial_ports[co->index];
-        unsigned long flags;
-
-        spin_lock_irqsave(&uart->port.lock, flags);
-        uart_console_write(&uart->port, s, count, bfin_serial_console_putchar);
-        spin_unlock_irqrestore(&uart->port.lock, flags);
-
-}
-
-static int __init
-bfin_serial_console_setup(struct console *co, char *options)
-{
-        struct bfin_serial_port *uart;
-        int baud = 57600;
-        int bits = 8;
-        int parity = 'n';
-# if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
-        defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
-        int flow = 'r';
-# else
-        int flow = 'n';
-# endif
-
-        /*
-         * 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 < 0 || co->index >= BFIN_UART_NR_PORTS)
-                return -ENODEV;
-
-        uart = bfin_serial_ports[co->index];
-        if (!uart)
-                return -ENODEV;
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-        else
-                bfin_serial_console_get_options(uart, &baud, &parity, &bits);
-
-        return uart_set_options(&uart->port, co, baud, parity, bits, flow);
-}
-
-static struct console bfin_serial_console = {
-        .name           = BFIN_SERIAL_DEV_NAME,
-        .write          = bfin_serial_console_write,
-        .device         = uart_console_device,
-        .setup          = bfin_serial_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-        .data           = &bfin_serial_reg,
-};
-#define BFIN_SERIAL_CONSOLE     (&bfin_serial_console)
-#else
-#define BFIN_SERIAL_CONSOLE     NULL
-#endif /* CONFIG_SERIAL_BFIN_CONSOLE */
-
-#ifdef  CONFIG_EARLY_PRINTK
-static struct bfin_serial_port bfin_earlyprintk_port;
-#define CLASS_BFIN_EARLYPRINTK  "bfin-earlyprintk"
-
-/*
- * Interrupts are disabled on entering
- */
-static void
-bfin_earlyprintk_console_write(struct console *co, const char *s, unsigned int count)
-{
-        unsigned long flags;
-
-        if (bfin_earlyprintk_port.port.line != co->index)
-                return;
-
-        spin_lock_irqsave(&bfin_earlyprintk_port.port.lock, flags);
-        uart_console_write(&bfin_earlyprintk_port.port, s, count,
-                bfin_serial_console_putchar);
-        spin_unlock_irqrestore(&bfin_earlyprintk_port.port.lock, flags);
-}
-
-/*
- * This should have a .setup or .early_setup in it, but then things get called
- * without the command line options, and the baud rate gets messed up - so
- * don't let the common infrastructure play with things. (see calls to setup
- * & earlysetup in ./kernel/printk.c:register_console()
- */
-static struct __initdata console bfin_early_serial_console = {
-        .name = "early_BFuart",
-        .write = bfin_earlyprintk_console_write,
-        .device = uart_console_device,
-        .flags = CON_PRINTBUFFER,
-        .index = -1,
-        .data  = &bfin_serial_reg,
-};
-#endif
-
-static struct uart_driver bfin_serial_reg = {
-        .owner                  = THIS_MODULE,
-        .driver_name            = DRIVER_NAME,
-        .dev_name               = BFIN_SERIAL_DEV_NAME,
-        .major                  = BFIN_SERIAL_MAJOR,
-        .minor                  = BFIN_SERIAL_MINOR,
-        .nr                     = BFIN_UART_NR_PORTS,
-        .cons                   = BFIN_SERIAL_CONSOLE,
-};
-
-static int bfin_serial_suspend(struct platform_device *pdev, pm_message_t state)
-{
-        struct bfin_serial_port *uart = platform_get_drvdata(pdev);
-
-        return uart_suspend_port(&bfin_serial_reg, &uart->port);
-}
-
-static int bfin_serial_resume(struct platform_device *pdev)
-{
-        struct bfin_serial_port *uart = platform_get_drvdata(pdev);
-
-        return uart_resume_port(&bfin_serial_reg, &uart->port);
-}
-
-static int bfin_serial_probe(struct platform_device *pdev)
-{
-        struct resource *res;
-        struct bfin_serial_port *uart = NULL;
-        int ret = 0;
-
-        if (pdev->id < 0 || pdev->id >= BFIN_UART_NR_PORTS) {
-                dev_err(&pdev->dev, "Wrong bfin uart platform device id.\n");
-                return -ENOENT;
-        }
-
-        if (bfin_serial_ports[pdev->id] == NULL) {
-
-                uart = kzalloc(sizeof(*uart), GFP_KERNEL);
-                if (!uart) {
-                        dev_err(&pdev->dev,
-                                "fail to malloc bfin_serial_port\n");
-                        return -ENOMEM;
-                }
-                bfin_serial_ports[pdev->id] = uart;
-
-#ifdef CONFIG_EARLY_PRINTK
-                if (!(bfin_earlyprintk_port.port.membase
-                        && bfin_earlyprintk_port.port.line == pdev->id)) {
-                        /*
-                         * If the peripheral PINs of current port is allocated
-                         * in earlyprintk probe stage, don't do it again.
-                         */
-#endif
-                ret = peripheral_request_list(
-                        (unsigned short *)pdev->dev.platform_data, DRIVER_NAME);
-                if (ret) {
-                        dev_err(&pdev->dev,
-                                "fail to request bfin serial peripherals\n");
-                        goto out_error_free_mem;
-                }
-#ifdef CONFIG_EARLY_PRINTK
-                }
-#endif
-
-                spin_lock_init(&uart->port.lock);
-                uart->port.uartclk   = get_sclk();
-                uart->port.fifosize  = BFIN_UART_TX_FIFO_SIZE;
-                uart->port.ops       = &bfin_serial_pops;
-                uart->port.line      = pdev->id;
-                uart->port.iotype    = UPIO_MEM;
-                uart->port.flags     = UPF_BOOT_AUTOCONF;
-
-                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-                if (res == NULL) {
-                        dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-                        ret = -ENOENT;
-                        goto out_error_free_peripherals;
-                }
-
-                uart->port.membase = ioremap(res->start, resource_size(res));
-                if (!uart->port.membase) {
-                        dev_err(&pdev->dev, "Cannot map uart IO\n");
-                        ret = -ENXIO;
-                        goto out_error_free_peripherals;
-                }
-                uart->port.mapbase = res->start;
-
-                uart->tx_irq = platform_get_irq(pdev, 0);
-                if (uart->tx_irq < 0) {
-                        dev_err(&pdev->dev, "No uart TX IRQ specified\n");
-                        ret = -ENOENT;
-                        goto out_error_unmap;
-                }
-
-                uart->rx_irq = platform_get_irq(pdev, 1);
-                if (uart->rx_irq < 0) {
-                        dev_err(&pdev->dev, "No uart RX IRQ specified\n");
-                        ret = -ENOENT;
-                        goto out_error_unmap;
-                }
-                uart->port.irq = uart->rx_irq;
-
-                uart->status_irq = platform_get_irq(pdev, 2);
-                if (uart->status_irq < 0) {
-                        dev_err(&pdev->dev, "No uart status IRQ specified\n");
-                        ret = -ENOENT;
-                        goto out_error_unmap;
-                }
-
-#ifdef CONFIG_SERIAL_BFIN_DMA
-                spin_lock_init(&uart->rx_lock);
-                uart->tx_done       = 1;
-                uart->tx_count      = 0;
-
-                res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-                if (res == NULL) {
-                        dev_err(&pdev->dev, "No uart TX DMA channel specified\n");
-                        ret = -ENOENT;
-                        goto out_error_unmap;
-                }
-                uart->tx_dma_channel = res->start;
-
-                res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
-                if (res == NULL) {
-                        dev_err(&pdev->dev, "No uart RX DMA channel specified\n");
-                        ret = -ENOENT;
-                        goto out_error_unmap;
-                }
-                uart->rx_dma_channel = res->start;
-
-                init_timer(&(uart->rx_dma_timer));
-#endif
-
-#if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
-        defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
-                res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-                if (res == NULL)
-                        uart->cts_pin = -1;
-                else {
-                        uart->cts_pin = res->start;
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-                        uart->port.flags |= ASYNC_CTS_FLOW;
-#endif
-                }
-
-                res = platform_get_resource(pdev, IORESOURCE_IO, 1);
-                if (res == NULL)
-                        uart->rts_pin = -1;
-                else
-                        uart->rts_pin = res->start;
-#endif
-        }
-
-#ifdef CONFIG_SERIAL_BFIN_CONSOLE
-        if (!is_early_platform_device(pdev)) {
-#endif
-                uart = bfin_serial_ports[pdev->id];
-                uart->port.dev = &pdev->dev;
-                dev_set_drvdata(&pdev->dev, uart);
-                ret = uart_add_one_port(&bfin_serial_reg, &uart->port);
-#ifdef CONFIG_SERIAL_BFIN_CONSOLE
-        }
-#endif
-
-        if (!ret)
-                return 0;
-
-        if (uart) {
-out_error_unmap:
-                iounmap(uart->port.membase);
-out_error_free_peripherals:
-                peripheral_free_list(
-                        (unsigned short *)pdev->dev.platform_data);
-out_error_free_mem:
-                kfree(uart);
-                bfin_serial_ports[pdev->id] = NULL;
-        }
-
-        return ret;
-}
-
-static int bfin_serial_remove(struct platform_device *pdev)
-{
-        struct bfin_serial_port *uart = platform_get_drvdata(pdev);
-
-        dev_set_drvdata(&pdev->dev, NULL);
-
-        if (uart) {
-                uart_remove_one_port(&bfin_serial_reg, &uart->port);
-                iounmap(uart->port.membase);
-                peripheral_free_list(
-                        (unsigned short *)pdev->dev.platform_data);
-                kfree(uart);
-                bfin_serial_ports[pdev->id] = NULL;
-        }
-
-        return 0;
-}
-
-static struct platform_driver bfin_serial_driver = {
-        .probe          = bfin_serial_probe,
-        .remove         = bfin_serial_remove,
-        .suspend        = bfin_serial_suspend,
-        .resume         = bfin_serial_resume,
-        .driver         = {
-                .name   = DRIVER_NAME,
-                .owner  = THIS_MODULE,
-        },
-};
-
-#if defined(CONFIG_SERIAL_BFIN_CONSOLE)
-static __initdata struct early_platform_driver early_bfin_serial_driver = {
-        .class_str = CLASS_BFIN_CONSOLE,
-        .pdrv = &bfin_serial_driver,
-        .requested_id = EARLY_PLATFORM_ID_UNSET,
-};
-
-static int __init bfin_serial_rs_console_init(void)
-{
-        early_platform_driver_register(&early_bfin_serial_driver, DRIVER_NAME);
-
-        early_platform_driver_probe(CLASS_BFIN_CONSOLE, BFIN_UART_NR_PORTS, 0);
-
-        register_console(&bfin_serial_console);
-
-        return 0;
-}
-console_initcall(bfin_serial_rs_console_init);
-#endif
-
-#ifdef CONFIG_EARLY_PRINTK
-/*
- * Memory can't be allocated dynamically during earlyprink init stage.
- * So, do individual probe for earlyprink with a static uart port variable.
- */
-static int bfin_earlyprintk_probe(struct platform_device *pdev)
-{
-        struct resource *res;
-        int ret;
-
-        if (pdev->id < 0 || pdev->id >= BFIN_UART_NR_PORTS) {
-                dev_err(&pdev->dev, "Wrong earlyprintk platform device id.\n");
-                return -ENOENT;
-        }
-
-        ret = peripheral_request_list(
-                (unsigned short *)pdev->dev.platform_data, DRIVER_NAME);
-        if (ret) {
-                dev_err(&pdev->dev,
-                                "fail to request bfin serial peripherals\n");
-                        return ret;
-        }
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-                ret = -ENOENT;
-                goto out_error_free_peripherals;
-        }
-
-        bfin_earlyprintk_port.port.membase = ioremap(res->start,
-                                                     resource_size(res));
-        if (!bfin_earlyprintk_port.port.membase) {
-                dev_err(&pdev->dev, "Cannot map uart IO\n");
-                ret = -ENXIO;
-                goto out_error_free_peripherals;
-        }
-        bfin_earlyprintk_port.port.mapbase = res->start;
-        bfin_earlyprintk_port.port.line = pdev->id;
-        bfin_earlyprintk_port.port.uartclk = get_sclk();
-        bfin_earlyprintk_port.port.fifosize  = BFIN_UART_TX_FIFO_SIZE;
-        spin_lock_init(&bfin_earlyprintk_port.port.lock);
-
-        return 0;
-
-out_error_free_peripherals:
-        peripheral_free_list(
-                (unsigned short *)pdev->dev.platform_data);
-
-        return ret;
-}
-
-static struct platform_driver bfin_earlyprintk_driver = {
-        .probe          = bfin_earlyprintk_probe,
-        .driver         = {
-                .name   = DRIVER_NAME,
-                .owner  = THIS_MODULE,
-        },
-};
-
-static __initdata struct early_platform_driver early_bfin_earlyprintk_driver = {
-        .class_str = CLASS_BFIN_EARLYPRINTK,
-        .pdrv = &bfin_earlyprintk_driver,
-        .requested_id = EARLY_PLATFORM_ID_UNSET,
-};
-
-struct console __init *bfin_earlyserial_init(unsigned int port,
-                                                unsigned int cflag)
-{
-        struct ktermios t;
-        char port_name[20];
-
-        if (port < 0 || port >= BFIN_UART_NR_PORTS)
-                return NULL;
-
-        /*
-         * Only probe resource of the given port in earlyprintk boot arg.
-         * The expected port id should be indicated in port name string.
-         */
-        snprintf(port_name, 20, DRIVER_NAME ".%d", port);
-        early_platform_driver_register(&early_bfin_earlyprintk_driver,
-                port_name);
-        early_platform_driver_probe(CLASS_BFIN_EARLYPRINTK, 1, 0);
-
-        if (!bfin_earlyprintk_port.port.membase)
-                return NULL;
-
-#ifdef CONFIG_SERIAL_BFIN_CONSOLE
-        /*
-         * If we are using early serial, don't let the normal console rewind
-         * log buffer, since that causes things to be printed multiple times
-         */
-        bfin_serial_console.flags &= ~CON_PRINTBUFFER;
-#endif
-
-        bfin_early_serial_console.index = port;
-        t.c_cflag = cflag;
-        t.c_iflag = 0;
-        t.c_oflag = 0;
-        t.c_lflag = ICANON;
-        t.c_line = port;
-        bfin_serial_set_termios(&bfin_earlyprintk_port.port, &t, &t);
-
-        return &bfin_early_serial_console;
-}
-#endif /* CONFIG_EARLY_PRINTK */
-
-static int __init bfin_serial_init(void)
-{
-        int ret;
-
-        pr_info("Blackfin serial driver\n");
-
-        ret = uart_register_driver(&bfin_serial_reg);
-        if (ret) {
-                pr_err("failed to register %s:%d\n",
-                        bfin_serial_reg.driver_name, ret);
-        }
-
-        ret = platform_driver_register(&bfin_serial_driver);
-        if (ret) {
-                pr_err("fail to register bfin uart\n");
-                uart_unregister_driver(&bfin_serial_reg);
-        }
-
-        return ret;
-}
-
-static void __exit bfin_serial_exit(void)
-{
-        platform_driver_unregister(&bfin_serial_driver);
-        uart_unregister_driver(&bfin_serial_reg);
-}
-
-
-module_init(bfin_serial_init);
-module_exit(bfin_serial_exit);
-
-MODULE_AUTHOR("Sonic Zhang, Aubrey Li");
-MODULE_DESCRIPTION("Blackfin generic serial port driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV_MAJOR(BFIN_SERIAL_MAJOR);
-MODULE_ALIAS("platform:bfin-uart");
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 3fd2526d121..e6c3dbd781d 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -10,6 +10,15 @@
  * 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
  */
 
 #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -17,169 +26,171 @@
 #endif
 
 #include <linux/module.h>
-#include <linux/device.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 <linux/io.h>
-#include <linux/clk.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
 
 #include <mach/hardware.h>
+#include <asm/irq.h>
+#include <asm/hardware/clps7111.h>
 
-#define UART_CLPS711X_NAME      "uart-clps711x"
-#define UART_CLPS711X_NR        2
-#define UART_CLPS711X_MAJOR     204
-#define UART_CLPS711X_MINOR     40
-
-#define UBRLCR(port)            ((port)->line ? UBRLCR2 : UBRLCR1)
-#define UARTDR(port)            ((port)->line ? UARTDR2 : UARTDR1)
-#define SYSFLG(port)            ((port)->line ? SYSFLG2 : SYSFLG1)
-#define SYSCON(port)            ((port)->line ? SYSCON2 : SYSCON1)
-#define TX_IRQ(port)            ((port)->line ? IRQ_UTXINT2 : IRQ_UTXINT1)
-#define RX_IRQ(port)            ((port)->line ? IRQ_URXINT2 : IRQ_URXINT1)
-
-struct clps711x_port {
-        struct uart_driver      uart;
-        struct clk              *uart_clk;
-        struct uart_port        port[UART_CLPS711X_NR];
-        int                     tx_enabled[UART_CLPS711X_NR];
-#ifdef CONFIG_SERIAL_CLPS711X_CONSOLE
-        struct console          console;
-#endif
-};
+#define UART_NR         2
 
-static void uart_clps711x_stop_tx(struct uart_port *port)
-{
-        struct clps711x_port *s = dev_get_drvdata(port->dev);
+#define SERIAL_CLPS711X_MAJOR   204
+#define SERIAL_CLPS711X_MINOR   40
+#define SERIAL_CLPS711X_NR      UART_NR
 
-        if (s->tx_enabled[port->line]) {
+/*
+ * 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)
+{
+        if (tx_enabled(port)) {
                 disable_irq(TX_IRQ(port));
-                s->tx_enabled[port->line] = 0;
+                tx_enabled(port) = 0;
         }
 }
 
-static void uart_clps711x_start_tx(struct uart_port *port)
+static void clps711xuart_start_tx(struct uart_port *port)
 {
-        struct clps711x_port *s = dev_get_drvdata(port->dev);
-
-        if (!s->tx_enabled[port->line]) {
+        if (!tx_enabled(port)) {
                 enable_irq(TX_IRQ(port));
-                s->tx_enabled[port->line] = 1;
+                tx_enabled(port) = 1;
         }
 }
 
-static void uart_clps711x_stop_rx(struct uart_port *port)
+static void clps711xuart_stop_rx(struct uart_port *port)
 {
         disable_irq(RX_IRQ(port));
 }
 
-static void uart_clps711x_enable_ms(struct uart_port *port)
+static void clps711xuart_enable_ms(struct uart_port *port)
 {
-        /* Do nothing */
 }
 
-static irqreturn_t uart_clps711x_int_rx(int irq, void *dev_id)
+static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+        struct tty_struct *tty = port->state->port.tty;
         unsigned int status, ch, flg;
 
-        if (!tty)
-                return IRQ_HANDLED;
-
-        for (;;) {
-                status = clps_readl(SYSFLG(port));
-                if (status & SYSFLG_URXFE)
-                        break;
-
-                ch = clps_readw(UARTDR(port));
-                status = ch & (UARTDR_FRMERR | UARTDR_PARERR | UARTDR_OVERR);
-                ch &= 0xff;
+        status = clps_readl(SYSFLG(port));
+        while (!(status & SYSFLG_URXFE)) {
+                ch = clps_readl(UARTDR(port));
 
                 port->icount.rx++;
+
                 flg = TTY_NORMAL;
 
-                if (unlikely(status)) {
-                        if (status & UARTDR_PARERR)
+                /*
+                 * Note that the error handling code is
+                 * out of the main execution path
+                 */
+                if (unlikely(ch & UART_ANY_ERR)) {
+                        if (ch & UARTDR_PARERR)
                                 port->icount.parity++;
-                        else if (status & UARTDR_FRMERR)
+                        else if (ch & UARTDR_FRMERR)
                                 port->icount.frame++;
-                        else if (status & UARTDR_OVERR)
+                        if (ch & UARTDR_OVERR)
                                 port->icount.overrun++;
 
-                        status &= port->read_status_mask;
+                        ch &= port->read_status_mask;
 
-                        if (status & UARTDR_PARERR)
+                        if (ch & UARTDR_PARERR)
                                 flg = TTY_PARITY;
-                        else if (status & UARTDR_FRMERR)
+                        else if (ch & UARTDR_FRMERR)
                                 flg = TTY_FRAME;
-                        else if (status & UARTDR_OVERR)
-                                flg = TTY_OVERRUN;
+
+#ifdef SUPPORT_SYSRQ
+                        port->sysrq = 0;
+#endif
                 }
 
                 if (uart_handle_sysrq_char(port, ch))
-                        continue;
+                        goto ignore_char;
 
-                if (status & port->ignore_status_mask)
-                        continue;
+                /*
+                 * CHECK: does overrun affect the current character?
+                 * ASSUMPTION: it does not.
+                 */
+                uart_insert_char(port, ch, UARTDR_OVERR, ch, flg);
 
-                uart_insert_char(port, status, UARTDR_OVERR, ch, flg);
+        ignore_char:
+                status = clps_readl(SYSFLG(port));
         }
-
         tty_flip_buffer_push(tty);
-
-        tty_kref_put(tty);
-
         return IRQ_HANDLED;
 }
 
-static irqreturn_t uart_clps711x_int_tx(int irq, void *dev_id)
+static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct clps711x_port *s = dev_get_drvdata(port->dev);
         struct circ_buf *xmit = &port->state->xmit;
+        int count;
 
         if (port->x_char) {
-                clps_writew(port->x_char, UARTDR(port));
+                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)) {
-                disable_irq_nosync(TX_IRQ(port));
-                s->tx_enabled[port->line] = 0;
+                clps711xuart_stop_tx(port);
                 return IRQ_HANDLED;
         }
 
-        while (!uart_circ_empty(xmit)) {
-                clps_writew(xmit->buf[xmit->tail], UARTDR(port));
+        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 (clps_readl(SYSFLG(port) & SYSFLG_UTXFF))
+                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);
+
         return IRQ_HANDLED;
 }
 
-static unsigned int uart_clps711x_tx_empty(struct uart_port *port)
+static unsigned int clps711xuart_tx_empty(struct uart_port *port)
 {
-        return (clps_readl(SYSFLG(port) & SYSFLG_UBUSY)) ? 0 : TIOCSER_TEMT;
+        unsigned int status = clps_readl(SYSFLG(port));
+        return status & SYSFLG_UBUSY ? 0 : TIOCSER_TEMT;
 }
 
-static unsigned int uart_clps711x_get_mctrl(struct uart_port *port)
+static unsigned int clps711xuart_get_mctrl(struct uart_port *port)
 {
-        unsigned int status, result = 0;
+        unsigned int port_addr;
+        unsigned int result = 0;
+        unsigned int status;
 
-        if (port->line == 0) {
+        port_addr = SYSFLG(port);
+        if (port_addr == SYSFLG1) {
                 status = clps_readl(SYSFLG1);
                 if (status & SYSFLG1_DCD)
                         result |= TIOCM_CAR;
@@ -187,86 +198,104 @@ static unsigned int uart_clps711x_get_mctrl(struct uart_port *port)
                         result |= TIOCM_DSR;
                 if (status & SYSFLG1_CTS)
                         result |= TIOCM_CTS;
-        } else
-                result = TIOCM_DSR | TIOCM_CTS | TIOCM_CAR;
+        }
 
         return result;
 }
 
-static void uart_clps711x_set_mctrl(struct uart_port *port, unsigned int mctrl)
+static void
+clps711xuart_set_mctrl_null(struct uart_port *port, unsigned int mctrl)
 {
-        /* Do nothing */
 }
 
-static void uart_clps711x_break_ctl(struct uart_port *port, int break_state)
+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)
+        if (break_state == -1)
                 ubrlcr |= UBRLCR_BREAK;
         else
                 ubrlcr &= ~UBRLCR_BREAK;
         clps_writel(ubrlcr, UBRLCR(port));
-
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static int uart_clps711x_startup(struct uart_port *port)
+static int clps711xuart_startup(struct uart_port *port)
 {
-        struct clps711x_port *s = dev_get_drvdata(port->dev);
-        int ret;
-
-        s->tx_enabled[port->line] = 1;
-        /* Allocate the IRQs */
-        ret = devm_request_irq(port->dev, TX_IRQ(port), uart_clps711x_int_tx,
-                               0, UART_CLPS711X_NAME " TX", port);
-        if (ret)
-                return ret;
-
-        ret = devm_request_irq(port->dev, RX_IRQ(port), uart_clps711x_int_rx,
-                               0, UART_CLPS711X_NAME " RX", port);
-        if (ret) {
-                devm_free_irq(port->dev, TX_IRQ(port), port);
-                return ret;
+        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;
         }
 
-        /* Disable break */
-        clps_writel(clps_readl(UBRLCR(port)) & ~UBRLCR_BREAK, UBRLCR(port));
-
-        /* Enable the port */
-        clps_writel(clps_readl(SYSCON(port)) | SYSCON_UARTEN, SYSCON(port));
+        /*
+         * enable the port
+         */
+        syscon = clps_readl(SYSCON(port));
+        syscon |= SYSCON_UARTEN;
+        clps_writel(syscon, SYSCON(port));
 
         return 0;
 }
 
-static void uart_clps711x_shutdown(struct uart_port *port)
+static void clps711xuart_shutdown(struct uart_port *port)
 {
-        /* Free the interrupts */
-        devm_free_irq(port->dev, TX_IRQ(port), port);
-        devm_free_irq(port->dev, RX_IRQ(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 the port */
-        clps_writel(clps_readl(SYSCON(port)) & ~SYSCON_UARTEN, SYSCON(port));
+        /*
+         * disable break condition and fifos
+         */
+        ubrlcr = clps_readl(UBRLCR(port));
+        ubrlcr &= ~(UBRLCR_FIFOEN | UBRLCR_BREAK);
+        clps_writel(ubrlcr, UBRLCR(port));
 }
 
-static void uart_clps711x_set_termios(struct uart_port *port,
-                                      struct ktermios *termios,
-                                      struct ktermios *old)
+static void
+clps711xuart_set_termios(struct uart_port *port, struct ktermios *termios,
+                         struct ktermios *old)
 {
         unsigned int ubrlcr, baud, quot;
         unsigned long flags;
 
-        /* Mask termios capabilities we don't support */
-        termios->c_cflag &= ~CMSPAR;
-        termios->c_iflag &= ~(BRKINT | IGNBRK);
+        /*
+         * 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, port->uartclk / 4096,
-                                                      port->uartclk / 16);
+        /*
+         * 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) {
@@ -279,117 +308,160 @@ static void uart_clps711x_set_termios(struct uart_port *port,
         case CS7:
                 ubrlcr = UBRLCR_WRDLEN7;
                 break;
-        case CS8:
-        default:
+        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;
         }
-
-        /* Enable FIFO */
-        ubrlcr |= UBRLCR_FIFOEN;
+        if (port->fifosize > 1)
+                ubrlcr |= UBRLCR_FIFOEN;
 
         spin_lock_irqsave(&port->lock, flags);
 
-        /* Set read status mask */
+        /*
+         * 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;
 
-        /* Set status ignore mask */
+        /*
+         * Characters to ignore
+         */
         port->ignore_status_mask = 0;
-        if (!(termios->c_cflag & CREAD))
-                port->ignore_status_mask |= UARTDR_OVERR | UARTDR_PARERR |
-                                            UARTDR_FRMERR;
+        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;
+        }
 
-        uart_update_timeout(port, termios->c_cflag, baud);
+        quot -= 1;
 
-        clps_writel(ubrlcr | (quot - 1), UBRLCR(port));
+        clps_writel(ubrlcr | quot, UBRLCR(port));
 
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static const char *uart_clps711x_type(struct uart_port *port)
+static const char *clps711xuart_type(struct uart_port *port)
 {
-        return (port->type == PORT_CLPS711X) ? "CLPS711X" : NULL;
+        return port->type == PORT_CLPS711X ? "CLPS711x" : NULL;
 }
 
-static void uart_clps711x_config_port(struct uart_port *port, int flags)
+/*
+ * 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 uart_clps711x_release_port(struct uart_port *port)
+static void clps711xuart_release_port(struct uart_port *port)
 {
-        /* Do nothing */
 }
 
-static int uart_clps711x_request_port(struct uart_port *port)
+static int clps711xuart_request_port(struct uart_port *port)
 {
-        /* Do nothing */
         return 0;
 }
 
-static const struct uart_ops uart_clps711x_ops = {
-        .tx_empty       = uart_clps711x_tx_empty,
-        .set_mctrl      = uart_clps711x_set_mctrl,
-        .get_mctrl      = uart_clps711x_get_mctrl,
-        .stop_tx        = uart_clps711x_stop_tx,
-        .start_tx       = uart_clps711x_start_tx,
-        .stop_rx        = uart_clps711x_stop_rx,
-        .enable_ms      = uart_clps711x_enable_ms,
-        .break_ctl      = uart_clps711x_break_ctl,
-        .startup        = uart_clps711x_startup,
-        .shutdown       = uart_clps711x_shutdown,
-        .set_termios    = uart_clps711x_set_termios,
-        .type           = uart_clps711x_type,
-        .config_port    = uart_clps711x_config_port,
-        .release_port   = uart_clps711x_release_port,
-        .request_port   = uart_clps711x_request_port,
+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          = UPF_BOOT_AUTOCONF,
+        },
+        {
+                .iobase         = SYSCON2,
+                .irq            = IRQ_UTXINT2, /* IRQ_URXINT2 */
+                .uartclk        = 3686400,
+                .fifosize       = 16,
+                .ops            = &clps711x_pops,
+                .line           = 1,
+                .flags          = UPF_BOOT_AUTOCONF,
+        }
 };
 
 #ifdef CONFIG_SERIAL_CLPS711X_CONSOLE
-static void uart_clps711x_console_putchar(struct uart_port *port, int ch)
+static void clps711xuart_console_putchar(struct uart_port *port, int ch)
 {
         while (clps_readl(SYSFLG(port)) & SYSFLG_UTXFF)
                 barrier();
-
-        clps_writew(ch, UARTDR(port));
+        clps_writel(ch, UARTDR(port));
 }
 
-static void uart_clps711x_console_write(struct console *co, const char *c,
-                                        unsigned n)
+/*
+ *      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 clps711x_port *s = (struct clps711x_port *)co->data;
-        struct uart_port *port = &s->port[co->index];
-        u32 syscon;
+        struct uart_port *port = clps711x_ports + co->index;
+        unsigned int status, syscon;
 
-        /* Ensure that the port is enabled */
+        /*
+         *      Ensure that the port is enabled.
+         */
         syscon = clps_readl(SYSCON(port));
         clps_writel(syscon | SYSCON_UARTEN, SYSCON(port));
 
-        uart_console_write(port, c, n, uart_clps711x_console_putchar);
+        uart_console_write(port, s, count, clps711xuart_console_putchar);
 
-        /* Wait for transmitter to become empty */
-        while (clps_readl(SYSFLG(port)) & SYSFLG_UBUSY)
-                barrier();
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the uart state.
+         */
+        do {
+                status = clps_readl(SYSFLG(port));
+        } while (status & SYSFLG_UBUSY);
 
-        /* Restore the uart state */
         clps_writel(syscon, SYSCON(port));
 }
 
-static void uart_clps711x_console_get_options(struct uart_port *port,
-                                              int *baud, int *parity,
-                                              int *bits)
+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;
@@ -414,124 +486,92 @@ static void uart_clps711x_console_get_options(struct uart_port *port,
         }
 }
 
-static int uart_clps711x_console_setup(struct console *co, char *options)
+static int __init clps711xuart_console_setup(struct console *co, char *options)
 {
-        int baud = 38400, bits = 8, parity = 'n', flow = 'n';
-        struct clps711x_port *s = (struct clps711x_port *)co->data;
-        struct uart_port *port = &s->port[(co->index > 0) ? co->index : 0];
+        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
-                uart_clps711x_console_get_options(port, &baud, &parity, &bits);
+                clps711xuart_console_get_options(port, &baud, &parity, &bits);
 
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
-#endif
-
-static int uart_clps711x_probe(struct platform_device *pdev)
-{
-        struct clps711x_port *s;
-        int ret, i;
 
-        s = devm_kzalloc(&pdev->dev, sizeof(struct clps711x_port), GFP_KERNEL);
-        if (!s) {
-                dev_err(&pdev->dev, "Error allocating port structure\n");
-                return -ENOMEM;
-        }
-        platform_set_drvdata(pdev, s);
+static 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,
+};
 
-        s->uart_clk = devm_clk_get(&pdev->dev, "uart");
-        if (IS_ERR(s->uart_clk)) {
-                dev_err(&pdev->dev, "Can't get UART clocks\n");
-                ret = PTR_ERR(s->uart_clk);
-                goto err_out;
-        }
+static int __init clps711xuart_console_init(void)
+{
+        register_console(&clps711x_console);
+        return 0;
+}
+console_initcall(clps711xuart_console_init);
 
-        s->uart.owner           = THIS_MODULE;
-        s->uart.dev_name        = "ttyCL";
-        s->uart.major           = UART_CLPS711X_MAJOR;
-        s->uart.minor           = UART_CLPS711X_MINOR;
-        s->uart.nr              = UART_CLPS711X_NR;
-#ifdef CONFIG_SERIAL_CLPS711X_CONSOLE
-        s->uart.cons            = &s->console;
-        s->uart.cons->device    = uart_console_device;
-        s->uart.cons->write     = uart_clps711x_console_write;
-        s->uart.cons->setup     = uart_clps711x_console_setup;
-        s->uart.cons->flags     = CON_PRINTBUFFER;
-        s->uart.cons->index     = -1;
-        s->uart.cons->data      = s;
-        strcpy(s->uart.cons->name, "ttyCL");
+#define CLPS711X_CONSOLE        &clps711x_console
+#else
+#define CLPS711X_CONSOLE        NULL
 #endif
-        ret = uart_register_driver(&s->uart);
-        if (ret) {
-                dev_err(&pdev->dev, "Registering UART driver failed\n");
-                devm_clk_put(&pdev->dev, s->uart_clk);
-                goto err_out;
-        }
 
-        for (i = 0; i < UART_CLPS711X_NR; i++) {
-                s->port[i].line         = i;
-                s->port[i].dev          = &pdev->dev;
-                s->port[i].irq          = TX_IRQ(&s->port[i]);
-                s->port[i].iobase       = SYSCON(&s->port[i]);
-                s->port[i].type         = PORT_CLPS711X;
-                s->port[i].fifosize     = 16;
-                s->port[i].flags        = UPF_SKIP_TEST | UPF_FIXED_TYPE;
-                s->port[i].uartclk      = clk_get_rate(s->uart_clk);
-                s->port[i].ops          = &uart_clps711x_ops;
-                WARN_ON(uart_add_one_port(&s->uart, &s->port[i]));
-        }
-
-        return 0;
+static struct uart_driver clps711x_reg = {
+        .driver_name            = "ttyCL",
+        .dev_name               = "ttyCL",
+        .major                  = SERIAL_CLPS711X_MAJOR,
+        .minor                  = SERIAL_CLPS711X_MINOR,
+        .nr                     = UART_NR,
 
-err_out:
-        platform_set_drvdata(pdev, NULL);
-
-        return ret;
-}
+        .cons                   = CLPS711X_CONSOLE,
+};
 
-static int uart_clps711x_remove(struct platform_device *pdev)
+static int __init clps711xuart_init(void)
 {
-        struct clps711x_port *s = platform_get_drvdata(pdev);
-        int i;
+        int ret, i;
 
-        for (i = 0; i < UART_CLPS711X_NR; i++)
-                uart_remove_one_port(&s->uart, &s->port[i]);
+        printk(KERN_INFO "Serial: CLPS711x driver\n");
 
-        devm_clk_put(&pdev->dev, s->uart_clk);
-        uart_unregister_driver(&s->uart);
-        platform_set_drvdata(pdev, NULL);
+        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 struct platform_driver clps711x_uart_driver = {
-        .driver = {
-                .name   = UART_CLPS711X_NAME,
-                .owner  = THIS_MODULE,
-        },
-        .probe  = uart_clps711x_probe,
-        .remove = uart_clps711x_remove,
-};
-module_platform_driver(clps711x_uart_driver);
+static void __exit clps711xuart_exit(void)
+{
+        int i;
 
-static struct platform_device clps711x_uart_device = {
-        .name   = UART_CLPS711X_NAME,
-};
+        for (i = 0; i < UART_NR; i++)
+                uart_remove_one_port(&clps711x_reg, &clps711x_ports[i]);
 
-static int __init uart_clps711x_init(void)
-{
-        return platform_device_register(&clps711x_uart_device);
+        uart_unregister_driver(&clps711x_reg);
 }
-module_init(uart_clps711x_init);
 
-static void __exit uart_clps711x_exit(void)
-{
-        platform_device_unregister(&clps711x_uart_device);
-}
-module_exit(uart_clps711x_exit);
+module_init(clps711xuart_init);
+module_exit(clps711xuart_exit);
 
 MODULE_AUTHOR("Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("CLPS711X serial driver");
+MODULE_DESCRIPTION("CLPS-711x generic serial driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV(SERIAL_CLPS711X_MAJOR, SERIAL_CLPS711X_MINOR);
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index ad0caf17680..9488da74d4f 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -31,7 +31,6 @@
 
 #include <linux/module.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/serial.h>
@@ -71,7 +70,7 @@ static void cpm_uart_initbd(struct uart_cpm_port *pinfo);
 
 /**************************************************************/
 
-#define HW_BUF_SPD_THRESHOLD    2400
+#define HW_BUF_SPD_THRESHOLD    9600
 
 /*
  * Check, if transmit buffers are processed
@@ -417,7 +416,6 @@ static int cpm_uart_startup(struct uart_port *port)
                         clrbits32(&pinfo->sccp->scc_gsmrl, SCC_GSMRL_ENR);
                         clrbits16(&pinfo->sccp->scc_sccm, UART_SCCM_RX);
                 }
-                cpm_uart_initbd(pinfo);
                 cpm_line_cr_cmd(pinfo, CPM_CR_INIT_TRX);
         }
         /* Install interrupt handler. */
@@ -501,28 +499,16 @@ static void cpm_uart_set_termios(struct uart_port *port,
         struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
         smc_t __iomem *smcp = pinfo->smcp;
         scc_t __iomem *sccp = pinfo->sccp;
-        int maxidl;
 
         pr_debug("CPM uart[%d]:set_termios\n", port->line);
 
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
-        if (baud < HW_BUF_SPD_THRESHOLD ||
+        if (baud <= HW_BUF_SPD_THRESHOLD ||
             (pinfo->port.state && pinfo->port.state->port.tty->low_latency))
                 pinfo->rx_fifosize = 1;
         else
                 pinfo->rx_fifosize = RX_BUF_SIZE;
 
-        /* MAXIDL is the timeout after which a receive buffer is closed
-         * when not full if no more characters are received.
-         * We calculate it from the baudrate so that the duration is
-         * always the same at standard rates: about 4ms.
-         */
-        maxidl = baud / 2400;
-        if (maxidl < 1)
-                maxidl = 1;
-        if (maxidl > 0x10)
-                maxidl = 0x10;
-
         /* 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.
@@ -623,7 +609,6 @@ static void cpm_uart_set_termios(struct uart_port *port,
                  * SMC/SCC receiver is disabled.
                  */
                 out_be16(&pinfo->smcup->smc_mrblr, pinfo->rx_fifosize);
-                out_be16(&pinfo->smcup->smc_maxidl, maxidl);
 
                 /* Set the mode register.  We want to keep a copy of the
                  * enables, because we want to put them back if they were
@@ -636,7 +621,6 @@ static void cpm_uart_set_termios(struct uart_port *port,
                     SMCMR_SM_UART | prev_mode);
         } else {
                 out_be16(&pinfo->sccup->scc_genscc.scc_mrblr, pinfo->rx_fifosize);
-                out_be16(&pinfo->sccup->scc_maxidl, maxidl);
                 out_be16(&sccp->scc_psmr, (sbits << 12) | scval);
         }
 
@@ -813,7 +797,7 @@ static void cpm_uart_init_scc(struct uart_cpm_port *pinfo)
         cpm_set_scc_fcr(sup);
 
         out_be16(&sup->scc_genscc.scc_mrblr, pinfo->rx_fifosize);
-        out_be16(&sup->scc_maxidl, 0x10);
+        out_be16(&sup->scc_maxidl, pinfo->rx_fifosize);
         out_be16(&sup->scc_brkcr, 1);
         out_be16(&sup->scc_parec, 0);
         out_be16(&sup->scc_frmec, 0);
@@ -887,7 +871,7 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
 
         /* Using idle character time requires some additional tuning.  */
         out_be16(&up->smc_mrblr, pinfo->rx_fifosize);
-        out_be16(&up->smc_maxidl, 0x10);
+        out_be16(&up->smc_maxidl, pinfo->rx_fifosize);
         out_be16(&up->smc_brklen, 0);
         out_be16(&up->smc_brkec, 0);
         out_be16(&up->smc_brkcr, 1);
@@ -1373,7 +1357,7 @@ static struct uart_driver cpm_reg = {
 
 static int probe_index;
 
-static int cpm_uart_probe(struct platform_device *ofdev)
+static int __devinit cpm_uart_probe(struct platform_device *ofdev)
 {
         int index = probe_index++;
         struct uart_cpm_port *pinfo = &cpm_uart_ports[index];
@@ -1396,7 +1380,7 @@ static int cpm_uart_probe(struct platform_device *ofdev)
         return uart_add_one_port(&cpm_reg, &pinfo->port);
 }
 
-static int cpm_uart_remove(struct platform_device *ofdev)
+static int __devexit cpm_uart_remove(struct platform_device *ofdev)
 {
         struct uart_cpm_port *pinfo = dev_get_drvdata(&ofdev->dev);
         return uart_remove_one_port(&cpm_reg, &pinfo->port);
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 35ee6a2c687..58be715913c 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -34,9 +34,9 @@ static char *serial_version = "$Revision: 1.25 $";
 
 #include <asm/irq.h>
 #include <asm/dma.h>
+#include <asm/system.h>
 
 #include <arch/svinto.h>
-#include <arch/system.h>
 
 /* non-arch dependent serial structures are in linux/serial.h */
 #include <linux/serial.h>
@@ -258,7 +258,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER0_TX_DMA_NBR,
           .dma_out_irq_nbr = SER0_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = 0,
+          .dma_out_irq_flags = IRQF_DISABLED,
           .dma_out_irq_description = "serial 0 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -271,7 +271,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER0_RX_DMA_NBR,
           .dma_in_irq_nbr = SER0_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = 0,
+          .dma_in_irq_flags = IRQF_DISABLED,
           .dma_in_irq_description = "serial 0 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -313,7 +313,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER1_TX_DMA_NBR,
           .dma_out_irq_nbr = SER1_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = 0,
+          .dma_out_irq_flags = IRQF_DISABLED,
           .dma_out_irq_description = "serial 1 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -326,7 +326,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER1_RX_DMA_NBR,
           .dma_in_irq_nbr = SER1_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = 0,
+          .dma_in_irq_flags = IRQF_DISABLED,
           .dma_in_irq_description = "serial 1 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -369,7 +369,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER2_TX_DMA_NBR,
           .dma_out_irq_nbr = SER2_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = 0,
+          .dma_out_irq_flags = IRQF_DISABLED,
           .dma_out_irq_description = "serial 2 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -382,7 +382,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER2_RX_DMA_NBR,
           .dma_in_irq_nbr = SER2_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = 0,
+          .dma_in_irq_flags = IRQF_DISABLED,
           .dma_in_irq_description = "serial 2 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -423,7 +423,7 @@ static struct e100_serial rs_table[] = {
           .dma_out_enabled = 1,
           .dma_out_nbr = SER3_TX_DMA_NBR,
           .dma_out_irq_nbr = SER3_DMA_TX_IRQ_NBR,
-          .dma_out_irq_flags = 0,
+          .dma_out_irq_flags = IRQF_DISABLED,
           .dma_out_irq_description = "serial 3 dma tr",
 #else
           .dma_out_enabled = 0,
@@ -436,7 +436,7 @@ static struct e100_serial rs_table[] = {
           .dma_in_enabled = 1,
           .dma_in_nbr = SER3_RX_DMA_NBR,
           .dma_in_irq_nbr = SER3_DMA_RX_IRQ_NBR,
-          .dma_in_irq_flags = 0,
+          .dma_in_irq_flags = IRQF_DISABLED,
           .dma_in_irq_description = "serial 3 dma rec",
 #else
           .dma_in_enabled = 0,
@@ -952,10 +952,23 @@ static const struct control_pins e100_modem_pins[NR_PORTS] =
 /* 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;
+static DEFINE_MUTEX(tmp_buf_mutex);
+
 /* Calculate the chartime depending on baudrate, numbor of bits etc. */
 static void update_char_time(struct e100_serial * info)
 {
-        tcflag_t cflags = info->port.tty->termios.c_cflag;
+        tcflag_t cflags = info->port.tty->termios->c_cflag;
         int bits;
 
         /* calc. number of bits / data byte */
@@ -1473,7 +1486,7 @@ rs_stop(struct tty_struct *tty)
                 xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char,
                                 STOP_CHAR(info->port.tty));
                 xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, stop);
-                if (tty->termios.c_iflag & IXON ) {
+                if (tty->termios->c_iflag & IXON ) {
                         xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
                 }
 
@@ -1496,7 +1509,7 @@ rs_start(struct tty_struct *tty)
                                          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 ) {
+                if (tty->termios->c_iflag & IXON ) {
                         xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
                 }
 
@@ -1775,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,
         struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
 
         if (info->recv_cnt + recvl > 65536) {
-                printk(KERN_WARNING
+                printk(KERN_CRIT
                        "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl);
                 return 0;
         }
@@ -2929,7 +2942,7 @@ shutdown(struct e100_serial * info)
                         descr[i].buf = 0;
                 }
 
-        if (!info->port.tty || (info->port.tty->termios.c_cflag & HUPCL)) {
+        if (!info->port.tty || (info->port.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 */
@@ -2953,12 +2966,12 @@ change_speed(struct e100_serial *info)
         unsigned long flags;
         /* first some safety checks */
 
-        if (!info->port.tty)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
         if (!info->ioport)
                 return;
 
-        cflag = info->port.tty->termios.c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* possibly, the tx/rx should be disabled first to do this safely */
 
@@ -3088,7 +3101,7 @@ change_speed(struct e100_serial *info)
         info->ioport[REG_REC_CTRL] = info->rx_ctrl;
         xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->port.tty));
         xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable);
-        if (info->port.tty->termios.c_iflag & IXON ) {
+        if (info->port.tty->termios->c_iflag & IXON ) {
                 DFLOW(DEBUG_LOG(info->line, "FLOW XOFF enabled 0x%02X\n",
                                 STOP_CHAR(info->port.tty)));
                 xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
@@ -3137,7 +3150,7 @@ static int rs_raw_write(struct tty_struct *tty,
 
         /* first some sanity checks */
 
-        if (!tty || !info->xmit.buf)
+        if (!tty || !info->xmit.buf || !tmp_buf)
                 return 0;
 
 #ifdef SERIAL_DEBUG_DATA
@@ -3221,8 +3234,9 @@ rs_write(struct tty_struct *tty,
                 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);
+                if ((info->rs485.flags & SER_RS485_RTS_BEFORE_SEND) &&
+                        (info->rs485.delay_rts_before_send > 0))
+                                msleep(info->rs485.delay_rts_before_send);
         }
 #endif /* CONFIG_ETRAX_RS485 */
 
@@ -3355,7 +3369,7 @@ rs_throttle(struct tty_struct * tty)
         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) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 /* Turn off RTS line */
                 e100_rts(info, 0);
         }
@@ -3377,7 +3391,7 @@ rs_unthrottle(struct tty_struct * tty)
         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) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 /* Assert RTS line  */
                 e100_rts(info, 1);
         }
@@ -3679,6 +3693,10 @@ rs_ioctl(struct tty_struct *tty,
 
                 rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
                 rs485data.flags = 0;
+                if (rs485data.delay_rts_before_send != 0)
+                        rs485data.flags |= SER_RS485_RTS_BEFORE_SEND;
+                else
+                        rs485data.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
 
                 if (rs485ctrl.enabled)
                         rs485data.flags |= SER_RS485_ENABLED;
@@ -3748,7 +3766,7 @@ rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle turning off CRTSCTS */
         if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
+            !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 rs_start(tty);
         }
@@ -3795,13 +3813,13 @@ rs_close(struct tty_struct *tty, struct file * filp)
                  * one, we've got real problems, since it means the
                  * serial port won't be shutdown.
                  */
-                printk(KERN_ERR
+                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_ERR "rs_close: bad serial port count for ttyS%d: %d\n",
+                printk(KERN_CRIT "rs_close: bad serial port count for ttyS%d: %d\n",
                        info->line, info->count);
                 info->count = 0;
         }
@@ -3815,7 +3833,7 @@ rs_close(struct tty_struct *tty, struct file * filp)
          * separate termios for callout and dialin.
          */
         if (info->flags & ASYNC_NORMAL_ACTIVE)
-                info->normal_termios = tty->termios;
+                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.
@@ -3976,7 +3994,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
          */
         if (tty_hung_up_p(filp) ||
             (info->flags & ASYNC_CLOSING)) {
-                wait_event_interruptible_tty(tty, info->close_wait,
+                wait_event_interruptible_tty(info->close_wait,
                         !(info->flags & ASYNC_CLOSING));
 #ifdef SERIAL_DO_RESTART
                 if (info->flags & ASYNC_HUP_NOTIFY)
@@ -3998,7 +4016,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
                 return 0;
         }
 
-        if (tty->termios.c_cflag & CLOCAL) {
+        if (tty->termios->c_cflag & CLOCAL) {
                         do_clocal = 1;
         }
 
@@ -4052,9 +4070,9 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
                 printk("block_til_ready blocking: ttyS%d, count = %d\n",
                        info->line, info->count);
 #endif
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
         set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
@@ -4092,10 +4110,20 @@ static int
 rs_open(struct tty_struct *tty, struct file * filp)
 {
         struct e100_serial      *info;
-        int                     retval;
+        int                     retval, line;
+        unsigned long           page;
         int                     allocated_resources = 0;
 
-        info = rs_table + tty->index;
+        /* 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;
 
@@ -4108,14 +4136,25 @@ rs_open(struct tty_struct *tty, struct file * filp)
         tty->driver_data = info;
         info->port.tty = tty;
 
-        tty->low_latency = !!(info->flags & ASYNC_LOW_LATENCY);
+        info->port.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)) {
-                wait_event_interruptible_tty(tty, info->close_wait,
+                wait_event_interruptible_tty(info->close_wait,
                         !(info->flags & ASYNC_CLOSING));
 #ifdef SERIAL_DO_RESTART
                 return ((info->flags & ASYNC_HUP_NOTIFY) ?
@@ -4219,7 +4258,7 @@ rs_open(struct tty_struct *tty, struct file * filp)
         }
 
         if ((info->count == 1) && (info->flags & ASYNC_SPLIT_TERMIOS)) {
-                tty->termios = info->normal_termios;
+                *tty->termios = info->normal_termios;
                 change_speed(info);
         }
 
@@ -4413,7 +4452,7 @@ static int __init rs_init(void)
 #if defined(CONFIG_ETRAX_RS485_ON_PA)
         if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit,
                         rs485_pa_bit)) {
-                printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
+                printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
                 put_tty_driver(driver);
                 return -EBUSY;
@@ -4422,7 +4461,7 @@ static int __init rs_init(void)
 #if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
         if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit,
                         rs485_port_g_bit)) {
-                printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
+                printk(KERN_CRIT "ETRAX100LX serial: Could not allocate "
                         "RS485 pin\n");
                 put_tty_driver(driver);
                 return -EBUSY;
@@ -4443,24 +4482,25 @@ static int __init rs_init(void)
                 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
         driver->init_termios.c_ispeed = 115200;
         driver->init_termios.c_ospeed = 115200;
-        driver->flags = TTY_DRIVER_REAL_RAW;
+        driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
 
         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++) {
                 if (info->enabled) {
                         if (cris_request_io_interface(info->io_if,
                                         info->io_if_description)) {
-                                printk(KERN_ERR "ETRAX100LX async serial: "
+                                printk(KERN_CRIT "ETRAX100LX async serial: "
                                         "Could not allocate IO pins for "
                                         "%s, port %d\n",
                                         info->io_if_description, i);
                                 info->enabled = 0;
                         }
                 }
-                tty_port_init(&info->port);
                 info->uses_dma_in = 0;
                 info->uses_dma_out = 0;
                 info->line = i;
@@ -4491,6 +4531,7 @@ static int __init rs_init(void)
                 /* Set sane defaults */
                 info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
                 info->rs485.flags |= SER_RS485_RTS_AFTER_SEND;
+                info->rs485.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
                 info->rs485.delay_rts_before_send = 0;
                 info->rs485.flags &= ~(SER_RS485_ENABLED);
 #endif
@@ -4500,12 +4541,7 @@ static int __init rs_init(void)
                         printk(KERN_INFO "%s%d at %p is a builtin UART with DMA\n",
                                serial_driver->name, info->line, info->ioport);
                 }
-                tty_port_link_device(&info->port, driver, i);
         }
-
-        if (tty_register_driver(driver))
-                panic("Couldn't register serial driver\n");
-
 #ifdef CONFIG_ETRAX_FAST_TIMER
 #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
         memset(fast_timers, 0, sizeof(fast_timers));
@@ -4522,7 +4558,7 @@ static int __init rs_init(void)
         /* 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,
-                        IRQF_SHARED, "serial ", driver))
+                        IRQF_SHARED | IRQF_DISABLED, "serial ", driver))
                 panic("%s: Failed to request irq8", __func__);
 
 #endif
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 6491b8644a7..ddc487a2d42 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -47,11 +47,11 @@
 #include <linux/serial_core.h>
 #include <linux/sysrq.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 
 #include <linux/atomic.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
+#include <asm/system.h>
 
 #include <asm/dec/interrupts.h>
 #include <asm/dec/kn01.h>
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
deleted file mode 100644
index a8cbb267052..00000000000
--- a/drivers/tty/serial/efm32-uart.c
+++ /dev/null
@@ -1,830 +0,0 @@
-#if defined(CONFIG_SERIAL_EFM32_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/console.h>
-#include <linux/sysrq.h>
-#include <linux/serial_core.h>
-#include <linux/tty_flip.h>
-#include <linux/slab.h>
-#include <linux/clk.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-
-#include <linux/platform_data/efm32-uart.h>
-
-#define DRIVER_NAME "efm32-uart"
-#define DEV_NAME "ttyefm"
-
-#define UARTn_CTRL              0x00
-#define UARTn_CTRL_SYNC         0x0001
-#define UARTn_CTRL_TXBIL                0x1000
-
-#define UARTn_FRAME             0x04
-#define UARTn_FRAME_DATABITS__MASK      0x000f
-#define UARTn_FRAME_DATABITS(n)         ((n) - 3)
-#define UARTn_FRAME_PARITY_NONE         0x0000
-#define UARTn_FRAME_PARITY_EVEN         0x0200
-#define UARTn_FRAME_PARITY_ODD          0x0300
-#define UARTn_FRAME_STOPBITS_HALF       0x0000
-#define UARTn_FRAME_STOPBITS_ONE        0x1000
-#define UARTn_FRAME_STOPBITS_TWO        0x3000
-
-#define UARTn_CMD               0x0c
-#define UARTn_CMD_RXEN                  0x0001
-#define UARTn_CMD_RXDIS         0x0002
-#define UARTn_CMD_TXEN                  0x0004
-#define UARTn_CMD_TXDIS         0x0008
-
-#define UARTn_STATUS            0x10
-#define UARTn_STATUS_TXENS              0x0002
-#define UARTn_STATUS_TXC                0x0020
-#define UARTn_STATUS_TXBL               0x0040
-#define UARTn_STATUS_RXDATAV            0x0080
-
-#define UARTn_CLKDIV            0x14
-
-#define UARTn_RXDATAX           0x18
-#define UARTn_RXDATAX_RXDATA__MASK      0x01ff
-#define UARTn_RXDATAX_PERR              0x4000
-#define UARTn_RXDATAX_FERR              0x8000
-/*
- * This is a software only flag used for ignore_status_mask and
- * read_status_mask! It's used for breaks that the hardware doesn't report
- * explicitly.
- */
-#define SW_UARTn_RXDATAX_BERR           0x2000
-
-#define UARTn_TXDATA            0x34
-
-#define UARTn_IF                0x40
-#define UARTn_IF_TXC                    0x0001
-#define UARTn_IF_TXBL                   0x0002
-#define UARTn_IF_RXDATAV                0x0004
-#define UARTn_IF_RXOF                   0x0010
-
-#define UARTn_IFS               0x44
-#define UARTn_IFC               0x48
-#define UARTn_IEN               0x4c
-
-#define UARTn_ROUTE             0x54
-#define UARTn_ROUTE_LOCATION__MASK      0x0700
-#define UARTn_ROUTE_LOCATION(n)         (((n) << 8) & UARTn_ROUTE_LOCATION__MASK)
-#define UARTn_ROUTE_RXPEN               0x0001
-#define UARTn_ROUTE_TXPEN               0x0002
-
-struct efm32_uart_port {
-        struct uart_port port;
-        unsigned int txirq;
-        struct clk *clk;
-};
-#define to_efm_port(_port) container_of(_port, struct efm32_uart_port, port)
-#define efm_debug(efm_port, format, arg...)                     \
-        dev_dbg(efm_port->port.dev, format, ##arg)
-
-static void efm32_uart_write32(struct efm32_uart_port *efm_port,
-                u32 value, unsigned offset)
-{
-        writel_relaxed(value, efm_port->port.membase + offset);
-}
-
-static u32 efm32_uart_read32(struct efm32_uart_port *efm_port,
-                unsigned offset)
-{
-        return readl_relaxed(efm_port->port.membase + offset);
-}
-
-static unsigned int efm32_uart_tx_empty(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        u32 status = efm32_uart_read32(efm_port, UARTn_STATUS);
-
-        if (status & UARTn_STATUS_TXC)
-                return TIOCSER_TEMT;
-        else
-                return 0;
-}
-
-static void efm32_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        /* sorry, neither handshaking lines nor loop functionallity */
-}
-
-static unsigned int efm32_uart_get_mctrl(struct uart_port *port)
-{
-        /* sorry, no handshaking lines available */
-        return TIOCM_CAR | TIOCM_CTS | TIOCM_DSR;
-}
-
-static void efm32_uart_stop_tx(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        u32 ien = efm32_uart_read32(efm_port,  UARTn_IEN);
-
-        efm32_uart_write32(efm_port, UARTn_CMD_TXDIS, UARTn_CMD);
-        ien &= ~(UARTn_IF_TXC | UARTn_IF_TXBL);
-        efm32_uart_write32(efm_port, ien, UARTn_IEN);
-}
-
-static void efm32_uart_tx_chars(struct efm32_uart_port *efm_port)
-{
-        struct uart_port *port = &efm_port->port;
-        struct circ_buf *xmit = &port->state->xmit;
-
-        while (efm32_uart_read32(efm_port, UARTn_STATUS) &
-                        UARTn_STATUS_TXBL) {
-                if (port->x_char) {
-                        port->icount.tx++;
-                        efm32_uart_write32(efm_port, port->x_char,
-                                        UARTn_TXDATA);
-                        port->x_char = 0;
-                        continue;
-                }
-                if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) {
-                        port->icount.tx++;
-                        efm32_uart_write32(efm_port, xmit->buf[xmit->tail],
-                                        UARTn_TXDATA);
-                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                } else
-                        break;
-        }
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(port);
-
-        if (!port->x_char && uart_circ_empty(xmit) &&
-                        efm32_uart_read32(efm_port, UARTn_STATUS) &
-                                UARTn_STATUS_TXC)
-                efm32_uart_stop_tx(port);
-}
-
-static void efm32_uart_start_tx(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        u32 ien;
-
-        efm32_uart_write32(efm_port,
-                        UARTn_IF_TXBL | UARTn_IF_TXC, UARTn_IFC);
-        ien = efm32_uart_read32(efm_port, UARTn_IEN);
-        efm32_uart_write32(efm_port,
-                        ien | UARTn_IF_TXBL | UARTn_IF_TXC, UARTn_IEN);
-        efm32_uart_write32(efm_port, UARTn_CMD_TXEN, UARTn_CMD);
-
-        efm32_uart_tx_chars(efm_port);
-}
-
-static void efm32_uart_stop_rx(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-
-        efm32_uart_write32(efm_port, UARTn_CMD_RXDIS, UARTn_CMD);
-}
-
-static void efm32_uart_enable_ms(struct uart_port *port)
-{
-        /* no handshake lines, no modem status interrupts */
-}
-
-static void efm32_uart_break_ctl(struct uart_port *port, int ctl)
-{
-        /* not possible without fiddling with gpios */
-}
-
-static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port,
-                struct tty_struct *tty)
-{
-        struct uart_port *port = &efm_port->port;
-
-        while (efm32_uart_read32(efm_port, UARTn_STATUS) &
-                        UARTn_STATUS_RXDATAV) {
-                u32 rxdata = efm32_uart_read32(efm_port, UARTn_RXDATAX);
-                int flag = 0;
-
-                /*
-                 * This is a reserved bit and I only saw it read as 0. But to be
-                 * sure not to be confused too much by new devices adhere to the
-                 * warning in the reference manual that reserverd bits might
-                 * read as 1 in the future.
-                 */
-                rxdata &= ~SW_UARTn_RXDATAX_BERR;
-
-                port->icount.rx++;
-
-                if ((rxdata & UARTn_RXDATAX_FERR) &&
-                                !(rxdata & UARTn_RXDATAX_RXDATA__MASK)) {
-                        rxdata |= SW_UARTn_RXDATAX_BERR;
-                        port->icount.brk++;
-                        if (uart_handle_break(port))
-                                continue;
-                } else if (rxdata & UARTn_RXDATAX_PERR)
-                        port->icount.parity++;
-                else if (rxdata & UARTn_RXDATAX_FERR)
-                        port->icount.frame++;
-
-                rxdata &= port->read_status_mask;
-
-                if (rxdata & SW_UARTn_RXDATAX_BERR)
-                        flag = TTY_BREAK;
-                else if (rxdata & UARTn_RXDATAX_PERR)
-                        flag = TTY_PARITY;
-                else if (rxdata & UARTn_RXDATAX_FERR)
-                        flag = TTY_FRAME;
-                else if (uart_handle_sysrq_char(port,
-                                        rxdata & UARTn_RXDATAX_RXDATA__MASK))
-                        continue;
-
-                if (tty && (rxdata & port->ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty,
-                                        rxdata & UARTn_RXDATAX_RXDATA__MASK, flag);
-        }
-}
-
-static irqreturn_t efm32_uart_rxirq(int irq, void *data)
-{
-        struct efm32_uart_port *efm_port = data;
-        u32 irqflag = efm32_uart_read32(efm_port, UARTn_IF);
-        int handled = IRQ_NONE;
-        struct uart_port *port = &efm_port->port;
-        struct tty_struct *tty;
-
-        spin_lock(&port->lock);
-
-        tty = tty_kref_get(port->state->port.tty);
-
-        if (irqflag & UARTn_IF_RXDATAV) {
-                efm32_uart_write32(efm_port, UARTn_IF_RXDATAV, UARTn_IFC);
-                efm32_uart_rx_chars(efm_port, tty);
-
-                handled = IRQ_HANDLED;
-        }
-
-        if (irqflag & UARTn_IF_RXOF) {
-                efm32_uart_write32(efm_port, UARTn_IF_RXOF, UARTn_IFC);
-                port->icount.overrun++;
-                if (tty)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-
-                handled = IRQ_HANDLED;
-        }
-
-        if (tty) {
-                tty_flip_buffer_push(tty);
-                tty_kref_put(tty);
-        }
-
-        spin_unlock(&port->lock);
-
-        return handled;
-}
-
-static irqreturn_t efm32_uart_txirq(int irq, void *data)
-{
-        struct efm32_uart_port *efm_port = data;
-        u32 irqflag = efm32_uart_read32(efm_port, UARTn_IF);
-
-        /* TXBL doesn't need to be cleared */
-        if (irqflag & UARTn_IF_TXC)
-                efm32_uart_write32(efm_port, UARTn_IF_TXC, UARTn_IFC);
-
-        if (irqflag & (UARTn_IF_TXC | UARTn_IF_TXBL)) {
-                efm32_uart_tx_chars(efm_port);
-                return IRQ_HANDLED;
-        } else
-                return IRQ_NONE;
-}
-
-static int efm32_uart_startup(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        u32 location = 0;
-        struct efm32_uart_pdata *pdata = dev_get_platdata(port->dev);
-        int ret;
-
-        if (pdata)
-                location = UARTn_ROUTE_LOCATION(pdata->location);
-
-        ret = clk_enable(efm_port->clk);
-        if (ret) {
-                efm_debug(efm_port, "failed to enable clk\n");
-                goto err_clk_enable;
-        }
-        port->uartclk = clk_get_rate(efm_port->clk);
-
-        /* Enable pins at configured location */
-        efm32_uart_write32(efm_port, location | UARTn_ROUTE_RXPEN | UARTn_ROUTE_TXPEN,
-                        UARTn_ROUTE);
-
-        ret = request_irq(port->irq, efm32_uart_rxirq, 0,
-                        DRIVER_NAME, efm_port);
-        if (ret) {
-                efm_debug(efm_port, "failed to register rxirq\n");
-                goto err_request_irq_rx;
-        }
-
-        /* disable all irqs */
-        efm32_uart_write32(efm_port, 0, UARTn_IEN);
-
-        ret = request_irq(efm_port->txirq, efm32_uart_txirq, 0,
-                        DRIVER_NAME, efm_port);
-        if (ret) {
-                efm_debug(efm_port, "failed to register txirq\n");
-                free_irq(port->irq, efm_port);
-err_request_irq_rx:
-
-                clk_disable(efm_port->clk);
-        } else {
-                efm32_uart_write32(efm_port,
-                                UARTn_IF_RXDATAV | UARTn_IF_RXOF, UARTn_IEN);
-                efm32_uart_write32(efm_port, UARTn_CMD_RXEN, UARTn_CMD);
-        }
-
-err_clk_enable:
-        return ret;
-}
-
-static void efm32_uart_shutdown(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-
-        efm32_uart_write32(efm_port, 0, UARTn_IEN);
-        free_irq(port->irq, efm_port);
-
-        clk_disable(efm_port->clk);
-}
-
-static void efm32_uart_set_termios(struct uart_port *port,
-                struct ktermios *new, struct ktermios *old)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        unsigned long flags;
-        unsigned baud;
-        u32 clkdiv;
-        u32 frame = 0;
-
-        /* no modem control lines */
-        new->c_cflag &= ~(CRTSCTS | CMSPAR);
-
-        baud = uart_get_baud_rate(port, new, old,
-                        DIV_ROUND_CLOSEST(port->uartclk, 16 * 8192),
-                        DIV_ROUND_CLOSEST(port->uartclk, 16));
-
-        switch (new->c_cflag & CSIZE) {
-        case CS5:
-                frame |= UARTn_FRAME_DATABITS(5);
-                break;
-        case CS6:
-                frame |= UARTn_FRAME_DATABITS(6);
-                break;
-        case CS7:
-                frame |= UARTn_FRAME_DATABITS(7);
-                break;
-        case CS8:
-                frame |= UARTn_FRAME_DATABITS(8);
-                break;
-        }
-
-        if (new->c_cflag & CSTOPB)
-                /* the receiver only verifies the first stop bit */
-                frame |= UARTn_FRAME_STOPBITS_TWO;
-        else
-                frame |= UARTn_FRAME_STOPBITS_ONE;
-
-        if (new->c_cflag & PARENB) {
-                if (new->c_cflag & PARODD)
-                        frame |= UARTn_FRAME_PARITY_ODD;
-                else
-                        frame |= UARTn_FRAME_PARITY_EVEN;
-        } else
-                frame |= UARTn_FRAME_PARITY_NONE;
-
-        /*
-         * the 6 lowest bits of CLKDIV are dc, bit 6 has value 0.25.
-         * port->uartclk <= 14e6, so 4 * port->uartclk doesn't overflow.
-         */
-        clkdiv = (DIV_ROUND_CLOSEST(4 * port->uartclk, 16 * baud) - 4) << 6;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        efm32_uart_write32(efm_port,
-                        UARTn_CMD_TXDIS | UARTn_CMD_RXDIS, UARTn_CMD);
-
-        port->read_status_mask = UARTn_RXDATAX_RXDATA__MASK;
-        if (new->c_iflag & INPCK)
-                port->read_status_mask |=
-                        UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR;
-        if (new->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= SW_UARTn_RXDATAX_BERR;
-
-        port->ignore_status_mask = 0;
-        if (new->c_iflag & IGNPAR)
-                port->ignore_status_mask |=
-                        UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR;
-        if (new->c_iflag & IGNBRK)
-                port->ignore_status_mask |= SW_UARTn_RXDATAX_BERR;
-
-        uart_update_timeout(port, new->c_cflag, baud);
-
-        efm32_uart_write32(efm_port, UARTn_CTRL_TXBIL, UARTn_CTRL);
-        efm32_uart_write32(efm_port, frame, UARTn_FRAME);
-        efm32_uart_write32(efm_port, clkdiv, UARTn_CLKDIV);
-
-        efm32_uart_write32(efm_port, UARTn_CMD_TXEN | UARTn_CMD_RXEN,
-                        UARTn_CMD);
-
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static const char *efm32_uart_type(struct uart_port *port)
-{
-        return port->type == PORT_EFMUART ? "efm32-uart" : NULL;
-}
-
-static void efm32_uart_release_port(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-
-        clk_unprepare(efm_port->clk);
-        clk_put(efm_port->clk);
-        iounmap(port->membase);
-}
-
-static int efm32_uart_request_port(struct uart_port *port)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        int ret;
-
-        port->membase = ioremap(port->mapbase, 60);
-        if (!efm_port->port.membase) {
-                ret = -ENOMEM;
-                efm_debug(efm_port, "failed to remap\n");
-                goto err_ioremap;
-        }
-
-        efm_port->clk = clk_get(port->dev, NULL);
-        if (IS_ERR(efm_port->clk)) {
-                ret = PTR_ERR(efm_port->clk);
-                efm_debug(efm_port, "failed to get clock\n");
-                goto err_clk_get;
-        }
-
-        ret = clk_prepare(efm_port->clk);
-        if (ret) {
-                clk_put(efm_port->clk);
-err_clk_get:
-
-                iounmap(port->membase);
-err_ioremap:
-                return ret;
-        }
-        return 0;
-}
-
-static void efm32_uart_config_port(struct uart_port *port, int type)
-{
-        if (type & UART_CONFIG_TYPE &&
-                        !efm32_uart_request_port(port))
-                port->type = PORT_EFMUART;
-}
-
-static int efm32_uart_verify_port(struct uart_port *port,
-                struct serial_struct *serinfo)
-{
-        int ret = 0;
-
-        if (serinfo->type != PORT_UNKNOWN && serinfo->type != PORT_EFMUART)
-                ret = -EINVAL;
-
-        return ret;
-}
-
-static struct uart_ops efm32_uart_pops = {
-        .tx_empty = efm32_uart_tx_empty,
-        .set_mctrl = efm32_uart_set_mctrl,
-        .get_mctrl = efm32_uart_get_mctrl,
-        .stop_tx = efm32_uart_stop_tx,
-        .start_tx = efm32_uart_start_tx,
-        .stop_rx = efm32_uart_stop_rx,
-        .enable_ms = efm32_uart_enable_ms,
-        .break_ctl = efm32_uart_break_ctl,
-        .startup = efm32_uart_startup,
-        .shutdown = efm32_uart_shutdown,
-        .set_termios = efm32_uart_set_termios,
-        .type = efm32_uart_type,
-        .release_port = efm32_uart_release_port,
-        .request_port = efm32_uart_request_port,
-        .config_port = efm32_uart_config_port,
-        .verify_port = efm32_uart_verify_port,
-};
-
-static struct efm32_uart_port *efm32_uart_ports[5];
-
-#ifdef CONFIG_SERIAL_EFM32_UART_CONSOLE
-static void efm32_uart_console_putchar(struct uart_port *port, int ch)
-{
-        struct efm32_uart_port *efm_port = to_efm_port(port);
-        unsigned int timeout = 0x400;
-        u32 status;
-
-        while (1) {
-                status = efm32_uart_read32(efm_port, UARTn_STATUS);
-
-                if (status & UARTn_STATUS_TXBL)
-                        break;
-                if (!timeout--)
-                        return;
-        }
-        efm32_uart_write32(efm_port, ch, UARTn_TXDATA);
-}
-
-static void efm32_uart_console_write(struct console *co, const char *s,
-                unsigned int count)
-{
-        struct efm32_uart_port *efm_port = efm32_uart_ports[co->index];
-        u32 status = efm32_uart_read32(efm_port, UARTn_STATUS);
-        unsigned int timeout = 0x400;
-
-        if (!(status & UARTn_STATUS_TXENS))
-                efm32_uart_write32(efm_port, UARTn_CMD_TXEN, UARTn_CMD);
-
-        uart_console_write(&efm_port->port, s, count,
-                        efm32_uart_console_putchar);
-
-        /* Wait for the transmitter to become empty */
-        while (1) {
-                u32 status = efm32_uart_read32(efm_port, UARTn_STATUS);
-                if (status & UARTn_STATUS_TXC)
-                        break;
-                if (!timeout--)
-                        break;
-        }
-
-        if (!(status & UARTn_STATUS_TXENS))
-                efm32_uart_write32(efm_port, UARTn_CMD_TXDIS, UARTn_CMD);
-}
-
-static void efm32_uart_console_get_options(struct efm32_uart_port *efm_port,
-                int *baud, int *parity, int *bits)
-{
-        u32 ctrl = efm32_uart_read32(efm_port, UARTn_CTRL);
-        u32 route, clkdiv, frame;
-
-        if (ctrl & UARTn_CTRL_SYNC)
-                /* not operating in async mode */
-                return;
-
-        route = efm32_uart_read32(efm_port, UARTn_ROUTE);
-        if (!(route & UARTn_ROUTE_TXPEN))
-                /* tx pin not routed */
-                return;
-
-        clkdiv = efm32_uart_read32(efm_port, UARTn_CLKDIV);
-
-        *baud = DIV_ROUND_CLOSEST(4 * efm_port->port.uartclk,
-                        16 * (4 + (clkdiv >> 6)));
-
-        frame = efm32_uart_read32(efm_port, UARTn_FRAME);
-        if (frame & UARTn_FRAME_PARITY_ODD)
-                *parity = 'o';
-        else if (frame & UARTn_FRAME_PARITY_EVEN)
-                *parity = 'e';
-        else
-                *parity = 'n';
-
-        *bits = (frame & UARTn_FRAME_DATABITS__MASK) -
-                        UARTn_FRAME_DATABITS(4) + 4;
-
-        efm_debug(efm_port, "get_opts: options=%d%c%d\n",
-                        *baud, *parity, *bits);
-}
-
-static int efm32_uart_console_setup(struct console *co, char *options)
-{
-        struct efm32_uart_port *efm_port;
-        int baud = 115200;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-        int ret;
-
-        if (co->index < 0 || co->index >= ARRAY_SIZE(efm32_uart_ports)) {
-                unsigned i;
-                for (i = 0; i < ARRAY_SIZE(efm32_uart_ports); ++i) {
-                        if (efm32_uart_ports[i]) {
-                                pr_warn("efm32-console: fall back to console index %u (from %hhi)\n",
-                                                i, co->index);
-                                co->index = i;
-                                break;
-                        }
-                }
-        }
-
-        efm_port = efm32_uart_ports[co->index];
-        if (!efm_port) {
-                pr_warn("efm32-console: No port at %d\n", co->index);
-                return -ENODEV;
-        }
-
-        ret = clk_prepare(efm_port->clk);
-        if (ret) {
-                dev_warn(efm_port->port.dev,
-                                "console: clk_prepare failed: %d\n", ret);
-                return ret;
-        }
-
-        efm_port->port.uartclk = clk_get_rate(efm_port->clk);
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-        else
-                efm32_uart_console_get_options(efm_port,
-                                &baud, &parity, &bits);
-
-        return uart_set_options(&efm_port->port, co, baud, parity, bits, flow);
-}
-
-static struct uart_driver efm32_uart_reg;
-
-static struct console efm32_uart_console = {
-        .name = DEV_NAME,
-        .write = efm32_uart_console_write,
-        .device = uart_console_device,
-        .setup = efm32_uart_console_setup,
-        .flags = CON_PRINTBUFFER,
-        .index = -1,
-        .data = &efm32_uart_reg,
-};
-
-#else
-#define efm32_uart_console (*(struct console *)NULL)
-#endif /* ifdef CONFIG_SERIAL_EFM32_UART_CONSOLE / else */
-
-static struct uart_driver efm32_uart_reg = {
-        .owner = THIS_MODULE,
-        .driver_name = DRIVER_NAME,
-        .dev_name = DEV_NAME,
-        .nr = ARRAY_SIZE(efm32_uart_ports),
-        .cons = &efm32_uart_console,
-};
-
-static int efm32_uart_probe_dt(struct platform_device *pdev,
-                struct efm32_uart_port *efm_port)
-{
-        struct device_node *np = pdev->dev.of_node;
-        int ret;
-
-        if (!np)
-                return 1;
-
-        ret = of_alias_get_id(np, "serial");
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to get alias id: %d\n", ret);
-                return ret;
-        } else {
-                efm_port->port.line = ret;
-                return 0;
-        }
-
-}
-
-static int efm32_uart_probe(struct platform_device *pdev)
-{
-        struct efm32_uart_port *efm_port;
-        struct resource *res;
-        int ret;
-
-        efm_port = kzalloc(sizeof(*efm_port), GFP_KERNEL);
-        if (!efm_port) {
-                dev_dbg(&pdev->dev, "failed to allocate private data\n");
-                return -ENOMEM;
-        }
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                ret = -ENODEV;
-                dev_dbg(&pdev->dev, "failed to determine base address\n");
-                goto err_get_base;
-        }
-
-        if (resource_size(res) < 60) {
-                ret = -EINVAL;
-                dev_dbg(&pdev->dev, "memory resource too small\n");
-                goto err_too_small;
-        }
-
-        ret = platform_get_irq(pdev, 0);
-        if (ret <= 0) {
-                dev_dbg(&pdev->dev, "failed to get rx irq\n");
-                goto err_get_rxirq;
-        }
-
-        efm_port->port.irq = ret;
-
-        ret = platform_get_irq(pdev, 1);
-        if (ret <= 0)
-                ret = efm_port->port.irq + 1;
-
-        efm_port->txirq = ret;
-
-        efm_port->port.dev = &pdev->dev;
-        efm_port->port.mapbase = res->start;
-        efm_port->port.type = PORT_EFMUART;
-        efm_port->port.iotype = UPIO_MEM32;
-        efm_port->port.fifosize = 2;
-        efm_port->port.ops = &efm32_uart_pops;
-        efm_port->port.flags = UPF_BOOT_AUTOCONF;
-
-        ret = efm32_uart_probe_dt(pdev, efm_port);
-        if (ret > 0)
-                /* not created by device tree */
-                efm_port->port.line = pdev->id;
-
-        if (efm_port->port.line >= 0 &&
-                        efm_port->port.line < ARRAY_SIZE(efm32_uart_ports))
-                efm32_uart_ports[efm_port->port.line] = efm_port;
-
-        ret = uart_add_one_port(&efm32_uart_reg, &efm_port->port);
-        if (ret) {
-                dev_dbg(&pdev->dev, "failed to add port: %d\n", ret);
-
-                if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports))
-                        efm32_uart_ports[pdev->id] = NULL;
-err_get_rxirq:
-err_too_small:
-err_get_base:
-                kfree(efm_port);
-        } else {
-                platform_set_drvdata(pdev, efm_port);
-                dev_dbg(&pdev->dev, "\\o/\n");
-        }
-
-        return ret;
-}
-
-static int efm32_uart_remove(struct platform_device *pdev)
-{
-        struct efm32_uart_port *efm_port = platform_get_drvdata(pdev);
-
-        platform_set_drvdata(pdev, NULL);
-
-        uart_remove_one_port(&efm32_uart_reg, &efm_port->port);
-
-        if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports))
-                efm32_uart_ports[pdev->id] = NULL;
-
-        kfree(efm_port);
-
-        return 0;
-}
-
-static struct of_device_id efm32_uart_dt_ids[] = {
-        {
-                .compatible = "efm32,uart",
-        }, {
-                /* sentinel */
-        }
-};
-MODULE_DEVICE_TABLE(of, efm32_uart_dt_ids);
-
-static struct platform_driver efm32_uart_driver = {
-        .probe = efm32_uart_probe,
-        .remove = efm32_uart_remove,
-
-        .driver = {
-                .name = DRIVER_NAME,
-                .owner = THIS_MODULE,
-                .of_match_table = efm32_uart_dt_ids,
-        },
-};
-
-static int __init efm32_uart_init(void)
-{
-        int ret;
-
-        ret = uart_register_driver(&efm32_uart_reg);
-        if (ret)
-                return ret;
-
-        ret = platform_driver_register(&efm32_uart_driver);
-        if (ret)
-                uart_unregister_driver(&efm32_uart_reg);
-
-        pr_info("EFM32 UART/USART driver\n");
-
-        return ret;
-}
-module_init(efm32_uart_init);
-
-static void __exit efm32_uart_exit(void)
-{
-        platform_driver_unregister(&efm32_uart_driver);
-        uart_unregister_driver(&efm32_uart_reg);
-}
-
-MODULE_AUTHOR("Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>");
-MODULE_DESCRIPTION("EFM32 UART/USART driver");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 72b6334bcf1..8a869e58f6d 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -52,6 +52,7 @@
 #include <linux/firmware.h>
 #include <linux/bitops.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -175,7 +176,7 @@ static void free_port_memory(struct icom_port *icom_port)
         }
 }
 
-static int get_port_memory(struct icom_port *icom_port)
+static int __devinit get_port_memory(struct icom_port *icom_port)
 {
         int index;
         unsigned long stgAddr;
@@ -505,7 +506,7 @@ static void load_code(struct icom_port *icom_port)
                 /* Stop processor */
                 stop_processor(icom_port);
 
-                dev_err(&icom_port->adapter->pci_dev->dev,"Port not operational\n");
+                dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n");
         }
 
         if (new_page != NULL)
@@ -1314,7 +1315,7 @@ static struct uart_driver icom_uart_driver = {
         .cons = ICOM_CONSOLE,
 };
 
-static int icom_init_ports(struct icom_adapter *icom_adapter)
+static int __devinit icom_init_ports(struct icom_adapter *icom_adapter)
 {
         u32 subsystem_id = icom_adapter->subsystem_id;
         int i;
@@ -1381,7 +1382,7 @@ static void icom_port_active(struct icom_port *icom_port, struct icom_adapter *i
                             0x8024 + 2 - 2 * (icom_port->port - 2);
         }
 }
-static int icom_load_ports(struct icom_adapter *icom_adapter)
+static int __devinit icom_load_ports(struct icom_adapter *icom_adapter)
 {
         struct icom_port *icom_port;
         int port_num;
@@ -1407,7 +1408,7 @@ static int icom_load_ports(struct icom_adapter *icom_adapter)
         return 0;
 }
 
-static int icom_alloc_adapter(struct icom_adapter
+static int __devinit icom_alloc_adapter(struct icom_adapter
                                         **icom_adapter_ref)
 {
         int adapter_count = 0;
@@ -1487,7 +1488,7 @@ static void icom_kref_release(struct kref *kref)
         icom_remove_adapter(icom_adapter);
 }
 
-static int icom_probe(struct pci_dev *dev,
+static int __devinit icom_probe(struct pci_dev *dev,
                                 const struct pci_device_id *ent)
 {
         int index;
@@ -1553,7 +1554,7 @@ static int icom_probe(struct pci_dev *dev,
 
          /* save off irq and request irq line */
          if ( (retval = request_irq(dev->irq, icom_interrupt,
-                                   IRQF_SHARED, ICOM_DRIVER_NAME,
+                                   IRQF_DISABLED | IRQF_SHARED, ICOM_DRIVER_NAME,
                                    (void *) icom_adapter))) {
                   goto probe_exit2;
          }
@@ -1596,7 +1597,7 @@ probe_exit0:
         return retval;
 }
 
-static void icom_remove(struct pci_dev *dev)
+static void __devexit icom_remove(struct pci_dev *dev)
 {
         struct icom_adapter *icom_adapter;
         struct list_head *tmp;
@@ -1617,7 +1618,7 @@ static struct pci_driver icom_pci_driver = {
         .name = ICOM_DRIVER_NAME,
         .id_table = icom_pci_table,
         .probe = icom_probe,
-        .remove = icom_remove,
+        .remove = __devexit_p(icom_remove),
 };
 
 static int __init icom_init(void)
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 675d94ab0af..426434e5eb7 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -60,27 +60,20 @@
 #include <linux/pm_runtime.h>
 #include <linux/spi/ifx_modem.h>
 #include <linux/delay.h>
-#include <linux/reboot.h>
 
 #include "ifx6x60.h"
 
 #define IFX_SPI_MORE_MASK               0x10
-#define IFX_SPI_MORE_BIT                4       /* bit position in u8 */
-#define IFX_SPI_CTS_BIT                 6       /* bit position in u8 */
+#define IFX_SPI_MORE_BIT                12      /* bit position in u16 */
+#define IFX_SPI_CTS_BIT                 13      /* bit position in u16 */
 #define IFX_SPI_MODE                    SPI_MODE_1
 #define IFX_SPI_TTY_ID                  0
 #define IFX_SPI_TIMEOUT_SEC             2
 #define IFX_SPI_HEADER_0                (-1)
 #define IFX_SPI_HEADER_F                (-2)
 
-#define PO_POST_DELAY           200
-#define IFX_MDM_RST_PMU 4
-
 /* forward reference */
 static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev);
-static int ifx_modem_reboot_callback(struct notifier_block *nfb,
-                                unsigned long event, void *data);
-static int ifx_modem_power_off(struct ifx_spi_device *ifx_dev);
 
 /* local variables */
 static int spi_bpw = 16;                /* 8, 16 or 32 bit word length */
@@ -88,29 +81,6 @@ static struct tty_driver *tty_drv;
 static struct ifx_spi_device *saved_ifx_dev;
 static struct lock_class_key ifx_spi_key;
 
-static struct notifier_block ifx_modem_reboot_notifier_block = {
-        .notifier_call = ifx_modem_reboot_callback,
-};
-
-static int ifx_modem_power_off(struct ifx_spi_device *ifx_dev)
-{
-        gpio_set_value(IFX_MDM_RST_PMU, 1);
-        msleep(PO_POST_DELAY);
-
-        return 0;
-}
-
-static int ifx_modem_reboot_callback(struct notifier_block *nfb,
-                                 unsigned long event, void *data)
-{
-        if (saved_ifx_dev)
-                ifx_modem_power_off(saved_ifx_dev);
-        else
-                pr_warn("no ifx modem active;\n");
-
-        return NOTIFY_OK;
-}
-
 /* GPIO/GPE settings */
 
 /**
@@ -182,67 +152,26 @@ ifx_spi_power_state_clear(struct ifx_spi_device *ifx_dev, unsigned char val)
 }
 
 /**
- *      swap_buf_8
+ *      swap_buf
  *      @buf: our buffer
  *      @len : number of bytes (not words) in the buffer
  *      @end: end of buffer
  *
  *      Swap the contents of a buffer into big endian format
  */
-static inline void swap_buf_8(unsigned char *buf, int len, void *end)
-{
-        /* don't swap buffer if SPI word width is 8 bits */
-        return;
-}
-
-/**
- *      swap_buf_16
- *      @buf: our buffer
- *      @len : number of bytes (not words) in the buffer
- *      @end: end of buffer
- *
- *      Swap the contents of a buffer into big endian format
- */
-static inline void swap_buf_16(unsigned char *buf, int len, void *end)
+static inline void swap_buf(u16 *buf, int len, void *end)
 {
         int n;
 
-        u16 *buf_16 = (u16 *)buf;
         len = ((len + 1) >> 1);
-        if ((void *)&buf_16[len] > end) {
-                pr_err("swap_buf_16: swap exceeds boundary (%p > %p)!",
-                       &buf_16[len], end);
-                return;
-        }
-        for (n = 0; n < len; n++) {
-                *buf_16 = cpu_to_be16(*buf_16);
-                buf_16++;
-        }
-}
-
-/**
- *      swap_buf_32
- *      @buf: our buffer
- *      @len : number of bytes (not words) in the buffer
- *      @end: end of buffer
- *
- *      Swap the contents of a buffer into big endian format
- */
-static inline void swap_buf_32(unsigned char *buf, int len, void *end)
-{
-        int n;
-
-        u32 *buf_32 = (u32 *)buf;
-        len = (len + 3) >> 2;
-
-        if ((void *)&buf_32[len] > end) {
-                pr_err("swap_buf_32: swap exceeds boundary (%p > %p)!\n",
-                       &buf_32[len], end);
+        if ((void *)&buf[len] > end) {
+                pr_err("swap_buf: swap exceeds boundary (%p > %p)!",
+                       &buf[len], end);
                 return;
         }
         for (n = 0; n < len; n++) {
-                *buf_32 = cpu_to_be32(*buf_32);
-                buf_32++;
+                *buf = cpu_to_be16(*buf);
+                buf++;
         }
 }
 
@@ -261,7 +190,9 @@ static void mrdy_assert(struct ifx_spi_device *ifx_dev)
         if (!val) {
                 if (!test_and_set_bit(IFX_SPI_STATE_TIMER_PENDING,
                                       &ifx_dev->flags)) {
-                        mod_timer(&ifx_dev->spi_timer,jiffies + IFX_SPI_TIMEOUT_SEC*HZ);
+                        ifx_dev->spi_timer.expires =
+                                jiffies + IFX_SPI_TIMEOUT_SEC*HZ;
+                        add_timer(&ifx_dev->spi_timer);
 
                 }
         }
@@ -518,7 +449,7 @@ static int ifx_spi_prepare_tx_buffer(struct ifx_spi_device *ifx_dev)
                                         tx_count-IFX_SPI_HEADER_OVERHEAD,
                                         ifx_dev->spi_more);
         /* swap actual data in the buffer */
-        ifx_dev->swap_buf((ifx_dev->tx_buffer), tx_count,
+        swap_buf((u16 *)(ifx_dev->tx_buffer), tx_count,
                 &ifx_dev->tx_buffer[IFX_SPI_TRANSFER_SIZE]);
         return tx_count;
 }
@@ -538,17 +469,9 @@ static int ifx_spi_write(struct tty_struct *tty, const unsigned char *buf,
 {
         struct ifx_spi_device *ifx_dev = tty->driver_data;
         unsigned char *tmp_buf = (unsigned char *)buf;
-        unsigned long flags;
-        bool is_fifo_empty;
-        int tx_count;
-
-        spin_lock_irqsave(&ifx_dev->fifo_lock, flags);
-        is_fifo_empty = kfifo_is_empty(&ifx_dev->tx_fifo);
-        tx_count = kfifo_in(&ifx_dev->tx_fifo, tmp_buf, count);
-        spin_unlock_irqrestore(&ifx_dev->fifo_lock, flags);
-        if (is_fifo_empty)
-                mrdy_assert(ifx_dev);
-
+        int tx_count = kfifo_in_locked(&ifx_dev->tx_fifo, tmp_buf, count,
+                                   &ifx_dev->fifo_lock);
+        mrdy_assert(ifx_dev);
         return tx_count;
 }
 
@@ -607,19 +530,12 @@ static int ifx_port_activate(struct tty_port *port, struct tty_struct *tty)
         /* clear any old data; can't do this in 'close' */
         kfifo_reset(&ifx_dev->tx_fifo);
 
-        /* clear any flag which may be set in port shutdown procedure */
-        clear_bit(IFX_SPI_STATE_IO_IN_PROGRESS, &ifx_dev->flags);
-        clear_bit(IFX_SPI_STATE_IO_READY, &ifx_dev->flags);
-
         /* put port data into this tty */
         tty->driver_data = ifx_dev;
 
         /* allows flip string push from int context */
         tty->low_latency = 1;
 
-        /* set flag to allows data transfer */
-        set_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags);
-
         return 0;
 }
 
@@ -635,7 +551,6 @@ static void ifx_port_shutdown(struct tty_port *port)
         struct ifx_spi_device *ifx_dev =
                 container_of(port, struct ifx_spi_device, tty_port);
 
-        clear_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags);
         mrdy_set_low(ifx_dev);
         clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
         tasklet_kill(&ifx_dev->io_work_tasklet);
@@ -702,7 +617,7 @@ static void ifx_spi_complete(void *ctx)
 
         if (!ifx_dev->spi_msg.status) {
                 /* check header validity, get comm flags */
-                ifx_dev->swap_buf(ifx_dev->rx_buffer, IFX_SPI_HEADER_OVERHEAD,
+                swap_buf((u16 *)ifx_dev->rx_buffer, IFX_SPI_HEADER_OVERHEAD,
                         &ifx_dev->rx_buffer[IFX_SPI_HEADER_OVERHEAD]);
                 decode_result = ifx_spi_decode_spi_header(ifx_dev->rx_buffer,
                                 &length, &more, &cts);
@@ -721,8 +636,7 @@ static void ifx_spi_complete(void *ctx)
 
                 actual_length = min((unsigned int)length,
                                         ifx_dev->spi_msg.actual_length);
-                ifx_dev->swap_buf(
-                        (ifx_dev->rx_buffer + IFX_SPI_HEADER_OVERHEAD),
+                swap_buf((u16 *)(ifx_dev->rx_buffer + IFX_SPI_HEADER_OVERHEAD),
                          actual_length,
                          &ifx_dev->rx_buffer[IFX_SPI_TRANSFER_SIZE]);
                 ifx_spi_insert_flip_string(
@@ -791,8 +705,7 @@ static void ifx_spi_io(unsigned long data)
         int retval;
         struct ifx_spi_device *ifx_dev = (struct ifx_spi_device *) data;
 
-        if (!test_and_set_bit(IFX_SPI_STATE_IO_IN_PROGRESS, &ifx_dev->flags) &&
-                test_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags)) {
+        if (!test_and_set_bit(IFX_SPI_STATE_IO_IN_PROGRESS, &ifx_dev->flags)) {
                 if (ifx_dev->gpio.unack_srdy_int_nb > 0)
                         ifx_dev->gpio.unack_srdy_int_nb--;
 
@@ -860,7 +773,6 @@ static void ifx_spi_free_port(struct ifx_spi_device *ifx_dev)
 {
         if (ifx_dev->tty_dev)
                 tty_unregister_device(tty_drv, ifx_dev->minor);
-        tty_port_destroy(&ifx_dev->tty_port);
         kfifo_free(&ifx_dev->tx_fifo);
 }
 
@@ -888,18 +800,16 @@ static int ifx_spi_create_port(struct ifx_spi_device *ifx_dev)
         tty_port_init(pport);
         pport->ops = &ifx_tty_port_ops;
         ifx_dev->minor = IFX_SPI_TTY_ID;
-        ifx_dev->tty_dev = tty_port_register_device(pport, tty_drv,
-                        ifx_dev->minor, &ifx_dev->spi_dev->dev);
+        ifx_dev->tty_dev = tty_register_device(tty_drv, ifx_dev->minor,
+                                               &ifx_dev->spi_dev->dev);
         if (IS_ERR(ifx_dev->tty_dev)) {
                 dev_dbg(&ifx_dev->spi_dev->dev,
                         "%s: registering tty device failed", __func__);
                 ret = PTR_ERR(ifx_dev->tty_dev);
-                goto error_port;
+                goto error_ret;
         }
         return 0;
 
-error_port:
-        tty_port_destroy(pport);
 error_ret:
         ifx_spi_free_port(ifx_dev);
         return ret;
@@ -916,7 +826,7 @@ error_ret:
 static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev)
 {
         if (test_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags)) {
-                del_timer(&ifx_dev->spi_timer);
+                del_timer_sync(&ifx_dev->spi_timer);
                 clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
         }
 
@@ -1091,14 +1001,6 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
                 return -ENODEV;
         }
 
-        /* init swap_buf function according to word width configuration */
-        if (spi->bits_per_word == 32)
-                ifx_dev->swap_buf = swap_buf_32;
-        else if (spi->bits_per_word == 16)
-                ifx_dev->swap_buf = swap_buf_16;
-        else
-                ifx_dev->swap_buf = swap_buf_8;
-
         /* ensure SPI protocol flags are initialized to enable transfer */
         ifx_dev->spi_more = 0;
         ifx_dev->spi_slave_cts = 0;
@@ -1317,9 +1219,6 @@ static int ifx_spi_spi_remove(struct spi_device *spi)
 
 static void ifx_spi_spi_shutdown(struct spi_device *spi)
 {
-        struct ifx_spi_device *ifx_dev = spi_get_drvdata(spi);
-
-        ifx_modem_power_off(ifx_dev);
 }
 
 /*
@@ -1432,14 +1331,15 @@ static const struct spi_device_id ifx_id_table[] = {
 MODULE_DEVICE_TABLE(spi, ifx_id_table);
 
 /* spi operations */
-static struct spi_driver ifx_spi_driver = {
+static const struct spi_driver ifx_spi_driver = {
         .driver = {
                 .name = DRVNAME,
+                .bus = &spi_bus_type,
                 .pm = &ifx_spi_pm,
                 .owner = THIS_MODULE},
         .probe = ifx_spi_spi_probe,
         .shutdown = ifx_spi_spi_shutdown,
-        .remove = ifx_spi_spi_remove,
+        .remove = __devexit_p(ifx_spi_spi_remove),
         .suspend = ifx_spi_spi_suspend,
         .resume = ifx_spi_spi_resume,
         .id_table = ifx_id_table
@@ -1455,9 +1355,7 @@ static void __exit ifx_spi_exit(void)
 {
         /* unregister */
         tty_unregister_driver(tty_drv);
-        put_tty_driver(tty_drv);
         spi_unregister_driver((void *)&ifx_spi_driver);
-        unregister_reboot_notifier(&ifx_modem_reboot_notifier_block);
 }
 
 /**
@@ -1478,9 +1376,12 @@ static int __init ifx_spi_init(void)
                 return -ENOMEM;
         }
 
+        tty_drv->magic = TTY_DRIVER_MAGIC;
+        tty_drv->owner = THIS_MODULE;
         tty_drv->driver_name = DRVNAME;
         tty_drv->name = TTYNAME;
         tty_drv->minor_start = IFX_SPI_TTY_ID;
+        tty_drv->num = 1;
         tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
         tty_drv->subtype = SERIAL_TYPE_NORMAL;
         tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
@@ -1492,31 +1393,16 @@ static int __init ifx_spi_init(void)
         if (result) {
                 pr_err("%s: tty_register_driver failed(%d)",
                         DRVNAME, result);
-                goto err_free_tty;
+                put_tty_driver(tty_drv);
+                return result;
         }
 
         result = spi_register_driver((void *)&ifx_spi_driver);
         if (result) {
                 pr_err("%s: spi_register_driver failed(%d)",
                         DRVNAME, result);
-                goto err_unreg_tty;
+                tty_unregister_driver(tty_drv);
         }
-
-        result = register_reboot_notifier(&ifx_modem_reboot_notifier_block);
-        if (result) {
-                pr_err("%s: register ifx modem reboot notifier failed(%d)",
-                        DRVNAME, result);
-                goto err_unreg_spi;
-        }
-
-        return 0;
-err_unreg_spi:
-        spi_unregister_driver((void *)&ifx_spi_driver);
-err_unreg_tty:
-        tty_unregister_driver(tty_drv);
-err_free_tty:
-        put_tty_driver(tty_drv);
-
         return result;
 }
 
diff --git a/drivers/tty/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
index 4fbddc29783..e8464baf9e7 100644
--- a/drivers/tty/serial/ifx6x60.h
+++ b/drivers/tty/serial/ifx6x60.h
@@ -41,7 +41,6 @@
 #define IFX_SPI_STATE_IO_IN_PROGRESS    1
 #define IFX_SPI_STATE_IO_READY          2
 #define IFX_SPI_STATE_TIMER_PENDING     3
-#define IFX_SPI_STATE_IO_AVAILABLE      4
 
 /* flow control bitfields */
 #define IFX_SPI_DCD                     0
@@ -125,7 +124,6 @@ struct ifx_spi_device {
 #define MR_INPROGRESS   1
 #define MR_COMPLETE     2
         wait_queue_head_t mdm_reset_wait;
-        void (*swap_buf)(unsigned char *buf, int len, void *end);
 };
 
 #endif /* _IFX6X60_H */
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 59819121fe9..7e91b3d368c 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -47,11 +47,10 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <linux/platform_data/serial-imx.h>
+#include <mach/imx-uart.h>
 
 /* Register definitions */
 #define URXD0 0x0  /* Receiver Register */
@@ -103,7 +102,6 @@
 #define  UCR2_STPB       (1<<6)  /* Stop */
 #define  UCR2_WS         (1<<5)  /* Word size */
 #define  UCR2_RTSEN      (1<<4)  /* Request to send interrupt enable */
-#define  UCR2_ATEN       (1<<3)  /* Aging Timer Enable */
 #define  UCR2_TXEN       (1<<2)  /* Transmitter enabled */
 #define  UCR2_RXEN       (1<<1)  /* Receiver enabled */
 #define  UCR2_SRST       (1<<0)  /* SW reset */
@@ -132,7 +130,6 @@
 #define  UCR4_OREN       (1<<1)  /* Receiver overrun interrupt enable */
 #define  UCR4_DREN       (1<<0)  /* Recv data ready interrupt enable */
 #define  UFCR_RXTL_SHF   0       /* Receiver trigger level shift */
-#define  UFCR_DCEDTE     (1<<6)  /* DCE/DTE mode select */
 #define  UFCR_RFDIV      (7<<7)  /* Reference freq divider mask */
 #define  UFCR_RFDIV_REG(x)      (((x) < 7 ? 6 - (x) : 6) << 7)
 #define  UFCR_TXTL_SHF   10      /* Transmitter trigger level shift */
@@ -170,6 +167,7 @@
 #define SERIAL_IMX_MAJOR        207
 #define MINOR_START             16
 #define DEV_NAME                "ttymxc"
+#define MAX_INTERNAL_IRQ        MXC_INTERNAL_IRQS
 
 /*
  * This determines how often we check the modem status signals
@@ -205,15 +203,8 @@ struct imx_port {
         unsigned int            irda_inv_rx:1;
         unsigned int            irda_inv_tx:1;
         unsigned short          trcv_delay; /* transceiver delay */
-        struct clk              *clk_ipg;
-        struct clk              *clk_per;
-        const struct imx_uart_data *devdata;
-};
-
-struct imx_port_ucrs {
-        unsigned int    ucr1;
-        unsigned int    ucr2;
-        unsigned int    ucr3;
+        struct clk              *clk;
+        struct imx_uart_data    *devdata;
 };
 
 #ifdef CONFIG_IRDA
@@ -269,27 +260,6 @@ static inline int is_imx21_uart(struct imx_port *sport)
 }
 
 /*
- * Save and restore functions for UCR1, UCR2 and UCR3 registers
- */
-static void imx_port_ucrs_save(struct uart_port *port,
-                               struct imx_port_ucrs *ucr)
-{
-        /* save control registers */
-        ucr->ucr1 = readl(port->membase + UCR1);
-        ucr->ucr2 = readl(port->membase + UCR2);
-        ucr->ucr3 = readl(port->membase + UCR3);
-}
-
-static void imx_port_ucrs_restore(struct uart_port *port,
-                                  struct imx_port_ucrs *ucr)
-{
-        /* restore control registers */
-        writel(ucr->ucr1, port->membase + UCR1);
-        writel(ucr->ucr2, port->membase + UCR2);
-        writel(ucr->ucr3, port->membase + UCR3);
-}
-
-/*
  * Handle any change of modem status signal since we were last called.
  */
 static void imx_mctrl_check(struct imx_port *sport)
@@ -538,10 +508,8 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
                 if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx))
                         continue;
 
-                if (unlikely(rx & URXD_ERR)) {
-                        if (rx & URXD_BRK)
-                                sport->port.icount.brk++;
-                        else if (rx & URXD_PRERR)
+                if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) {
+                        if (rx & URXD_PRERR)
                                 sport->port.icount.parity++;
                         else if (rx & URXD_FRMERR)
                                 sport->port.icount.frame++;
@@ -556,9 +524,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 
                         rx &= sport->port.read_status_mask;
 
-                        if (rx & URXD_BRK)
-                                flg = TTY_BREAK;
-                        else if (rx & URXD_PRERR)
+                        if (rx & URXD_PRERR)
                                 flg = TTY_PARITY;
                         else if (rx & URXD_FRMERR)
                                 flg = TTY_FRAME;
@@ -596,9 +562,6 @@ static irqreturn_t imx_int(int irq, void *dev_id)
         if (sts & USR1_RTSD)
                 imx_rtsint(irq, dev_id);
 
-        if (sts & USR1_AWAKE)
-                writel(USR1_AWAKE, sport->port.membase + USR1);
-
         return IRQ_HANDLED;
 }
 
@@ -668,11 +631,22 @@ static void imx_break_ctl(struct uart_port *port, int break_state)
 static int imx_setup_ufcr(struct imx_port *sport, unsigned int mode)
 {
         unsigned int val;
+        unsigned int ufcr_rfdiv;
+
+        /* set receiver / transmitter trigger level.
+         * RFDIV is set such way to satisfy requested uartclk value
+         */
+        val = TXTL << 10 | RXTL;
+        ufcr_rfdiv = (clk_get_rate(sport->clk) + sport->port.uartclk / 2)
+                        / sport->port.uartclk;
+
+        if(!ufcr_rfdiv)
+                ufcr_rfdiv = 1;
+
+        val |= UFCR_RFDIV_REG(ufcr_rfdiv);
 
-        /* set receiver / transmitter trigger level */
-        val = readl(sport->port.membase + UFCR) & (UFCR_RFDIV | UFCR_DCEDTE);
-        val |= TXTL << UFCR_TXTL_SHF | RXTL;
         writel(val, sport->port.membase + UFCR);
+
         return 0;
 }
 
@@ -730,7 +704,10 @@ static int imx_startup(struct uart_port *port)
 
                 /* do not use RTS IRQ on IrDA */
                 if (!USE_IRDA(sport)) {
-                        retval = request_irq(sport->rtsirq, imx_rtsint, 0,
+                        retval = request_irq(sport->rtsirq, imx_rtsint,
+                                     (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 :
+                                       IRQF_TRIGGER_FALLING |
+                                       IRQF_TRIGGER_RISING,
                                         DRIVER_NAME, sport);
                         if (retval)
                                 goto error_out3;
@@ -744,7 +721,6 @@ static int imx_startup(struct uart_port *port)
                 }
         }
 
-        spin_lock_irqsave(&sport->port.lock, flags);
         /*
          * Finally, clear and enable interrupts
          */
@@ -798,6 +774,7 @@ static int imx_startup(struct uart_port *port)
         /*
          * Enable modem status interrupts
          */
+        spin_lock_irqsave(&sport->port.lock,flags);
         imx_enable_ms(&sport->port);
         spin_unlock_irqrestore(&sport->port.lock,flags);
 
@@ -827,13 +804,10 @@ static void imx_shutdown(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
         unsigned long temp;
-        unsigned long flags;
 
-        spin_lock_irqsave(&sport->port.lock, flags);
         temp = readl(sport->port.membase + UCR2);
         temp &= ~(UCR2_TXEN);
         writel(temp, sport->port.membase + UCR2);
-        spin_unlock_irqrestore(&sport->port.lock, flags);
 
         if (USE_IRDA(sport)) {
                 struct imxuart_platform_data *pdata;
@@ -862,14 +836,12 @@ static void imx_shutdown(struct uart_port *port)
          * Disable all interrupts, port and break condition.
          */
 
-        spin_lock_irqsave(&sport->port.lock, flags);
         temp = readl(sport->port.membase + UCR1);
         temp &= ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN | UCR1_UARTEN);
         if (USE_IRDA(sport))
                 temp &= ~(UCR1_IREN);
 
         writel(temp, sport->port.membase + UCR1);
-        spin_unlock_irqrestore(&sport->port.lock, flags);
 }
 
 static void
@@ -925,8 +897,6 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
                         ucr2 |= UCR2_PROE;
         }
 
-        del_timer_sync(&sport->timer);
-
         /*
          * Ask the core to calculate the divisor for us.
          */
@@ -957,6 +927,8 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
                         sport->port.ignore_status_mask |= URXD_OVRRUN;
         }
 
+        del_timer_sync(&sport->timer);
+
         /*
          * Update the per-port timeout.
          */
@@ -1103,70 +1075,6 @@ imx_verify_port(struct uart_port *port, struct serial_struct *ser)
         return ret;
 }
 
-#if defined(CONFIG_CONSOLE_POLL)
-static int imx_poll_get_char(struct uart_port *port)
-{
-        struct imx_port_ucrs old_ucr;
-        unsigned int status;
-        unsigned char c;
-
-        /* save control registers */
-        imx_port_ucrs_save(port, &old_ucr);
-
-        /* disable interrupts */
-        writel(UCR1_UARTEN, port->membase + UCR1);
-        writel(old_ucr.ucr2 & ~(UCR2_ATEN | UCR2_RTSEN | UCR2_ESCI),
-               port->membase + UCR2);
-        writel(old_ucr.ucr3 & ~(UCR3_DCD | UCR3_RI | UCR3_DTREN),
-               port->membase + UCR3);
-
-        /* poll */
-        do {
-                status = readl(port->membase + USR2);
-        } while (~status & USR2_RDR);
-
-        /* read */
-        c = readl(port->membase + URXD0);
-
-        /* restore control registers */
-        imx_port_ucrs_restore(port, &old_ucr);
-
-        return c;
-}
-
-static void imx_poll_put_char(struct uart_port *port, unsigned char c)
-{
-        struct imx_port_ucrs old_ucr;
-        unsigned int status;
-
-        /* save control registers */
-        imx_port_ucrs_save(port, &old_ucr);
-
-        /* disable interrupts */
-        writel(UCR1_UARTEN, port->membase + UCR1);
-        writel(old_ucr.ucr2 & ~(UCR2_ATEN | UCR2_RTSEN | UCR2_ESCI),
-               port->membase + UCR2);
-        writel(old_ucr.ucr3 & ~(UCR3_DCD | UCR3_RI | UCR3_DTREN),
-               port->membase + UCR3);
-
-        /* drain */
-        do {
-                status = readl(port->membase + USR1);
-        } while (~status & USR1_TRDY);
-
-        /* write */
-        writel(c, port->membase + URTX0);
-
-        /* flush */
-        do {
-                status = readl(port->membase + USR2);
-        } while (~status & USR2_TXDC);
-
-        /* restore control registers */
-        imx_port_ucrs_restore(port, &old_ucr);
-}
-#endif
-
 static struct uart_ops imx_pops = {
         .tx_empty       = imx_tx_empty,
         .set_mctrl      = imx_set_mctrl,
@@ -1184,10 +1092,6 @@ static struct uart_ops imx_pops = {
         .request_port   = imx_request_port,
         .config_port    = imx_config_port,
         .verify_port    = imx_verify_port,
-#if defined(CONFIG_CONSOLE_POLL)
-        .poll_get_char  = imx_poll_get_char,
-        .poll_put_char  = imx_poll_put_char,
-#endif
 };
 
 static struct imx_port *imx_ports[UART_NR];
@@ -1210,17 +1114,13 @@ static void
 imx_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct imx_port *sport = imx_ports[co->index];
-        struct imx_port_ucrs old_ucr;
-        unsigned int ucr1;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sport->port.lock, flags);
+        unsigned int old_ucr1, old_ucr2, ucr1;
 
         /*
-         *      First, save UCR1/2/3 and then disable interrupts
+         *      First, save UCR1/2 and then disable interrupts
          */
-        imx_port_ucrs_save(&sport->port, &old_ucr);
-        ucr1 = old_ucr.ucr1;
+        ucr1 = old_ucr1 = readl(sport->port.membase + UCR1);
+        old_ucr2 = readl(sport->port.membase + UCR2);
 
         if (is_imx1_uart(sport))
                 ucr1 |= IMX1_UCR1_UARTCLKEN;
@@ -1229,19 +1129,18 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
 
         writel(ucr1, sport->port.membase + UCR1);
 
-        writel(old_ucr.ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
+        writel(old_ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
 
         uart_console_write(&sport->port, s, count, imx_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
-         *      and restore UCR1/2/3
+         *      and restore UCR1/2
          */
         while (!(readl(sport->port.membase + USR2) & USR2_TXDC));
 
-        imx_port_ucrs_restore(&sport->port, &old_ucr);
-
-        spin_unlock_irqrestore(&sport->port.lock, flags);
+        writel(old_ucr1, sport->port.membase + UCR1);
+        writel(old_ucr2, sport->port.membase + UCR2);
 }
 
 /*
@@ -1283,7 +1182,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
                 else
                         ucfr_rfdiv = 6 - ucfr_rfdiv;
 
-                uartclk = clk_get_rate(sport->clk_per);
+                uartclk = clk_get_rate(sport->clk);
                 uartclk /= ucfr_rfdiv;
 
                 {       /*
@@ -1366,14 +1265,9 @@ static struct uart_driver imx_reg = {
 static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct imx_port *sport = platform_get_drvdata(dev);
-        unsigned int val;
-
-        /* enable wakeup from i.MX UART */
-        val = readl(sport->port.membase + UCR3);
-        val |= UCR3_AWAKEN;
-        writel(val, sport->port.membase + UCR3);
 
-        uart_suspend_port(&imx_reg, &sport->port);
+        if (sport)
+                uart_suspend_port(&imx_reg, &sport->port);
 
         return 0;
 }
@@ -1381,41 +1275,28 @@ static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
 static int serial_imx_resume(struct platform_device *dev)
 {
         struct imx_port *sport = platform_get_drvdata(dev);
-        unsigned int val;
-
-        /* disable wakeup from i.MX UART */
-        val = readl(sport->port.membase + UCR3);
-        val &= ~UCR3_AWAKEN;
-        writel(val, sport->port.membase + UCR3);
 
-        uart_resume_port(&imx_reg, &sport->port);
+        if (sport)
+                uart_resume_port(&imx_reg, &sport->port);
 
         return 0;
 }
 
 #ifdef CONFIG_OF
-/*
- * This function returns 1 iff pdev isn't a device instatiated by dt, 0 iff it
- * could successfully get all information from dt or a negative errno.
- */
 static int serial_imx_probe_dt(struct imx_port *sport,
                 struct platform_device *pdev)
 {
+        static int portnum = 0;
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *of_id =
                         of_match_device(imx_uart_dt_ids, &pdev->dev);
-        int ret;
 
         if (!np)
-                /* no device tree device */
-                return 1;
+                return -ENODEV;
 
-        ret = of_alias_get_id(np, "serial");
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
-                return ret;
-        }
-        sport->port.line = ret;
+        sport->port.line = portnum++;
+        if (sport->port.line >= UART_NR)
+                return -EINVAL;
 
         if (of_get_property(np, "fsl,uart-has-rtscts", NULL))
                 sport->have_rtscts = 1;
@@ -1431,7 +1312,7 @@ static int serial_imx_probe_dt(struct imx_port *sport,
 static inline int serial_imx_probe_dt(struct imx_port *sport,
                 struct platform_device *pdev)
 {
-        return 1;
+        return -ENODEV;
 }
 #endif
 
@@ -1460,17 +1341,14 @@ static int serial_imx_probe(struct platform_device *pdev)
         void __iomem *base;
         int ret = 0;
         struct resource *res;
-        struct pinctrl *pinctrl;
 
         sport = kzalloc(sizeof(*sport), GFP_KERNEL);
         if (!sport)
                 return -ENOMEM;
 
         ret = serial_imx_probe_dt(sport, pdev);
-        if (ret > 0)
+        if (ret == -ENODEV)
                 serial_imx_probe_pdata(sport, pdev);
-        else if (ret < 0)
-                goto free;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -1500,31 +1378,14 @@ static int serial_imx_probe(struct platform_device *pdev)
         sport->timer.function = imx_timeout;
         sport->timer.data     = (unsigned long)sport;
 
-        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-        if (IS_ERR(pinctrl)) {
-                ret = PTR_ERR(pinctrl);
-                dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", ret);
+        sport->clk = clk_get(&pdev->dev, "uart");
+        if (IS_ERR(sport->clk)) {
+                ret = PTR_ERR(sport->clk);
                 goto unmap;
         }
+        clk_enable(sport->clk);
 
-        sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
-        if (IS_ERR(sport->clk_ipg)) {
-                ret = PTR_ERR(sport->clk_ipg);
-                dev_err(&pdev->dev, "failed to get ipg clk: %d\n", ret);
-                goto unmap;
-        }
-
-        sport->clk_per = devm_clk_get(&pdev->dev, "per");
-        if (IS_ERR(sport->clk_per)) {
-                ret = PTR_ERR(sport->clk_per);
-                dev_err(&pdev->dev, "failed to get per clk: %d\n", ret);
-                goto unmap;
-        }
-
-        clk_prepare_enable(sport->clk_per);
-        clk_prepare_enable(sport->clk_ipg);
-
-        sport->port.uartclk = clk_get_rate(sport->clk_per);
+        sport->port.uartclk = clk_get_rate(sport->clk);
 
         imx_ports[sport->port.line] = sport;
 
@@ -1538,15 +1399,15 @@ static int serial_imx_probe(struct platform_device *pdev)
         ret = uart_add_one_port(&imx_reg, &sport->port);
         if (ret)
                 goto deinit;
-        platform_set_drvdata(pdev, sport);
+        platform_set_drvdata(pdev, &sport->port);
 
         return 0;
 deinit:
         if (pdata && pdata->exit)
                 pdata->exit(pdev);
 clkput:
-        clk_disable_unprepare(sport->clk_per);
-        clk_disable_unprepare(sport->clk_ipg);
+        clk_put(sport->clk);
+        clk_disable(sport->clk);
 unmap:
         iounmap(sport->port.membase);
 free:
@@ -1564,10 +1425,12 @@ static int serial_imx_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        uart_remove_one_port(&imx_reg, &sport->port);
+        if (sport) {
+                uart_remove_one_port(&imx_reg, &sport->port);
+                clk_put(sport->clk);
+        }
 
-        clk_disable_unprepare(sport->clk_per);
-        clk_disable_unprepare(sport->clk_ipg);
+        clk_disable(sport->clk);
 
         if (pdata && pdata->exit)
                 pdata->exit(pdev);
@@ -1606,7 +1469,7 @@ static int __init imx_serial_init(void)
         if (ret != 0)
                 uart_unregister_driver(&imx_reg);
 
-        return ret;
+        return 0;
 }
 
 static void __exit imx_serial_exit(void)
diff --git a/drivers/tty/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
index d8f1d1d5447..ee43efc7bdc 100644
--- a/drivers/tty/serial/ioc3_serial.c
+++ b/drivers/tty/serial/ioc3_serial.c
@@ -13,7 +13,6 @@
  */
 #include <linux/errno.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/circ_buf.h>
 #include <linux/serial_reg.h>
@@ -1120,14 +1119,13 @@ static inline int do_read(struct uart_port *the_port, char *buf, int len)
         struct ioc3_port *port = get_ioc3_port(the_port);
         struct ring *inring;
         struct ring_entry *entry;
-        struct port_hooks *hooks;
+        struct port_hooks *hooks = port->ip_hooks;
         int byte_num;
         char *sc;
         int loop_counter;
 
         BUG_ON(!(len >= 0));
         BUG_ON(!port);
-        hooks = port->ip_hooks;
 
         /* There is a nasty timing issue in the IOC3. When the rx_timer
          * expires or the rx_high condition arises, we take an interrupt.
@@ -2010,7 +2008,7 @@ static int ioc3uart_remove(struct ioc3_submodule *is,
  * @idd: ioc3 driver data for this card
  */
 
-static int
+static int __devinit
 ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)
 {
         struct pci_dev *pdev = idd->pdev;
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index 3e7da10cebb..fcfe82653ac 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -14,8 +14,8 @@
  */
 #include <linux/errno.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/serial.h>
+#include <linux/serialP.h>
 #include <linux/circ_buf.h>
 #include <linux/serial_reg.h>
 #include <linux/module.h>
@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
         BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
                || (type == IOC4_OTHER_INTR_TYPE)));
 
-        i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
+        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 */
@@ -1803,7 +1803,7 @@ static inline int ic4_startup_local(struct uart_port *the_port)
         ioc4_set_proto(port, the_port->mapbase);
 
         /* set the speed of the serial port */
-        ioc4_change_speed(the_port, &state->port.tty->termios,
+        ioc4_change_speed(the_port, state->port.tty->termios,
                           (struct ktermios *)0);
 
         return 0;
@@ -2069,14 +2069,13 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
         struct ioc4_port *port = get_ioc4_port(the_port, 0);
         struct ring *inring;
         struct ring_entry *entry;
-        struct hooks *hooks;
+        struct hooks *hooks = port->ip_hooks;
         int byte_num;
         char *sc;
         int loop_counter;
 
         BUG_ON(!(len >= 0));
         BUG_ON(!port);
-        hooks = port->ip_hooks;
 
         /* There is a nasty timing issue in the IOC4. When the rx_timer
          * expires or the rx_high condition arises, we take an interrupt.
diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
index 844d5e4eb1a..5b837e749c1 100644
--- a/drivers/tty/serial/jsm/jsm.h
+++ b/drivers/tty/serial/jsm/jsm.h
@@ -57,11 +57,9 @@ enum {
         DBG_CARR        = 0x10000,
 };
 
-#define jsm_dbg(nlevel, pdev, fmt, ...)                         \
-do {                                                            \
-        if (DBG_##nlevel & jsm_debug)                           \
-                dev_dbg(pdev->dev, fmt, ##__VA_ARGS__);         \
-} while (0)
+#define jsm_printk(nlevel, klevel, pdev, fmt, args...)  \
+        if ((DBG_##nlevel & jsm_debug))                 \
+        dev_printk(KERN_##klevel, pdev->dev, fmt, ## args)
 
 #define MAXLINES        256
 #define MAXPORTS        8
@@ -90,6 +88,7 @@ do {								\
 
 /* 4 extra for alignment play space */
 #define WRITEBUFLEN     ((4096) + 4)
+#define MYFLIPLEN       N_TTY_BUF_SIZE
 
 #define JSM_VERSION     "jsm: 1.2-1-INKERNEL"
 #define JSM_PARTNUM     "40002438_A-INKERNEL"
@@ -151,6 +150,7 @@ struct jsm_board
         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 */
 
         u32             bd_dividend;    /* Board/UARTs specific dividend */
 
@@ -177,6 +177,7 @@ struct jsm_board
 #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 */
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index a47d882d674..6c12d94e6d3 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -24,7 +24,7 @@
  *
  *
  ***********************************************************************/
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 
@@ -54,7 +54,7 @@ static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
 static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev);
 static void jsm_io_resume(struct pci_dev *pdev);
 
-static const struct pci_error_handlers jsm_err_handler = {
+static struct pci_error_handlers jsm_err_handler = {
         .error_detected = jsm_io_error_detected,
         .slot_reset = jsm_io_slot_reset,
         .resume = jsm_io_resume,
@@ -64,7 +64,7 @@ int jsm_debug;
 module_param(jsm_debug, int, 0);
 MODULE_PARM_DESC(jsm_debug, "Driver debugging level");
 
-static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int rc = 0;
         struct jsm_board *brd;
@@ -107,7 +107,8 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         brd->irq = pdev->irq;
 
-        jsm_dbg(INIT, &brd->pci_dev, "jsm_found_board - NEO adapter\n");
+        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);
@@ -159,10 +160,27 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         dev_info(&pdev->dev, "board %d: Digi Neo (rev %d), irq %d\n",
                         adapter_count, 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 = kzalloc(MYFLIPLEN, GFP_KERNEL);
+        if (!brd->flipbuf) {
+                /* XXX: leaking all resources from jsm_tty_init and
+                        jsm_uart_port_init here! */
+                dev_err(&pdev->dev, "memory allocation for flipbuf failed\n");
+                rc = -ENOMEM;
+                goto out_free_uart;
+        }
+
         pci_set_drvdata(pdev, brd);
         pci_save_state(pdev);
 
         return 0;
+ out_free_uart:
+        jsm_remove_uart_port(brd);
  out_free_irq:
         jsm_remove_uart_port(brd);
         free_irq(brd->irq, brd);
@@ -178,7 +196,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         return rc;
 }
 
-static void jsm_remove_one(struct pci_dev *pdev)
+static void __devexit jsm_remove_one(struct pci_dev *pdev)
 {
         struct jsm_board *brd = pci_get_drvdata(pdev);
         int i = 0;
@@ -199,6 +217,7 @@ static void jsm_remove_one(struct pci_dev *pdev)
 
         pci_release_regions(pdev);
         pci_disable_device(pdev);
+        kfree(brd->flipbuf);
         kfree(brd);
 }
 
@@ -217,7 +236,7 @@ static struct pci_driver jsm_driver = {
         .name           = "jsm",
         .id_table       = jsm_pci_tbl,
         .probe          = jsm_probe_one,
-        .remove         = jsm_remove_one,
+        .remove         = __devexit_p(jsm_remove_one),
         .err_handler    = &jsm_err_handler,
 };
 
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index dfaf4882641..bd6e84699e1 100644
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -52,7 +52,7 @@ static void neo_set_cts_flow_control(struct jsm_channel *ch)
         ier = readb(&ch->ch_neo_uart->ier);
         efr = readb(&ch->ch_neo_uart->efr);
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting CTSFLOW\n");
 
         /* Turn on auto CTS flow control */
         ier |= (UART_17158_IER_CTSDSR);
@@ -83,7 +83,7 @@ static void neo_set_rts_flow_control(struct jsm_channel *ch)
         ier = readb(&ch->ch_neo_uart->ier);
         efr = readb(&ch->ch_neo_uart->efr);
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting RTSFLOW\n");
 
         /* Turn on auto RTS flow control */
         ier |= (UART_17158_IER_RTSDTR);
@@ -123,7 +123,7 @@ static void neo_set_ixon_flow_control(struct jsm_channel *ch)
         ier = readb(&ch->ch_neo_uart->ier);
         efr = readb(&ch->ch_neo_uart->efr);
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXON FLOW\n");
 
         /* Turn off auto CTS flow control */
         ier &= ~(UART_17158_IER_CTSDSR);
@@ -160,7 +160,7 @@ static void neo_set_ixoff_flow_control(struct jsm_channel *ch)
         ier = readb(&ch->ch_neo_uart->ier);
         efr = readb(&ch->ch_neo_uart->efr);
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Setting IXOFF FLOW\n");
 
         /* Turn off auto RTS flow control */
         ier &= ~(UART_17158_IER_RTSDTR);
@@ -198,7 +198,7 @@ static void neo_set_no_input_flow_control(struct jsm_channel *ch)
         ier = readb(&ch->ch_neo_uart->ier);
         efr = readb(&ch->ch_neo_uart->efr);
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Input FLOW\n");
 
         /* Turn off auto RTS flow control */
         ier &= ~(UART_17158_IER_RTSDTR);
@@ -237,7 +237,7 @@ static void neo_set_no_output_flow_control(struct jsm_channel *ch)
         ier = readb(&ch->ch_neo_uart->ier);
         efr = readb(&ch->ch_neo_uart->efr);
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");
+        jsm_printk(PARAM, INFO, &ch->ch_bd->pci_dev, "Unsetting Output FLOW\n");
 
         /* Turn off auto CTS flow control */
         ier &= ~(UART_17158_IER_CTSDSR);
@@ -276,7 +276,7 @@ static inline void neo_set_new_start_stop_chars(struct jsm_channel *ch)
         if (ch->ch_c_cflag & CRTSCTS)
                 return;
 
-        jsm_dbg(PARAM, &ch->ch_bd->pci_dev, "start\n");
+        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);
@@ -455,7 +455,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
                  * I hope thats okay with everyone? Yes? Good.
                  */
                 while (qleft < 1) {
-                        jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                        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]);
 
@@ -467,8 +467,8 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
                 memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, 1);
                 ch->ch_equeue[head] = (u8) linestatus;
 
-                jsm_dbg(READ, &ch->ch_bd->pci_dev, "DATA/LSR pair: %x %x\n",
-                        ch->ch_rqueue[head], ch->ch_equeue[head]);
+                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;
@@ -521,8 +521,8 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
                         ch->ch_cached_lsr &= ~(UART_LSR_THRE);
 
                         writeb(circ->buf[circ->tail], &ch->ch_neo_uart->txrx);
-                        jsm_dbg(WRITE, &ch->ch_bd->pci_dev,
-                                "Tx data: %x\n", circ->buf[circ->tail]);
+                        jsm_printk(WRITE, INFO, &ch->ch_bd->pci_dev,
+                                        "Tx data: %x\n", circ->buf[circ->head]);
                         circ->tail = (circ->tail + 1) & (UART_XMIT_SIZE - 1);
                         ch->ch_txcount++;
                 }
@@ -575,9 +575,8 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
 {
         u8 msignals = signals;
 
-        jsm_dbg(MSIGS, &ch->ch_bd->pci_dev,
-                "neo_parse_modem: port: %d msignals: %x\n",
-                ch->ch_portnum, msignals);
+        jsm_printk(MSIGS, INFO, &ch->ch_bd->pci_dev,
+                        "neo_parse_modem: port: %d msignals: %x\n", ch->ch_portnum, msignals);
 
         /* Scrub off lower bits. They signify delta's, which I don't care about */
         /* Keep DDCD and DDSR though */
@@ -607,8 +606,8 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
         else
                 ch->ch_mistat &= ~UART_MSR_CTS;
 
-        jsm_dbg(MSIGS, &ch->ch_bd->pci_dev,
-                "Port: %d DTR: %d RTS: %d CTS: %d DSR: %d " "RI: %d CD: %d\n",
+        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),
@@ -650,8 +649,8 @@ static void neo_flush_uart_write(struct jsm_channel *ch)
                 /* Check to see if the UART feels it completely flushed the FIFO. */
                 tmp = readb(&ch->ch_neo_uart->isr_fcr);
                 if (tmp & 4) {
-                        jsm_dbg(IOCTL, &ch->ch_bd->pci_dev,
-                                "Still flushing TX UART... i: %d\n", i);
+                        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev,
+                                        "Still flushing TX UART... i: %d\n", i);
                         udelay(10);
                 }
                 else
@@ -682,8 +681,8 @@ static void neo_flush_uart_read(struct jsm_channel *ch)
                 /* Check to see if the UART feels it completely flushed the FIFO. */
                 tmp = readb(&ch->ch_neo_uart->isr_fcr);
                 if (tmp & 2) {
-                        jsm_dbg(IOCTL, &ch->ch_bd->pci_dev,
-                                "Still flushing RX UART... i: %d\n", i);
+                        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev,
+                                        "Still flushing RX UART... i: %d\n", i);
                         udelay(10);
                 }
                 else
@@ -706,9 +705,8 @@ static void neo_clear_break(struct jsm_channel *ch, int force)
                 writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr);
 
                 ch->ch_flags &= ~(CH_BREAK_SENDING);
-                jsm_dbg(IOCTL, &ch->ch_bd->pci_dev,
-                        "clear break Finishing UART_LCR_SBC! finished: %lx\n",
-                        jiffies);
+                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);
@@ -750,8 +748,8 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
                  */
                 isr &= ~(UART_17158_IIR_FIFO_ENABLED);
 
-                jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d isr: %x\n",
-                        __FILE__, __LINE__, isr);
+                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 */
@@ -774,9 +772,8 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
                 if (isr & UART_17158_IIR_XONXOFF) {
                         cause = readb(&ch->ch_neo_uart->xoffchar1);
 
-                        jsm_dbg(INTR, &ch->ch_bd->pci_dev,
-                                "Port %d. Got ISR_XONXOFF: cause:%x\n",
-                                port, cause);
+                        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
@@ -789,19 +786,17 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
                                 if (brd->channels[port]->ch_flags & CH_STOP) {
                                         ch->ch_flags &= ~(CH_STOP);
                                 }
-                                jsm_dbg(INTR, &ch->ch_bd->pci_dev,
-                                        "Port %d. XON detected in incoming data\n",
-                                        port);
+                                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_dbg(INTR, &ch->ch_bd->pci_dev,
-                                                "Setting CH_STOP\n");
+                                        jsm_printk(INTR, INFO, &ch->ch_bd->pci_dev,
+                                                        "Setting CH_STOP\n");
                                 }
-                                jsm_dbg(INTR, &ch->ch_bd->pci_dev,
-                                        "Port: %d. XOFF detected in incoming data\n",
-                                        port);
+                                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);
                 }
@@ -830,8 +825,8 @@ static inline void neo_parse_isr(struct jsm_board *brd, u32 port)
                 }
 
                 /* Parse any modem signal changes */
-                jsm_dbg(INTR, &ch->ch_bd->pci_dev,
-                        "MOD_STAT: sending to parse_modem_sigs\n");
+                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));
         }
 }
@@ -854,8 +849,8 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
 
         linestatus = readb(&ch->ch_neo_uart->lsr);
 
-        jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d port: %d linestatus: %x\n",
-                __FILE__, __LINE__, port, linestatus);
+        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;
 
@@ -874,7 +869,7 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
          *to do the special RX+LSR read for this FIFO load.
          */
         if (linestatus & UART_17158_RX_FIFO_DATA_ERROR)
-                jsm_dbg(INTR, &ch->ch_bd->pci_dev,
+                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);
 
@@ -885,21 +880,20 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
 
         if (linestatus & UART_LSR_PE) {
                 ch->ch_err_parity++;
-                jsm_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d Port: %d. PAR ERR!\n",
-                        __FILE__, __LINE__, port);
+                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_dbg(INTR, &ch->ch_bd->pci_dev, "%s:%d Port: %d. FRM ERR!\n",
-                        __FILE__, __LINE__, port);
+                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_dbg(INTR, &ch->ch_bd->pci_dev,
-                        "%s:%d Port: %d. BRK INTR!\n",
-                        __FILE__, __LINE__, port);
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d. BRK INTR!\n", __FILE__, __LINE__, port);
         }
 
         if (linestatus & UART_LSR_OE) {
@@ -910,9 +904,8 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
                  * Probably we should eventually have an orun stat in our driver...
                  */
                 ch->ch_err_overrun++;
-                jsm_dbg(INTR, &ch->ch_bd->pci_dev,
-                        "%s:%d Port: %d. Rx Overrun!\n",
-                        __FILE__, __LINE__, port);
+                jsm_printk(INTR, DEBUG, &ch->ch_bd->pci_dev,
+                        "%s:%d Port: %d. Rx Overrun!\n", __FILE__, __LINE__, port);
         }
 
         if (linestatus & UART_LSR_THRE) {
@@ -1135,11 +1128,11 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
          */
         uart_poll = readl(brd->re_map_membase + UART_17158_POLL_ADDR_OFFSET);
 
-        jsm_dbg(INTR, &brd->pci_dev, "%s:%d uart_poll: %x\n",
-                __FILE__, __LINE__, uart_poll);
+        jsm_printk(INTR, INFO, &brd->pci_dev,
+                "%s:%d uart_poll: %x\n", __FILE__, __LINE__, uart_poll);
 
         if (!uart_poll) {
-                jsm_dbg(INTR, &brd->pci_dev,
+                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;
@@ -1165,15 +1158,15 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
                         continue;
                 }
 
-                jsm_dbg(INTR, &brd->pci_dev, "%s:%d port: %x type: %x\n",
-                        __FILE__, __LINE__, port, type);
+                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_dbg(INTR, &brd->pci_dev,
+                        jsm_printk(INTR, ERR, &brd->pci_dev,
                                 "Interrupt with no type! port: %d\n", port);
                         continue;
                 }
@@ -1238,16 +1231,15 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
                          * these once and awhile.
                          * Its harmless, just ignore it and move on.
                          */
-                        jsm_dbg(INTR, &brd->pci_dev,
-                                "%s:%d Unknown Interrupt type: %x\n",
-                                __FILE__, __LINE__, type);
+                        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_dbg(INTR, &brd->pci_dev, "finish\n");
+        jsm_printk(INTR, INFO, &brd->pci_dev, "finish.\n");
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index 4c00c5550b1..434bd881fca 100644
--- a/drivers/tty/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
@@ -43,7 +43,7 @@ static inline int jsm_get_mstat(struct jsm_channel *ch)
         unsigned char mstat;
         unsigned result;
 
-        jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "start\n");
+        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "start\n");
 
         mstat = (ch->ch_mostat | ch->ch_mistat);
 
@@ -62,7 +62,7 @@ static inline int jsm_get_mstat(struct jsm_channel *ch)
         if (mstat & UART_MSR_DCD)
                 result |= TIOCM_CD;
 
-        jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "finish\n");
+        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
         return result;
 }
 
@@ -79,14 +79,14 @@ static unsigned int jsm_tty_get_mctrl(struct uart_port *port)
         int result;
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
 
         result = jsm_get_mstat(channel);
 
         if (result < 0)
                 return -ENXIO;
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
 
         return result;
 }
@@ -100,7 +100,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
 
         if (mctrl & TIOCM_RTS)
                 channel->ch_mostat |= UART_MCR_RTS;
@@ -114,7 +114,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
 
         channel->ch_bd->bd_ops->assert_modem_signals(channel);
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
         udelay(10);
 }
 
@@ -135,23 +135,23 @@ static void jsm_tty_start_tx(struct uart_port *port)
 {
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
 
         channel->ch_flags &= ~(CH_STOP);
         jsm_tty_write(port);
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_tty_stop_tx(struct uart_port *port)
 {
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "start\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "start\n");
 
         channel->ch_flags |= (CH_STOP);
 
-        jsm_dbg(IOCTL, &channel->ch_bd->pci_dev, "finish\n");
+        jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_tty_send_xchar(struct uart_port *port, char ch)
@@ -161,7 +161,7 @@ static void jsm_tty_send_xchar(struct uart_port *port, char ch)
         struct ktermios *termios;
 
         spin_lock_irqsave(&port->lock, lock_flags);
-        termios = &port->state->port.tty->termios;
+        termios = port->state->port.tty->termios;
         if (ch == termios->c_cc[VSTART])
                 channel->ch_bd->bd_ops->send_start_character(channel);
 
@@ -216,16 +216,16 @@ static int jsm_tty_open(struct uart_port *port)
         if (!channel->ch_rqueue) {
                 channel->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL);
                 if (!channel->ch_rqueue) {
-                        jsm_dbg(INIT, &channel->ch_bd->pci_dev,
-                                "unable to allocate read queue buf\n");
+                        jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
+                                "unable to allocate read queue buf");
                         return -ENOMEM;
                 }
         }
         if (!channel->ch_equeue) {
                 channel->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL);
                 if (!channel->ch_equeue) {
-                        jsm_dbg(INIT, &channel->ch_bd->pci_dev,
-                                "unable to allocate error queue buf\n");
+                        jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
+                                "unable to allocate error queue buf");
                         return -ENOMEM;
                 }
         }
@@ -234,7 +234,7 @@ static int jsm_tty_open(struct uart_port *port)
         /*
          * Initialize if neither terminal is open.
          */
-        jsm_dbg(OPEN, &channel->ch_bd->pci_dev,
+        jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev,
                 "jsm_open: initializing channel in open...\n");
 
         /*
@@ -250,7 +250,7 @@ static int jsm_tty_open(struct uart_port *port)
         channel->ch_cached_lsr = 0;
         channel->ch_stops_sent = 0;
 
-        termios = &port->state->port.tty->termios;
+        termios = port->state->port.tty->termios;
         channel->ch_c_cflag     = termios->c_cflag;
         channel->ch_c_iflag     = termios->c_iflag;
         channel->ch_c_oflag     = termios->c_oflag;
@@ -270,7 +270,7 @@ static int jsm_tty_open(struct uart_port *port)
 
         channel->ch_open_count++;
 
-        jsm_dbg(OPEN, &channel->ch_bd->pci_dev, "finish\n");
+        jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev, "finish\n");
         return 0;
 }
 
@@ -280,10 +280,10 @@ static void jsm_tty_close(struct uart_port *port)
         struct ktermios *ts;
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
-        jsm_dbg(CLOSE, &channel->ch_bd->pci_dev, "start\n");
+        jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n");
 
         bd = channel->ch_bd;
-        ts = &port->state->port.tty->termios;
+        ts = port->state->port.tty->termios;
 
         channel->ch_flags &= ~(CH_STOPI);
 
@@ -293,7 +293,7 @@ static void jsm_tty_close(struct uart_port *port)
          * If we have HUPCL set, lower DTR and RTS
          */
         if (channel->ch_c_cflag & HUPCL) {
-                jsm_dbg(CLOSE, &channel->ch_bd->pci_dev,
+                jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev,
                         "Close. HUPCL set, dropping DTR/RTS\n");
 
                 /* Drop RTS/DTR */
@@ -304,7 +304,7 @@ static void jsm_tty_close(struct uart_port *port)
         /* Turn off UART interrupts for this port */
         channel->ch_bd->bd_ops->uart_off(channel);
 
-        jsm_dbg(CLOSE, &channel->ch_bd->pci_dev, "finish\n");
+        jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_tty_set_termios(struct uart_port *port,
@@ -371,7 +371,7 @@ static struct uart_ops jsm_ops = {
  * 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 __devinit jsm_tty_init(struct jsm_board *brd)
 {
         int i;
         void __iomem *vaddr;
@@ -380,7 +380,7 @@ int jsm_tty_init(struct jsm_board *brd)
         if (!brd)
                 return -ENXIO;
 
-        jsm_dbg(INIT, &brd->pci_dev, "start\n");
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
 
         /*
          * Initialize board structure elements.
@@ -401,9 +401,9 @@ int jsm_tty_init(struct jsm_board *brd)
                          */
                         brd->channels[i] = kzalloc(sizeof(struct jsm_channel), GFP_KERNEL);
                         if (!brd->channels[i]) {
-                                jsm_dbg(CORE, &brd->pci_dev,
+                                jsm_printk(CORE, ERR, &brd->pci_dev,
                                         "%s:%d Unable to allocate memory for channel struct\n",
-                                        __FILE__, __LINE__);
+                                                         __FILE__, __LINE__);
                         }
                 }
         }
@@ -431,7 +431,7 @@ int jsm_tty_init(struct jsm_board *brd)
                 init_waitqueue_head(&ch->ch_flags_wait);
         }
 
-        jsm_dbg(INIT, &brd->pci_dev, "finish\n");
+        jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
         return 0;
 }
 
@@ -444,7 +444,7 @@ int jsm_uart_port_init(struct jsm_board *brd)
         if (!brd)
                 return -ENXIO;
 
-        jsm_dbg(INIT, &brd->pci_dev, "start\n");
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
 
         /*
          * Initialize board structure elements.
@@ -481,7 +481,7 @@ int jsm_uart_port_init(struct jsm_board *brd)
                         printk(KERN_INFO "jsm: Port %d added\n", i);
         }
 
-        jsm_dbg(INIT, &brd->pci_dev, "finish\n");
+        jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
         return 0;
 }
 
@@ -493,7 +493,7 @@ int jsm_remove_uart_port(struct jsm_board *brd)
         if (!brd)
                 return -ENXIO;
 
-        jsm_dbg(INIT, &brd->pci_dev, "start\n");
+        jsm_printk(INIT, INFO, &brd->pci_dev, "start\n");
 
         /*
          * Initialize board structure elements.
@@ -513,7 +513,7 @@ int jsm_remove_uart_port(struct jsm_board *brd)
                 uart_remove_one_port(&jsm_uart_driver, &brd->channels[i]->uart_port);
         }
 
-        jsm_dbg(INIT, &brd->pci_dev, "finish\n");
+        jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
         return 0;
 }
 
@@ -531,7 +531,7 @@ void jsm_input(struct jsm_channel *ch)
         int s = 0;
         int i = 0;
 
-        jsm_dbg(READ, &ch->ch_bd->pci_dev, "start\n");
+        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start\n");
 
         if (!ch)
                 return;
@@ -560,18 +560,17 @@ void jsm_input(struct jsm_channel *ch)
                 return;
         }
 
-        jsm_dbg(READ, &ch->ch_bd->pci_dev, "start\n");
+        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) ) {
+                !(tp->termios->c_cflag & CREAD) ) {
 
-                jsm_dbg(READ, &ch->ch_bd->pci_dev,
-                        "input. dropping %d bytes on port %d...\n",
-                        data_len, ch->ch_portnum);
+                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 */
@@ -586,17 +585,17 @@ void jsm_input(struct jsm_channel *ch)
          */
         if (ch->ch_flags & CH_STOPI) {
                 spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-                jsm_dbg(READ, &ch->ch_bd->pci_dev,
+                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_dbg(READ, &ch->ch_bd->pci_dev, "start 2\n");
+        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start 2\n");
 
         if (data_len <= 0) {
                 spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-                jsm_dbg(READ, &ch->ch_bd->pci_dev, "jsm_input 1\n");
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "jsm_input 1\n");
                 return;
         }
 
@@ -654,7 +653,7 @@ void jsm_input(struct jsm_channel *ch)
         /* Tell the tty layer its okay to "eat" the data now */
         tty_flip_buffer_push(tp);
 
-        jsm_dbg(IOCTL, &ch->ch_bd->pci_dev, "finish\n");
+        jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
 }
 
 static void jsm_carrier(struct jsm_channel *ch)
@@ -664,7 +663,7 @@ static void jsm_carrier(struct jsm_channel *ch)
         int virt_carrier = 0;
         int phys_carrier = 0;
 
-        jsm_dbg(CARR, &ch->ch_bd->pci_dev, "start\n");
+        jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev, "start\n");
         if (!ch)
                 return;
 
@@ -674,16 +673,16 @@ static void jsm_carrier(struct jsm_channel *ch)
                 return;
 
         if (ch->ch_mistat & UART_MSR_DCD) {
-                jsm_dbg(CARR, &ch->ch_bd->pci_dev, "mistat: %x D_CD: %x\n",
-                        ch->ch_mistat, 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_dbg(CARR, &ch->ch_bd->pci_dev, "DCD: physical: %d virt: %d\n",
-                phys_carrier, virt_carrier);
+        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.
@@ -695,7 +694,8 @@ static void jsm_carrier(struct jsm_channel *ch)
                  * for carrier in the open routine.
                  */
 
-                jsm_dbg(CARR, &ch->ch_bd->pci_dev, "carrier: virt DCD rose\n");
+                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);
@@ -711,7 +711,7 @@ static void jsm_carrier(struct jsm_channel *ch)
                  * for carrier in the open routine.
                  */
 
-                jsm_dbg(CARR, &ch->ch_bd->pci_dev,
+                jsm_printk(CARR, INFO, &ch->ch_bd->pci_dev,
                         "carrier: physical DCD rose\n");
 
                 if (waitqueue_active(&(ch->ch_flags_wait)))
@@ -790,8 +790,8 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                         if(!(ch->ch_flags & CH_RECEIVER_OFF)) {
                                 bd_ops->disable_receiver(ch);
                                 ch->ch_flags |= (CH_RECEIVER_OFF);
-                                jsm_dbg(READ, &ch->ch_bd->pci_dev,
-                                        "Internal queue hit hilevel mark (%d)! Turning off interrupts\n",
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "Internal queue hit hilevel mark (%d)! Turning off interrupts.\n",
                                         qleft);
                         }
                 }
@@ -800,9 +800,8 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                         if (ch->ch_stops_sent <= MAX_STOPS_SENT) {
                                 bd_ops->send_stop_character(ch);
                                 ch->ch_stops_sent++;
-                                jsm_dbg(READ, &ch->ch_bd->pci_dev,
-                                        "Sending stop char! Times sent: %x\n",
-                                        ch->ch_stops_sent);
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "Sending stop char! Times sent: %x\n", ch->ch_stops_sent);
                         }
                 }
         }
@@ -828,8 +827,8 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                         if (ch->ch_flags & CH_RECEIVER_OFF) {
                                 bd_ops->enable_receiver(ch);
                                 ch->ch_flags &= ~(CH_RECEIVER_OFF);
-                                jsm_dbg(READ, &ch->ch_bd->pci_dev,
-                                        "Internal queue hit lowlevel mark (%d)! Turning on interrupts\n",
+                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
+                                        "Internal queue hit lowlevel mark (%d)! Turning on interrupts.\n",
                                         qleft);
                         }
                 }
@@ -837,8 +836,7 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
                 else if (ch->ch_c_iflag & IXOFF && ch->ch_stops_sent) {
                         ch->ch_stops_sent = 0;
                         bd_ops->send_start_character(ch);
-                        jsm_dbg(READ, &ch->ch_bd->pci_dev,
-                                "Sending start char!\n");
+                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "Sending start char!\n");
                 }
         }
 }
diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
deleted file mode 100644
index 6ac2b797a76..00000000000
--- a/drivers/tty/serial/kgdb_nmi.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * KGDB NMI serial console
- *
- * Copyright 2010 Google, Inc.
- *                Arve Hjønnevåg <arve@android.com>
- *                Colin Cross <ccross@android.com>
- * Copyright 2012 Linaro Ltd.
- *                Anton Vorontsov <anton.vorontsov@linaro.org>
- *
- * 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/kernel.h>
-#include <linux/module.h>
-#include <linux/compiler.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/atomic.h>
-#include <linux/console.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/interrupt.h>
-#include <linux/hrtimer.h>
-#include <linux/tick.h>
-#include <linux/kfifo.h>
-#include <linux/kgdb.h>
-#include <linux/kdb.h>
-
-static int kgdb_nmi_knock = 1;
-module_param_named(knock, kgdb_nmi_knock, int, 0600);
-MODULE_PARM_DESC(knock, "if set to 1 (default), the special '$3#33' command " \
-                        "must be used to enter the debugger; when set to 0, " \
-                        "hitting return key is enough to enter the debugger; " \
-                        "when set to -1, the debugger is entered immediately " \
-                        "upon NMI");
-
-static char *kgdb_nmi_magic = "$3#33";
-module_param_named(magic, kgdb_nmi_magic, charp, 0600);
-MODULE_PARM_DESC(magic, "magic sequence to enter NMI debugger (default $3#33)");
-
-static bool kgdb_nmi_tty_enabled;
-
-static void kgdb_nmi_console_write(struct console *co, const char *s, uint c)
-{
-        int i;
-
-        if (!kgdb_nmi_tty_enabled || atomic_read(&kgdb_active) >= 0)
-                return;
-
-        for (i = 0; i < c; i++)
-                dbg_io_ops->write_char(s[i]);
-}
-
-static struct tty_driver *kgdb_nmi_tty_driver;
-
-static struct tty_driver *kgdb_nmi_console_device(struct console *co, int *idx)
-{
-        *idx = co->index;
-        return kgdb_nmi_tty_driver;
-}
-
-static struct console kgdb_nmi_console = {
-        .name   = "ttyNMI",
-        .write  = kgdb_nmi_console_write,
-        .device = kgdb_nmi_console_device,
-        .flags  = CON_PRINTBUFFER | CON_ANYTIME | CON_ENABLED,
-        .index  = -1,
-};
-
-/*
- * This is usually the maximum rate on debug ports. We make fifo large enough
- * to make copy-pasting to the terminal usable.
- */
-#define KGDB_NMI_BAUD           115200
-#define KGDB_NMI_FIFO_SIZE      roundup_pow_of_two(KGDB_NMI_BAUD / 8 / HZ)
-
-struct kgdb_nmi_tty_priv {
-        struct tty_port port;
-        struct tasklet_struct tlet;
-        STRUCT_KFIFO(char, KGDB_NMI_FIFO_SIZE) fifo;
-};
-
-static struct kgdb_nmi_tty_priv *kgdb_nmi_port_to_priv(struct tty_port *port)
-{
-        return container_of(port, struct kgdb_nmi_tty_priv, port);
-}
-
-/*
- * Our debugging console is polled in a tasklet, so we'll check for input
- * every tick. In HZ-less mode, we should program the next tick.  We have
- * to use the lowlevel stuff as no locks should be grabbed.
- */
-#ifdef CONFIG_HIGH_RES_TIMERS
-static void kgdb_tty_poke(void)
-{
-        tick_program_event(ktime_get(), 0);
-}
-#else
-static inline void kgdb_tty_poke(void) {}
-#endif
-
-static struct tty_port *kgdb_nmi_port;
-
-static void kgdb_tty_recv(int ch)
-{
-        struct kgdb_nmi_tty_priv *priv;
-        char c = ch;
-
-        if (!kgdb_nmi_port || ch < 0)
-                return;
-        /*
-         * Can't use port->tty->driver_data as tty might be not there. Tasklet
-         * will check for tty and will get the ref, but here we don't have to
-         * do that, and actually, we can't: we're in NMI context, no locks are
-         * possible.
-         */
-        priv = kgdb_nmi_port_to_priv(kgdb_nmi_port);
-        kfifo_in(&priv->fifo, &c, 1);
-        kgdb_tty_poke();
-}
-
-static int kgdb_nmi_poll_one_knock(void)
-{
-        static int n;
-        int c = -1;
-        const char *magic = kgdb_nmi_magic;
-        size_t m = strlen(magic);
-        bool printch = 0;
-
-        c = dbg_io_ops->read_char();
-        if (c == NO_POLL_CHAR)
-                return c;
-
-        if (!kgdb_nmi_knock && (c == '\r' || c == '\n')) {
-                return 1;
-        } else if (c == magic[n]) {
-                n = (n + 1) % m;
-                if (!n)
-                        return 1;
-                printch = 1;
-        } else {
-                n = 0;
-        }
-
-        if (kgdb_nmi_tty_enabled) {
-                kgdb_tty_recv(c);
-                return 0;
-        }
-
-        if (printch) {
-                kdb_printf("%c", c);
-                return 0;
-        }
-
-        kdb_printf("\r%s %s to enter the debugger> %*s",
-                   kgdb_nmi_knock ? "Type" : "Hit",
-                   kgdb_nmi_knock ? magic  : "<return>", (int)m, "");
-        while (m--)
-                kdb_printf("\b");
-        return 0;
-}
-
-/**
- * kgdb_nmi_poll_knock - Check if it is time to enter the debugger
- *
- * "Serial ports are often noisy, especially when muxed over another port (we
- * often use serial over the headset connector). Noise on the async command
- * line just causes characters that are ignored, on a command line that blocked
- * execution noise would be catastrophic." -- Colin Cross
- *
- * So, this function implements KGDB/KDB knocking on the serial line: we won't
- * enter the debugger until we receive a known magic phrase (which is actually
- * "$3#33", known as "escape to KDB" command. There is also a relaxed variant
- * of knocking, i.e. just pressing the return key is enough to enter the
- * debugger. And if knocking is disabled, the function always returns 1.
- */
-bool kgdb_nmi_poll_knock(void)
-{
-        if (kgdb_nmi_knock < 0)
-                return 1;
-
-        while (1) {
-                int ret;
-
-                ret = kgdb_nmi_poll_one_knock();
-                if (ret == NO_POLL_CHAR)
-                        return 0;
-                else if (ret == 1)
-                        break;
-        }
-        return 1;
-}
-
-/*
- * The tasklet is cheap, it does not cause wakeups when reschedules itself,
- * instead it waits for the next tick.
- */
-static void kgdb_nmi_tty_receiver(unsigned long data)
-{
-        struct kgdb_nmi_tty_priv *priv = (void *)data;
-        struct tty_struct *tty;
-        char ch;
-
-        tasklet_schedule(&priv->tlet);
-
-        if (likely(!kgdb_nmi_tty_enabled || !kfifo_len(&priv->fifo)))
-                return;
-
-        /* Port is there, but tty might be hung up, check. */
-        tty = tty_port_tty_get(kgdb_nmi_port);
-        if (!tty)
-                return;
-
-        while (kfifo_out(&priv->fifo, &ch, 1))
-                tty_insert_flip_char(priv->port.tty, ch, TTY_NORMAL);
-        tty_flip_buffer_push(priv->port.tty);
-
-        tty_kref_put(tty);
-}
-
-static int kgdb_nmi_tty_activate(struct tty_port *port, struct tty_struct *tty)
-{
-        struct kgdb_nmi_tty_priv *priv = tty->driver_data;
-
-        kgdb_nmi_port = port;
-        tasklet_schedule(&priv->tlet);
-        return 0;
-}
-
-static void kgdb_nmi_tty_shutdown(struct tty_port *port)
-{
-        struct kgdb_nmi_tty_priv *priv = port->tty->driver_data;
-
-        tasklet_kill(&priv->tlet);
-        kgdb_nmi_port = NULL;
-}
-
-static const struct tty_port_operations kgdb_nmi_tty_port_ops = {
-        .activate       = kgdb_nmi_tty_activate,
-        .shutdown       = kgdb_nmi_tty_shutdown,
-};
-
-static int kgdb_nmi_tty_install(struct tty_driver *drv, struct tty_struct *tty)
-{
-        struct kgdb_nmi_tty_priv *priv;
-        int ret;
-
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-
-        INIT_KFIFO(priv->fifo);
-        tasklet_init(&priv->tlet, kgdb_nmi_tty_receiver, (unsigned long)priv);
-        tty_port_init(&priv->port);
-        priv->port.ops = &kgdb_nmi_tty_port_ops;
-        tty->driver_data = priv;
-
-        ret = tty_port_install(&priv->port, drv, tty);
-        if (ret) {
-                pr_err("%s: can't install tty port: %d\n", __func__, ret);
-                goto err;
-        }
-        return 0;
-err:
-        tty_port_destroy(&priv->port);
-        kfree(priv);
-        return ret;
-}
-
-static void kgdb_nmi_tty_cleanup(struct tty_struct *tty)
-{
-        struct kgdb_nmi_tty_priv *priv = tty->driver_data;
-
-        tty->driver_data = NULL;
-        tty_port_destroy(&priv->port);
-        kfree(priv);
-}
-
-static int kgdb_nmi_tty_open(struct tty_struct *tty, struct file *file)
-{
-        struct kgdb_nmi_tty_priv *priv = tty->driver_data;
-
-        return tty_port_open(&priv->port, tty, file);
-}
-
-static void kgdb_nmi_tty_close(struct tty_struct *tty, struct file *file)
-{
-        struct kgdb_nmi_tty_priv *priv = tty->driver_data;
-
-        tty_port_close(&priv->port, tty, file);
-}
-
-static void kgdb_nmi_tty_hangup(struct tty_struct *tty)
-{
-        struct kgdb_nmi_tty_priv *priv = tty->driver_data;
-
-        tty_port_hangup(&priv->port);
-}
-
-static int kgdb_nmi_tty_write_room(struct tty_struct *tty)
-{
-        /* Actually, we can handle any amount as we use polled writes. */
-        return 2048;
-}
-
-static int kgdb_nmi_tty_write(struct tty_struct *tty, const unchar *buf, int c)
-{
-        int i;
-
-        for (i = 0; i < c; i++)
-                dbg_io_ops->write_char(buf[i]);
-        return c;
-}
-
-static const struct tty_operations kgdb_nmi_tty_ops = {
-        .open           = kgdb_nmi_tty_open,
-        .close          = kgdb_nmi_tty_close,
-        .install        = kgdb_nmi_tty_install,
-        .cleanup        = kgdb_nmi_tty_cleanup,
-        .hangup         = kgdb_nmi_tty_hangup,
-        .write_room     = kgdb_nmi_tty_write_room,
-        .write          = kgdb_nmi_tty_write,
-};
-
-static int kgdb_nmi_enable_console(int argc, const char *argv[])
-{
-        kgdb_nmi_tty_enabled = !(argc == 1 && !strcmp(argv[1], "off"));
-        return 0;
-}
-
-int kgdb_register_nmi_console(void)
-{
-        int ret;
-
-        if (!arch_kgdb_ops.enable_nmi)
-                return 0;
-
-        kgdb_nmi_tty_driver = alloc_tty_driver(1);
-        if (!kgdb_nmi_tty_driver) {
-                pr_err("%s: cannot allocate tty\n", __func__);
-                return -ENOMEM;
-        }
-        kgdb_nmi_tty_driver->driver_name        = "ttyNMI";
-        kgdb_nmi_tty_driver->name               = "ttyNMI";
-        kgdb_nmi_tty_driver->num                = 1;
-        kgdb_nmi_tty_driver->type               = TTY_DRIVER_TYPE_SERIAL;
-        kgdb_nmi_tty_driver->subtype            = SERIAL_TYPE_NORMAL;
-        kgdb_nmi_tty_driver->flags              = TTY_DRIVER_REAL_RAW;
-        kgdb_nmi_tty_driver->init_termios       = tty_std_termios;
-        tty_termios_encode_baud_rate(&kgdb_nmi_tty_driver->init_termios,
-                                     KGDB_NMI_BAUD, KGDB_NMI_BAUD);
-        tty_set_operations(kgdb_nmi_tty_driver, &kgdb_nmi_tty_ops);
-
-        ret = tty_register_driver(kgdb_nmi_tty_driver);
-        if (ret) {
-                pr_err("%s: can't register tty driver: %d\n", __func__, ret);
-                goto err_drv_reg;
-        }
-
-        ret = kdb_register("nmi_console", kgdb_nmi_enable_console, "[off]",
-                           "switch to Linux NMI console", 0);
-        if (ret) {
-                pr_err("%s: can't register kdb command: %d\n", __func__, ret);
-                goto err_kdb_reg;
-        }
-
-        register_console(&kgdb_nmi_console);
-        arch_kgdb_ops.enable_nmi(1);
-
-        return 0;
-err_kdb_reg:
-        tty_unregister_driver(kgdb_nmi_tty_driver);
-err_drv_reg:
-        put_tty_driver(kgdb_nmi_tty_driver);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(kgdb_register_nmi_console);
-
-int kgdb_unregister_nmi_console(void)
-{
-        int ret;
-
-        if (!arch_kgdb_ops.enable_nmi)
-                return 0;
-        arch_kgdb_ops.enable_nmi(0);
-
-        kdb_unregister("nmi_console");
-
-        ret = unregister_console(&kgdb_nmi_console);
-        if (ret)
-                return ret;
-
-        ret = tty_unregister_driver(kgdb_nmi_tty_driver);
-        if (ret)
-                return ret;
-        put_tty_driver(kgdb_nmi_tty_driver);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(kgdb_unregister_nmi_console);
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 10020547c60..87e7e6c876d 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -19,7 +19,6 @@
 #include <linux/console.h>
 #include <linux/vt_kern.h>
 #include <linux/input.h>
-#include <linux/module.h>
 
 #define MAX_CONFIG_LEN          40
 
@@ -97,8 +96,7 @@ static void kgdboc_restore_input(void)
 
 static int kgdboc_register_kbd(char **cptr)
 {
-        if (strncmp(*cptr, "kbd", 3) == 0 ||
-                strncmp(*cptr, "kdb", 3) == 0) {
+        if (strncmp(*cptr, "kbd", 3) == 0) {
                 if (kdb_poll_idx < KDB_POLL_FUNC_MAX) {
                         kdb_poll_funcs[kdb_poll_idx] = kdb_get_kbd_char;
                         kdb_poll_idx++;
@@ -123,7 +121,7 @@ static void kgdboc_unregister_kbd(void)
                         i--;
                 }
         }
-        flush_work(&kgdboc_restore_input_work);
+        flush_work_sync(&kgdboc_restore_input_work);
 }
 #else /* ! CONFIG_KDB_KEYBOARD */
 #define kgdboc_register_kbd(x) 0
@@ -146,8 +144,6 @@ __setup("kgdboc=", kgdboc_option_setup);
 
 static void cleanup_kgdboc(void)
 {
-        if (kgdb_unregister_nmi_console())
-                return;
         kgdboc_unregister_kbd();
         if (configured == 1)
                 kgdb_unregister_io_module(&kgdboc_io_ops);
@@ -201,18 +197,11 @@ do_register:
         if (err)
                 goto noconfig;
 
-        err = kgdb_register_nmi_console();
-        if (err)
-                goto nmi_con_failed;
-
         configured = 1;
 
         return 0;
 
-nmi_con_failed:
-        kgdb_unregister_io_module(&kgdboc_io_ops);
 noconfig:
-        kgdboc_unregister_kbd();
         config[0] = 0;
         configured = 0;
         cleanup_kgdboc();
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 02da071fe1e..bc95f52cad8 100644
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -31,19 +31,16 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
+#include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/gpio.h>
 
 #include <lantiq_soc.h>
 
 #define PORT_LTQ_ASC            111
 #define MAXPORTS                2
 #define UART_DUMMY_UER_RX       1
-#define DRVNAME                 "lantiq,asc"
+#define DRVNAME                 "ltq_asc"
 #ifdef __BIG_ENDIAN
 #define LTQ_ASC_TBUF            (0x0020 + 3)
 #define LTQ_ASC_RBUF            (0x0024 + 3)
@@ -117,9 +114,6 @@ static DEFINE_SPINLOCK(ltq_asc_lock);
 
 struct ltq_uart_port {
         struct uart_port        port;
-        /* clock used to derive divider */
-        struct clk              *fpiclk;
-        /* clock gating of the ASC core */
         struct clk              *clk;
         unsigned int            tx_irq;
         unsigned int            rx_irq;
@@ -322,9 +316,7 @@ lqasc_startup(struct uart_port *port)
         struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
         int retval;
 
-        if (ltq_port->clk)
-                clk_enable(ltq_port->clk);
-        port->uartclk = clk_get_rate(ltq_port->fpiclk);
+        port->uartclk = clk_get_rate(ltq_port->clk);
 
         ltq_w32_mask(ASCCLC_DISS | ASCCLC_RMCMASK, (1 << ASCCLC_RMCOFFSET),
                 port->membase + LTQ_ASC_CLC);
@@ -346,21 +338,21 @@ lqasc_startup(struct uart_port *port)
                 ASCCON_ROEN, port->membase + LTQ_ASC_CON);
 
         retval = request_irq(ltq_port->tx_irq, lqasc_tx_int,
-                0, "asc_tx", port);
+                IRQF_DISABLED, "asc_tx", port);
         if (retval) {
                 pr_err("failed to request lqasc_tx_int\n");
                 return retval;
         }
 
         retval = request_irq(ltq_port->rx_irq, lqasc_rx_int,
-                0, "asc_rx", port);
+                IRQF_DISABLED, "asc_rx", port);
         if (retval) {
                 pr_err("failed to request lqasc_rx_int\n");
                 goto err1;
         }
 
         retval = request_irq(ltq_port->err_irq, lqasc_err_int,
-                0, "asc_err", port);
+                IRQF_DISABLED, "asc_err", port);
         if (retval) {
                 pr_err("failed to request lqasc_err_int\n");
                 goto err2;
@@ -390,8 +382,6 @@ lqasc_shutdown(struct uart_port *port)
                 port->membase + LTQ_ASC_RXFCON);
         ltq_w32_mask(ASCTXFCON_TXFEN, ASCTXFCON_TXFFLU,
                 port->membase + LTQ_ASC_TXFCON);
-        if (ltq_port->clk)
-                clk_disable(ltq_port->clk);
 }
 
 static void
@@ -640,7 +630,7 @@ lqasc_console_setup(struct console *co, char *options)
 
         port = &ltq_port->port;
 
-        port->uartclk = clk_get_rate(ltq_port->fpiclk);
+        port->uartclk = clk_get_rate(ltq_port->clk);
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -678,32 +668,37 @@ static struct uart_driver lqasc_reg = {
 static int __init
 lqasc_probe(struct platform_device *pdev)
 {
-        struct device_node *node = pdev->dev.of_node;
         struct ltq_uart_port *ltq_port;
         struct uart_port *port;
-        struct resource *mmres, irqres[3];
-        int line = 0;
+        struct resource *mmres, *irqres;
+        int tx_irq, rx_irq, err_irq;
+        struct clk *clk;
         int ret;
 
         mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        ret = of_irq_to_resource_table(node, irqres, 3);
-        if (!mmres || (ret != 3)) {
-                dev_err(&pdev->dev,
-                        "failed to get memory/irq for serial port\n");
+        irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!mmres || !irqres)
                 return -ENODEV;
-        }
 
-        /* check if this is the console port */
-        if (mmres->start != CPHYSADDR(LTQ_EARLY_ASC))
-                line = 1;
+        if (pdev->id >= MAXPORTS)
+                return -EBUSY;
 
-        if (lqasc_port[line]) {
-                dev_err(&pdev->dev, "port %d already allocated\n", line);
+        if (lqasc_port[pdev->id] != NULL)
                 return -EBUSY;
+
+        clk = clk_get(&pdev->dev, "fpi");
+        if (IS_ERR(clk)) {
+                pr_err("failed to get fpi clk\n");
+                return -ENOENT;
         }
 
-        ltq_port = devm_kzalloc(&pdev->dev, sizeof(struct ltq_uart_port),
-                        GFP_KERNEL);
+        tx_irq = platform_get_irq_byname(pdev, "tx");
+        rx_irq = platform_get_irq_byname(pdev, "rx");
+        err_irq = platform_get_irq_byname(pdev, "err");
+        if ((tx_irq < 0) | (rx_irq < 0) | (err_irq < 0))
+                return -ENODEV;
+
+        ltq_port = kzalloc(sizeof(struct ltq_uart_port), GFP_KERNEL);
         if (!ltq_port)
                 return -ENOMEM;
 
@@ -714,26 +709,19 @@ lqasc_probe(struct platform_device *pdev)
         port->ops       = &lqasc_pops;
         port->fifosize  = 16;
         port->type      = PORT_LTQ_ASC,
-        port->line      = line;
+        port->line      = pdev->id;
         port->dev       = &pdev->dev;
-        /* unused, just to be backward-compatible */
-        port->irq       = irqres[0].start;
-        port->mapbase   = mmres->start;
 
-        ltq_port->fpiclk = clk_get_fpi();
-        if (IS_ERR(ltq_port->fpiclk)) {
-                pr_err("failed to get fpi clk\n");
-                return -ENOENT;
-        }
+        port->irq       = tx_irq; /* unused, just to be backward-compatibe */
+        port->mapbase   = mmres->start;
 
-        /* not all asc ports have clock gates, lets ignore the return code */
-        ltq_port->clk = clk_get(&pdev->dev, NULL);
+        ltq_port->clk   = clk;
 
-        ltq_port->tx_irq = irqres[0].start;
-        ltq_port->rx_irq = irqres[1].start;
-        ltq_port->err_irq = irqres[2].start;
+        ltq_port->tx_irq = tx_irq;
+        ltq_port->rx_irq = rx_irq;
+        ltq_port->err_irq = err_irq;
 
-        lqasc_port[line] = ltq_port;
+        lqasc_port[pdev->id] = ltq_port;
         platform_set_drvdata(pdev, ltq_port);
 
         ret = uart_add_one_port(&lqasc_reg, port);
@@ -741,17 +729,10 @@ lqasc_probe(struct platform_device *pdev)
         return ret;
 }
 
-static const struct of_device_id ltq_asc_match[] = {
-        { .compatible = DRVNAME },
-        {},
-};
-MODULE_DEVICE_TABLE(of, ltq_asc_match);
-
 static struct platform_driver lqasc_driver = {
         .driver         = {
                 .name   = DRVNAME,
                 .owner  = THIS_MODULE,
-                .of_match_table = ltq_asc_match,
         },
 };
 
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
deleted file mode 100644
index 0e86bff3fe2..00000000000
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ /dev/null
@@ -1,823 +0,0 @@
-/*
- * High Speed Serial Ports on NXP LPC32xx SoC
- *
- * Authors: Kevin Wells <kevin.wells@nxp.com>
- *          Roland Stigge <stigge@antcom.de>
- *
- * Copyright (C) 2010 NXP Semiconductors
- * Copyright (C) 2012 Roland Stigge
- *
- * 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.
- */
-
-#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 <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/nmi.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-#include <linux/gpio.h>
-#include <linux/of.h>
-#include <mach/platform.h>
-#include <mach/hardware.h>
-
-/*
- * High Speed UART register offsets
- */
-#define LPC32XX_HSUART_FIFO(x)                  ((x) + 0x00)
-#define LPC32XX_HSUART_LEVEL(x)                 ((x) + 0x04)
-#define LPC32XX_HSUART_IIR(x)                   ((x) + 0x08)
-#define LPC32XX_HSUART_CTRL(x)                  ((x) + 0x0C)
-#define LPC32XX_HSUART_RATE(x)                  ((x) + 0x10)
-
-#define LPC32XX_HSU_BREAK_DATA                  (1 << 10)
-#define LPC32XX_HSU_ERROR_DATA                  (1 << 9)
-#define LPC32XX_HSU_RX_EMPTY                    (1 << 8)
-
-#define LPC32XX_HSU_TX_LEV(n)                   (((n) >> 8) & 0xFF)
-#define LPC32XX_HSU_RX_LEV(n)                   ((n) & 0xFF)
-
-#define LPC32XX_HSU_TX_INT_SET                  (1 << 6)
-#define LPC32XX_HSU_RX_OE_INT                   (1 << 5)
-#define LPC32XX_HSU_BRK_INT                     (1 << 4)
-#define LPC32XX_HSU_FE_INT                      (1 << 3)
-#define LPC32XX_HSU_RX_TIMEOUT_INT              (1 << 2)
-#define LPC32XX_HSU_RX_TRIG_INT                 (1 << 1)
-#define LPC32XX_HSU_TX_INT                      (1 << 0)
-
-#define LPC32XX_HSU_HRTS_INV                    (1 << 21)
-#define LPC32XX_HSU_HRTS_TRIG_8B                (0x0 << 19)
-#define LPC32XX_HSU_HRTS_TRIG_16B               (0x1 << 19)
-#define LPC32XX_HSU_HRTS_TRIG_32B               (0x2 << 19)
-#define LPC32XX_HSU_HRTS_TRIG_48B               (0x3 << 19)
-#define LPC32XX_HSU_HRTS_EN                     (1 << 18)
-#define LPC32XX_HSU_TMO_DISABLED                (0x0 << 16)
-#define LPC32XX_HSU_TMO_INACT_4B                (0x1 << 16)
-#define LPC32XX_HSU_TMO_INACT_8B                (0x2 << 16)
-#define LPC32XX_HSU_TMO_INACT_16B               (0x3 << 16)
-#define LPC32XX_HSU_HCTS_INV                    (1 << 15)
-#define LPC32XX_HSU_HCTS_EN                     (1 << 14)
-#define LPC32XX_HSU_OFFSET(n)                   ((n) << 9)
-#define LPC32XX_HSU_BREAK                       (1 << 8)
-#define LPC32XX_HSU_ERR_INT_EN                  (1 << 7)
-#define LPC32XX_HSU_RX_INT_EN                   (1 << 6)
-#define LPC32XX_HSU_TX_INT_EN                   (1 << 5)
-#define LPC32XX_HSU_RX_TL1B                     (0x0 << 2)
-#define LPC32XX_HSU_RX_TL4B                     (0x1 << 2)
-#define LPC32XX_HSU_RX_TL8B                     (0x2 << 2)
-#define LPC32XX_HSU_RX_TL16B                    (0x3 << 2)
-#define LPC32XX_HSU_RX_TL32B                    (0x4 << 2)
-#define LPC32XX_HSU_RX_TL48B                    (0x5 << 2)
-#define LPC32XX_HSU_TX_TLEMPTY                  (0x0 << 0)
-#define LPC32XX_HSU_TX_TL0B                     (0x0 << 0)
-#define LPC32XX_HSU_TX_TL4B                     (0x1 << 0)
-#define LPC32XX_HSU_TX_TL8B                     (0x2 << 0)
-#define LPC32XX_HSU_TX_TL16B                    (0x3 << 0)
-
-#define MODNAME "lpc32xx_hsuart"
-
-struct lpc32xx_hsuart_port {
-        struct uart_port port;
-};
-
-#define FIFO_READ_LIMIT 128
-#define MAX_PORTS 3
-#define LPC32XX_TTY_NAME "ttyTX"
-static struct lpc32xx_hsuart_port lpc32xx_hs_ports[MAX_PORTS];
-
-#ifdef CONFIG_SERIAL_HS_LPC32XX_CONSOLE
-static void wait_for_xmit_empty(struct uart_port *port)
-{
-        unsigned int timeout = 10000;
-
-        do {
-                if (LPC32XX_HSU_TX_LEV(readl(LPC32XX_HSUART_LEVEL(
-                                                        port->membase))) == 0)
-                        break;
-                if (--timeout == 0)
-                        break;
-                udelay(1);
-        } while (1);
-}
-
-static void wait_for_xmit_ready(struct uart_port *port)
-{
-        unsigned int timeout = 10000;
-
-        while (1) {
-                if (LPC32XX_HSU_TX_LEV(readl(LPC32XX_HSUART_LEVEL(
-                                                        port->membase))) < 32)
-                        break;
-                if (--timeout == 0)
-                        break;
-                udelay(1);
-        }
-}
-
-static void lpc32xx_hsuart_console_putchar(struct uart_port *port, int ch)
-{
-        wait_for_xmit_ready(port);
-        writel((u32)ch, LPC32XX_HSUART_FIFO(port->membase));
-}
-
-static void lpc32xx_hsuart_console_write(struct console *co, const char *s,
-                                         unsigned int count)
-{
-        struct lpc32xx_hsuart_port *up = &lpc32xx_hs_ports[co->index];
-        unsigned long flags;
-        int locked = 1;
-
-        touch_nmi_watchdog();
-        local_irq_save(flags);
-        if (up->port.sysrq)
-                locked = 0;
-        else if (oops_in_progress)
-                locked = spin_trylock(&up->port.lock);
-        else
-                spin_lock(&up->port.lock);
-
-        uart_console_write(&up->port, s, count, lpc32xx_hsuart_console_putchar);
-        wait_for_xmit_empty(&up->port);
-
-        if (locked)
-                spin_unlock(&up->port.lock);
-        local_irq_restore(flags);
-}
-
-static int __init lpc32xx_hsuart_console_setup(struct console *co,
-                                               char *options)
-{
-        struct uart_port *port;
-        int baud = 115200;
-        int bits = 8;
-        int parity = 'n';
-        int flow = 'n';
-
-        if (co->index >= MAX_PORTS)
-                co->index = 0;
-
-        port = &lpc32xx_hs_ports[co->index].port;
-        if (!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 lpc32xx_hsuart_reg;
-static struct console lpc32xx_hsuart_console = {
-        .name           = LPC32XX_TTY_NAME,
-        .write          = lpc32xx_hsuart_console_write,
-        .device         = uart_console_device,
-        .setup          = lpc32xx_hsuart_console_setup,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-        .data           = &lpc32xx_hsuart_reg,
-};
-
-static int __init lpc32xx_hsuart_console_init(void)
-{
-        register_console(&lpc32xx_hsuart_console);
-        return 0;
-}
-console_initcall(lpc32xx_hsuart_console_init);
-
-#define LPC32XX_HSUART_CONSOLE (&lpc32xx_hsuart_console)
-#else
-#define LPC32XX_HSUART_CONSOLE NULL
-#endif
-
-static struct uart_driver lpc32xx_hs_reg = {
-        .owner          = THIS_MODULE,
-        .driver_name    = MODNAME,
-        .dev_name       = LPC32XX_TTY_NAME,
-        .nr             = MAX_PORTS,
-        .cons           = LPC32XX_HSUART_CONSOLE,
-};
-static int uarts_registered;
-
-static unsigned int __serial_get_clock_div(unsigned long uartclk,
-                                           unsigned long rate)
-{
-        u32 div, goodrate, hsu_rate, l_hsu_rate, comprate;
-        u32 rate_diff;
-
-        /* Find the closest divider to get the desired clock rate */
-        div = uartclk / rate;
-        goodrate = hsu_rate = (div / 14) - 1;
-        if (hsu_rate != 0)
-                hsu_rate--;
-
-        /* Tweak divider */
-        l_hsu_rate = hsu_rate + 3;
-        rate_diff = 0xFFFFFFFF;
-
-        while (hsu_rate < l_hsu_rate) {
-                comprate = uartclk / ((hsu_rate + 1) * 14);
-                if (abs(comprate - rate) < rate_diff) {
-                        goodrate = hsu_rate;
-                        rate_diff = abs(comprate - rate);
-                }
-
-                hsu_rate++;
-        }
-        if (hsu_rate > 0xFF)
-                hsu_rate = 0xFF;
-
-        return goodrate;
-}
-
-static void __serial_uart_flush(struct uart_port *port)
-{
-        u32 tmp;
-        int cnt = 0;
-
-        while ((readl(LPC32XX_HSUART_LEVEL(port->membase)) > 0) &&
-               (cnt++ < FIFO_READ_LIMIT))
-                tmp = readl(LPC32XX_HSUART_FIFO(port->membase));
-}
-
-static void __serial_lpc32xx_rx(struct uart_port *port)
-{
-        unsigned int tmp, flag;
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
-
-        if (!tty) {
-                /* Discard data: no tty available */
-                while (!(readl(LPC32XX_HSUART_FIFO(port->membase)) &
-                         LPC32XX_HSU_RX_EMPTY))
-                        ;
-
-                return;
-        }
-
-        /* Read data from FIFO and push into terminal */
-        tmp = readl(LPC32XX_HSUART_FIFO(port->membase));
-        while (!(tmp & LPC32XX_HSU_RX_EMPTY)) {
-                flag = TTY_NORMAL;
-                port->icount.rx++;
-
-                if (tmp & LPC32XX_HSU_ERROR_DATA) {
-                        /* Framing error */
-                        writel(LPC32XX_HSU_FE_INT,
-                               LPC32XX_HSUART_IIR(port->membase));
-                        port->icount.frame++;
-                        flag = TTY_FRAME;
-                        tty_insert_flip_char(tty, 0, TTY_FRAME);
-                }
-
-                tty_insert_flip_char(tty, (tmp & 0xFF), flag);
-
-                tmp = readl(LPC32XX_HSUART_FIFO(port->membase));
-        }
-        tty_flip_buffer_push(tty);
-        tty_kref_put(tty);
-}
-
-static void __serial_lpc32xx_tx(struct uart_port *port)
-{
-        struct circ_buf *xmit = &port->state->xmit;
-        unsigned int tmp;
-
-        if (port->x_char) {
-                writel((u32)port->x_char, LPC32XX_HSUART_FIFO(port->membase));
-                port->icount.tx++;
-                port->x_char = 0;
-                return;
-        }
-
-        if (uart_circ_empty(xmit) || uart_tx_stopped(port))
-                goto exit_tx;
-
-        /* Transfer data */
-        while (LPC32XX_HSU_TX_LEV(readl(
-                LPC32XX_HSUART_LEVEL(port->membase))) < 64) {
-                writel((u32) xmit->buf[xmit->tail],
-                       LPC32XX_HSUART_FIFO(port->membase));
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                port->icount.tx++;
-                if (uart_circ_empty(xmit))
-                        break;
-        }
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(port);
-
-exit_tx:
-        if (uart_circ_empty(xmit)) {
-                tmp = readl(LPC32XX_HSUART_CTRL(port->membase));
-                tmp &= ~LPC32XX_HSU_TX_INT_EN;
-                writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-        }
-}
-
-static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id)
-{
-        struct uart_port *port = dev_id;
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
-        u32 status;
-
-        spin_lock(&port->lock);
-
-        /* Read UART status and clear latched interrupts */
-        status = readl(LPC32XX_HSUART_IIR(port->membase));
-
-        if (status & LPC32XX_HSU_BRK_INT) {
-                /* Break received */
-                writel(LPC32XX_HSU_BRK_INT, LPC32XX_HSUART_IIR(port->membase));
-                port->icount.brk++;
-                uart_handle_break(port);
-        }
-
-        /* Framing error */
-        if (status & LPC32XX_HSU_FE_INT)
-                writel(LPC32XX_HSU_FE_INT, LPC32XX_HSUART_IIR(port->membase));
-
-        if (status & LPC32XX_HSU_RX_OE_INT) {
-                /* Receive FIFO overrun */
-                writel(LPC32XX_HSU_RX_OE_INT,
-                       LPC32XX_HSUART_IIR(port->membase));
-                port->icount.overrun++;
-                if (tty) {
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                        tty_schedule_flip(tty);
-                }
-        }
-
-        /* Data received? */
-        if (status & (LPC32XX_HSU_RX_TIMEOUT_INT | LPC32XX_HSU_RX_TRIG_INT)) {
-                __serial_lpc32xx_rx(port);
-                if (tty)
-                        tty_flip_buffer_push(tty);
-        }
-
-        /* Transmit data request? */
-        if ((status & LPC32XX_HSU_TX_INT) && (!uart_tx_stopped(port))) {
-                writel(LPC32XX_HSU_TX_INT, LPC32XX_HSUART_IIR(port->membase));
-                __serial_lpc32xx_tx(port);
-        }
-
-        spin_unlock(&port->lock);
-        tty_kref_put(tty);
-
-        return IRQ_HANDLED;
-}
-
-/* port->lock is not held.  */
-static unsigned int serial_lpc32xx_tx_empty(struct uart_port *port)
-{
-        unsigned int ret = 0;
-
-        if (LPC32XX_HSU_TX_LEV(readl(LPC32XX_HSUART_LEVEL(port->membase))) == 0)
-                ret = TIOCSER_TEMT;
-
-        return ret;
-}
-
-/* port->lock held by caller.  */
-static void serial_lpc32xx_set_mctrl(struct uart_port *port,
-                                     unsigned int mctrl)
-{
-        /* No signals are supported on HS UARTs */
-}
-
-/* port->lock is held by caller and interrupts are disabled.  */
-static unsigned int serial_lpc32xx_get_mctrl(struct uart_port *port)
-{
-        /* No signals are supported on HS UARTs */
-        return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
-}
-
-/* port->lock held by caller.  */
-static void serial_lpc32xx_stop_tx(struct uart_port *port)
-{
-        u32 tmp;
-
-        tmp = readl(LPC32XX_HSUART_CTRL(port->membase));
-        tmp &= ~LPC32XX_HSU_TX_INT_EN;
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-}
-
-/* port->lock held by caller.  */
-static void serial_lpc32xx_start_tx(struct uart_port *port)
-{
-        u32 tmp;
-
-        __serial_lpc32xx_tx(port);
-        tmp = readl(LPC32XX_HSUART_CTRL(port->membase));
-        tmp |= LPC32XX_HSU_TX_INT_EN;
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-}
-
-/* port->lock held by caller.  */
-static void serial_lpc32xx_stop_rx(struct uart_port *port)
-{
-        u32 tmp;
-
-        tmp = readl(LPC32XX_HSUART_CTRL(port->membase));
-        tmp &= ~(LPC32XX_HSU_RX_INT_EN | LPC32XX_HSU_ERR_INT_EN);
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-
-        writel((LPC32XX_HSU_BRK_INT | LPC32XX_HSU_RX_OE_INT |
-                LPC32XX_HSU_FE_INT), LPC32XX_HSUART_IIR(port->membase));
-}
-
-/* port->lock held by caller.  */
-static void serial_lpc32xx_enable_ms(struct uart_port *port)
-{
-        /* Modem status is not supported */
-}
-
-/* port->lock is not held.  */
-static void serial_lpc32xx_break_ctl(struct uart_port *port,
-                                     int break_state)
-{
-        unsigned long flags;
-        u32 tmp;
-
-        spin_lock_irqsave(&port->lock, flags);
-        tmp = readl(LPC32XX_HSUART_CTRL(port->membase));
-        if (break_state != 0)
-                tmp |= LPC32XX_HSU_BREAK;
-        else
-                tmp &= ~LPC32XX_HSU_BREAK;
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-/* LPC3250 Errata HSUART.1: Hang workaround via loopback mode on inactivity */
-static void lpc32xx_loopback_set(resource_size_t mapbase, int state)
-{
-        int bit;
-        u32 tmp;
-
-        switch (mapbase) {
-        case LPC32XX_HS_UART1_BASE:
-                bit = 0;
-                break;
-        case LPC32XX_HS_UART2_BASE:
-                bit = 1;
-                break;
-        case LPC32XX_HS_UART7_BASE:
-                bit = 6;
-                break;
-        default:
-                WARN(1, "lpc32xx_hs: Warning: Unknown port at %08x\n", mapbase);
-                return;
-        }
-
-        tmp = readl(LPC32XX_UARTCTL_CLOOP);
-        if (state)
-                tmp |= (1 << bit);
-        else
-                tmp &= ~(1 << bit);
-        writel(tmp, LPC32XX_UARTCTL_CLOOP);
-}
-
-/* port->lock is not held.  */
-static int serial_lpc32xx_startup(struct uart_port *port)
-{
-        int retval;
-        unsigned long flags;
-        u32 tmp;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        __serial_uart_flush(port);
-
-        writel((LPC32XX_HSU_TX_INT | LPC32XX_HSU_FE_INT |
-                LPC32XX_HSU_BRK_INT | LPC32XX_HSU_RX_OE_INT),
-               LPC32XX_HSUART_IIR(port->membase));
-
-        writel(0xFF, LPC32XX_HSUART_RATE(port->membase));
-
-        /*
-         * Set receiver timeout, HSU offset of 20, no break, no interrupts,
-         * and default FIFO trigger levels
-         */
-        tmp = LPC32XX_HSU_TX_TL8B | LPC32XX_HSU_RX_TL32B |
-                LPC32XX_HSU_OFFSET(20) | LPC32XX_HSU_TMO_INACT_4B;
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-
-        lpc32xx_loopback_set(port->mapbase, 0); /* get out of loopback mode */
-
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        retval = request_irq(port->irq, serial_lpc32xx_interrupt,
-                             0, MODNAME, port);
-        if (!retval)
-                writel((tmp | LPC32XX_HSU_RX_INT_EN | LPC32XX_HSU_ERR_INT_EN),
-                       LPC32XX_HSUART_CTRL(port->membase));
-
-        return retval;
-}
-
-/* port->lock is not held.  */
-static void serial_lpc32xx_shutdown(struct uart_port *port)
-{
-        u32 tmp;
-        unsigned long flags;
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        tmp = LPC32XX_HSU_TX_TL8B | LPC32XX_HSU_RX_TL32B |
-                LPC32XX_HSU_OFFSET(20) | LPC32XX_HSU_TMO_INACT_4B;
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-
-        lpc32xx_loopback_set(port->mapbase, 1); /* go to loopback mode */
-
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        free_irq(port->irq, port);
-}
-
-/* port->lock is not held.  */
-static void serial_lpc32xx_set_termios(struct uart_port *port,
-                                       struct ktermios *termios,
-                                       struct ktermios *old)
-{
-        unsigned long flags;
-        unsigned int baud, quot;
-        u32 tmp;
-
-        /* Always 8-bit, no parity, 1 stop bit */
-        termios->c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD);
-        termios->c_cflag |= CS8;
-
-        termios->c_cflag &= ~(HUPCL | CMSPAR | CLOCAL | CRTSCTS);
-
-        baud = uart_get_baud_rate(port, termios, old, 0,
-                                  port->uartclk / 14);
-
-        quot = __serial_get_clock_div(port->uartclk, baud);
-
-        spin_lock_irqsave(&port->lock, flags);
-
-        /* Ignore characters? */
-        tmp = readl(LPC32XX_HSUART_CTRL(port->membase));
-        if ((termios->c_cflag & CREAD) == 0)
-                tmp &= ~(LPC32XX_HSU_RX_INT_EN | LPC32XX_HSU_ERR_INT_EN);
-        else
-                tmp |= LPC32XX_HSU_RX_INT_EN | LPC32XX_HSU_ERR_INT_EN;
-        writel(tmp, LPC32XX_HSUART_CTRL(port->membase));
-
-        writel(quot, LPC32XX_HSUART_RATE(port->membase));
-
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        /* Don't rewrite B0 */
-        if (tty_termios_baud_rate(termios))
-                tty_termios_encode_baud_rate(termios, baud, baud);
-}
-
-static const char *serial_lpc32xx_type(struct uart_port *port)
-{
-        return MODNAME;
-}
-
-static void serial_lpc32xx_release_port(struct uart_port *port)
-{
-        if ((port->iotype == UPIO_MEM32) && (port->mapbase)) {
-                if (port->flags & UPF_IOREMAP) {
-                        iounmap(port->membase);
-                        port->membase = NULL;
-                }
-
-                release_mem_region(port->mapbase, SZ_4K);
-        }
-}
-
-static int serial_lpc32xx_request_port(struct uart_port *port)
-{
-        int ret = -ENODEV;
-
-        if ((port->iotype == UPIO_MEM32) && (port->mapbase)) {
-                ret = 0;
-
-                if (!request_mem_region(port->mapbase, SZ_4K, MODNAME))
-                        ret = -EBUSY;
-                else if (port->flags & UPF_IOREMAP) {
-                        port->membase = ioremap(port->mapbase, SZ_4K);
-                        if (!port->membase) {
-                                release_mem_region(port->mapbase, SZ_4K);
-                                ret = -ENOMEM;
-                        }
-                }
-        }
-
-        return ret;
-}
-
-static void serial_lpc32xx_config_port(struct uart_port *port, int uflags)
-{
-        int ret;
-
-        ret = serial_lpc32xx_request_port(port);
-        if (ret < 0)
-                return;
-        port->type = PORT_UART00;
-        port->fifosize = 64;
-
-        __serial_uart_flush(port);
-
-        writel((LPC32XX_HSU_TX_INT | LPC32XX_HSU_FE_INT |
-                LPC32XX_HSU_BRK_INT | LPC32XX_HSU_RX_OE_INT),
-               LPC32XX_HSUART_IIR(port->membase));
-
-        writel(0xFF, LPC32XX_HSUART_RATE(port->membase));
-
-        /* Set receiver timeout, HSU offset of 20, no break, no interrupts,
-           and default FIFO trigger levels */
-        writel(LPC32XX_HSU_TX_TL8B | LPC32XX_HSU_RX_TL32B |
-               LPC32XX_HSU_OFFSET(20) | LPC32XX_HSU_TMO_INACT_4B,
-               LPC32XX_HSUART_CTRL(port->membase));
-}
-
-static int serial_lpc32xx_verify_port(struct uart_port *port,
-                                      struct serial_struct *ser)
-{
-        int ret = 0;
-
-        if (ser->type != PORT_UART00)
-                ret = -EINVAL;
-
-        return ret;
-}
-
-static struct uart_ops serial_lpc32xx_pops = {
-        .tx_empty       = serial_lpc32xx_tx_empty,
-        .set_mctrl      = serial_lpc32xx_set_mctrl,
-        .get_mctrl      = serial_lpc32xx_get_mctrl,
-        .stop_tx        = serial_lpc32xx_stop_tx,
-        .start_tx       = serial_lpc32xx_start_tx,
-        .stop_rx        = serial_lpc32xx_stop_rx,
-        .enable_ms      = serial_lpc32xx_enable_ms,
-        .break_ctl      = serial_lpc32xx_break_ctl,
-        .startup        = serial_lpc32xx_startup,
-        .shutdown       = serial_lpc32xx_shutdown,
-        .set_termios    = serial_lpc32xx_set_termios,
-        .type           = serial_lpc32xx_type,
-        .release_port   = serial_lpc32xx_release_port,
-        .request_port   = serial_lpc32xx_request_port,
-        .config_port    = serial_lpc32xx_config_port,
-        .verify_port    = serial_lpc32xx_verify_port,
-};
-
-/*
- * Register a set of serial devices attached to a platform device
- */
-static int serial_hs_lpc32xx_probe(struct platform_device *pdev)
-{
-        struct lpc32xx_hsuart_port *p = &lpc32xx_hs_ports[uarts_registered];
-        int ret = 0;
-        struct resource *res;
-
-        if (uarts_registered >= MAX_PORTS) {
-                dev_err(&pdev->dev,
-                        "Error: Number of possible ports exceeded (%d)!\n",
-                        uarts_registered + 1);
-                return -ENXIO;
-        }
-
-        memset(p, 0, sizeof(*p));
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev,
-                        "Error getting mem resource for HS UART port %d\n",
-                        uarts_registered);
-                return -ENXIO;
-        }
-        p->port.mapbase = res->start;
-        p->port.membase = NULL;
-
-        p->port.irq = platform_get_irq(pdev, 0);
-        if (p->port.irq < 0) {
-                dev_err(&pdev->dev, "Error getting irq for HS UART port %d\n",
-                        uarts_registered);
-                return p->port.irq;
-        }
-
-        p->port.iotype = UPIO_MEM32;
-        p->port.uartclk = LPC32XX_MAIN_OSC_FREQ;
-        p->port.regshift = 2;
-        p->port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP;
-        p->port.dev = &pdev->dev;
-        p->port.ops = &serial_lpc32xx_pops;
-        p->port.line = uarts_registered++;
-        spin_lock_init(&p->port.lock);
-
-        /* send port to loopback mode by default */
-        lpc32xx_loopback_set(p->port.mapbase, 1);
-
-        ret = uart_add_one_port(&lpc32xx_hs_reg, &p->port);
-
-        platform_set_drvdata(pdev, p);
-
-        return ret;
-}
-
-/*
- * Remove serial ports registered against a platform device.
- */
-static int serial_hs_lpc32xx_remove(struct platform_device *pdev)
-{
-        struct lpc32xx_hsuart_port *p = platform_get_drvdata(pdev);
-
-        uart_remove_one_port(&lpc32xx_hs_reg, &p->port);
-
-        return 0;
-}
-
-
-#ifdef CONFIG_PM
-static int serial_hs_lpc32xx_suspend(struct platform_device *pdev,
-                                     pm_message_t state)
-{
-        struct lpc32xx_hsuart_port *p = platform_get_drvdata(pdev);
-
-        uart_suspend_port(&lpc32xx_hs_reg, &p->port);
-
-        return 0;
-}
-
-static int serial_hs_lpc32xx_resume(struct platform_device *pdev)
-{
-        struct lpc32xx_hsuart_port *p = platform_get_drvdata(pdev);
-
-        uart_resume_port(&lpc32xx_hs_reg, &p->port);
-
-        return 0;
-}
-#else
-#define serial_hs_lpc32xx_suspend       NULL
-#define serial_hs_lpc32xx_resume        NULL
-#endif
-
-static const struct of_device_id serial_hs_lpc32xx_dt_ids[] = {
-        { .compatible = "nxp,lpc3220-hsuart" },
-        { /* sentinel */ }
-};
-
-MODULE_DEVICE_TABLE(of, serial_hs_lpc32xx_dt_ids);
-
-static struct platform_driver serial_hs_lpc32xx_driver = {
-        .probe          = serial_hs_lpc32xx_probe,
-        .remove         = serial_hs_lpc32xx_remove,
-        .suspend        = serial_hs_lpc32xx_suspend,
-        .resume         = serial_hs_lpc32xx_resume,
-        .driver         = {
-                .name   = MODNAME,
-                .owner  = THIS_MODULE,
-                .of_match_table = serial_hs_lpc32xx_dt_ids,
-        },
-};
-
-static int __init lpc32xx_hsuart_init(void)
-{
-        int ret;
-
-        ret = uart_register_driver(&lpc32xx_hs_reg);
-        if (ret)
-                return ret;
-
-        ret = platform_driver_register(&serial_hs_lpc32xx_driver);
-        if (ret)
-                uart_unregister_driver(&lpc32xx_hs_reg);
-
-        return ret;
-}
-
-static void __exit lpc32xx_hsuart_exit(void)
-{
-        platform_driver_unregister(&serial_hs_lpc32xx_driver);
-        uart_unregister_driver(&lpc32xx_hs_reg);
-}
-
-module_init(lpc32xx_hsuart_init);
-module_exit(lpc32xx_hsuart_exit);
-
-MODULE_AUTHOR("Kevin Wells <kevin.wells@nxp.com>");
-MODULE_AUTHOR("Roland Stigge <stigge@antcom.de>");
-MODULE_DESCRIPTION("NXP LPC32XX High Speed UART driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index b13949ad340..8e07517f8ac 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -32,18 +32,20 @@
 
 #include <linux/module.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/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>
@@ -67,6 +69,13 @@
 
 #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)
+
 #define BASE_BAUD       115200
 
 /* Standard COM flags */
@@ -130,6 +139,22 @@ struct irq_info {
 
 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))
@@ -614,7 +639,7 @@ static int m32r_sio_startup(struct uart_port *port)
          * hardware interrupt, we use a timer-based system.  The original
          * driver used to do this with IRQ0.
          */
-        if (!up->port.irq) {
+        if (!is_real_interrupt(up->port.irq)) {
                 unsigned int timeout = up->port.timeout;
 
                 timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
@@ -661,7 +686,7 @@ static void m32r_sio_shutdown(struct uart_port *port)
 
         sio_init();
 
-        if (!up->port.irq)
+        if (!is_real_interrupt(up->port.irq))
                 del_timer_sync(&up->timer);
         else
                 serial_unlink_irq_chain(up);
@@ -889,7 +914,8 @@ static void m32r_sio_config_port(struct uart_port *port, int unused)
 
         spin_lock_irqsave(&up->port.lock, flags);
 
-        up->port.fifosize = 1;
+        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);
 }
@@ -897,11 +923,23 @@ static void m32r_sio_config_port(struct uart_port *port, int unused)
 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)
+        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,
@@ -915,6 +953,7 @@ static struct uart_ops m32r_sio_pops = {
         .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,
@@ -960,8 +999,11 @@ static void __init m32r_sio_register_ports(struct uart_driver *drv)
                 init_timer(&up->timer);
                 up->timer.function = m32r_sio_timeout;
 
-                up->mcr_mask = ~0;
-                up->mcr_force = 0;
+                /*
+                 * 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);
         }
diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h
index 8129824496c..e9b7e11793b 100644
--- a/drivers/tty/serial/m32r_sio.h
+++ b/drivers/tty/serial/m32r_sio.h
@@ -15,7 +15,6 @@
  * (at your option) any later version.
  */
 
-#include <linux/pci.h>
 
 struct m32r_sio_probe {
         struct module   *owner;
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index 7ce3197087b..7b951adac54 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -43,13 +43,10 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/device.h>
-#include <linux/module.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 #include <linux/spi/spi.h>
 #include <linux/freezer.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 
 #include <linux/serial_max3100.h>
 
@@ -742,7 +739,7 @@ static struct uart_driver max3100_uart_driver = {
 };
 static int uart_driver_registered;
 
-static int max3100_probe(struct spi_device *spi)
+static int __devinit max3100_probe(struct spi_device *spi)
 {
         int i, retval;
         struct plat_max3100 *pdata;
@@ -818,7 +815,7 @@ static int max3100_probe(struct spi_device *spi)
         return 0;
 }
 
-static int max3100_remove(struct spi_device *spi)
+static int __devexit max3100_remove(struct spi_device *spi)
 {
         struct max3100_port *s = dev_get_drvdata(&spi->dev);
         int i;
@@ -827,16 +824,14 @@ static int max3100_remove(struct spi_device *spi)
 
         /* find out the index for the chip we are removing */
         for (i = 0; i < MAX_MAX3100; i++)
-                if (max3100s[i] == s) {
-                        dev_dbg(&spi->dev, "%s: removing port %d\n", __func__, i);
-                        uart_remove_one_port(&max3100_uart_driver, &max3100s[i]->port);
-                        kfree(max3100s[i]);
-                        max3100s[i] = NULL;
+                if (max3100s[i] == s)
                         break;
-                }
 
-        WARN_ON(i == MAX_MAX3100);
-        
+        dev_dbg(&spi->dev, "%s: removing port %d\n", __func__, i);
+        uart_remove_one_port(&max3100_uart_driver, &max3100s[i]->port);
+        kfree(max3100s[i]);
+        max3100s[i] = NULL;
+
         /* check if this is the last chip we have */
         for (i = 0; i < MAX_MAX3100; i++)
                 if (max3100s[i]) {
@@ -903,16 +898,27 @@ static int max3100_resume(struct spi_device *spi)
 static struct spi_driver max3100_driver = {
         .driver = {
                 .name           = "max3100",
+                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
         .probe          = max3100_probe,
-        .remove         = max3100_remove,
+        .remove         = __devexit_p(max3100_remove),
         .suspend        = max3100_suspend,
         .resume         = max3100_resume,
 };
 
-module_spi_driver(max3100_driver);
+static int __init max3100_init(void)
+{
+        return spi_register_driver(&max3100_driver);
+}
+module_init(max3100_init);
+
+static void __exit max3100_exit(void)
+{
+        spi_unregister_driver(&max3100_driver);
+}
+module_exit(max3100_exit);
 
 MODULE_DESCRIPTION("MAX3100 driver");
 MODULE_AUTHOR("Christian Pellegrin <chripell@evolware.org>");
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
deleted file mode 100644
index a801f6872ca..00000000000
--- a/drivers/tty/serial/max310x.c
+++ /dev/null
@@ -1,1262 +0,0 @@
-/*
- *  Maxim (Dallas) MAX3107/8 serial driver
- *
- *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
- *
- *  Based on max3100.c, by Christian Pellegrin <chripell@evolware.org>
- *  Based on max3110.c, by Feng Tang <feng.tang@intel.com>
- *  Based on max3107.c, by Aavamobile
- *
- *  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.
- */
-
-/* TODO: MAX3109 support (Dual) */
-/* TODO: MAX14830 support (Quad) */
-
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/regmap.h>
-#include <linux/gpio.h>
-#include <linux/spi/spi.h>
-#include <linux/platform_data/max310x.h>
-
-#define MAX310X_MAJOR                   204
-#define MAX310X_MINOR                   209
-
-/* MAX310X register definitions */
-#define MAX310X_RHR_REG                 (0x00) /* RX FIFO */
-#define MAX310X_THR_REG                 (0x00) /* TX FIFO */
-#define MAX310X_IRQEN_REG               (0x01) /* IRQ enable */
-#define MAX310X_IRQSTS_REG              (0x02) /* IRQ status */
-#define MAX310X_LSR_IRQEN_REG           (0x03) /* LSR IRQ enable */
-#define MAX310X_LSR_IRQSTS_REG          (0x04) /* LSR IRQ status */
-#define MAX310X_SPCHR_IRQEN_REG         (0x05) /* Special char IRQ enable */
-#define MAX310X_SPCHR_IRQSTS_REG        (0x06) /* Special char IRQ status */
-#define MAX310X_STS_IRQEN_REG           (0x07) /* Status IRQ enable */
-#define MAX310X_STS_IRQSTS_REG          (0x08) /* Status IRQ status */
-#define MAX310X_MODE1_REG               (0x09) /* MODE1 */
-#define MAX310X_MODE2_REG               (0x0a) /* MODE2 */
-#define MAX310X_LCR_REG                 (0x0b) /* LCR */
-#define MAX310X_RXTO_REG                (0x0c) /* RX timeout */
-#define MAX310X_HDPIXDELAY_REG          (0x0d) /* Auto transceiver delays */
-#define MAX310X_IRDA_REG                (0x0e) /* IRDA settings */
-#define MAX310X_FLOWLVL_REG             (0x0f) /* Flow control levels */
-#define MAX310X_FIFOTRIGLVL_REG         (0x10) /* FIFO IRQ trigger levels */
-#define MAX310X_TXFIFOLVL_REG           (0x11) /* TX FIFO level */
-#define MAX310X_RXFIFOLVL_REG           (0x12) /* RX FIFO level */
-#define MAX310X_FLOWCTRL_REG            (0x13) /* Flow control */
-#define MAX310X_XON1_REG                (0x14) /* XON1 character */
-#define MAX310X_XON2_REG                (0x15) /* XON2 character */
-#define MAX310X_XOFF1_REG               (0x16) /* XOFF1 character */
-#define MAX310X_XOFF2_REG               (0x17) /* XOFF2 character */
-#define MAX310X_GPIOCFG_REG             (0x18) /* GPIO config */
-#define MAX310X_GPIODATA_REG            (0x19) /* GPIO data */
-#define MAX310X_PLLCFG_REG              (0x1a) /* PLL config */
-#define MAX310X_BRGCFG_REG              (0x1b) /* Baud rate generator conf */
-#define MAX310X_BRGDIVLSB_REG           (0x1c) /* Baud rate divisor LSB */
-#define MAX310X_BRGDIVMSB_REG           (0x1d) /* Baud rate divisor MSB */
-#define MAX310X_CLKSRC_REG              (0x1e) /* Clock source */
-/* Only present in MAX3107 */
-#define MAX3107_REVID_REG               (0x1f) /* Revision identification */
-
-/* IRQ register bits */
-#define MAX310X_IRQ_LSR_BIT             (1 << 0) /* LSR interrupt */
-#define MAX310X_IRQ_SPCHR_BIT           (1 << 1) /* Special char interrupt */
-#define MAX310X_IRQ_STS_BIT             (1 << 2) /* Status interrupt */
-#define MAX310X_IRQ_RXFIFO_BIT          (1 << 3) /* RX FIFO interrupt */
-#define MAX310X_IRQ_TXFIFO_BIT          (1 << 4) /* TX FIFO interrupt */
-#define MAX310X_IRQ_TXEMPTY_BIT         (1 << 5) /* TX FIFO empty interrupt */
-#define MAX310X_IRQ_RXEMPTY_BIT         (1 << 6) /* RX FIFO empty interrupt */
-#define MAX310X_IRQ_CTS_BIT             (1 << 7) /* CTS interrupt */
-
-/* LSR register bits */
-#define MAX310X_LSR_RXTO_BIT            (1 << 0) /* RX timeout */
-#define MAX310X_LSR_RXOVR_BIT           (1 << 1) /* RX overrun */
-#define MAX310X_LSR_RXPAR_BIT           (1 << 2) /* RX parity error */
-#define MAX310X_LSR_FRERR_BIT           (1 << 3) /* Frame error */
-#define MAX310X_LSR_RXBRK_BIT           (1 << 4) /* RX break */
-#define MAX310X_LSR_RXNOISE_BIT         (1 << 5) /* RX noise */
-#define MAX310X_LSR_CTS_BIT             (1 << 7) /* CTS pin state */
-
-/* Special character register bits */
-#define MAX310X_SPCHR_XON1_BIT          (1 << 0) /* XON1 character */
-#define MAX310X_SPCHR_XON2_BIT          (1 << 1) /* XON2 character */
-#define MAX310X_SPCHR_XOFF1_BIT         (1 << 2) /* XOFF1 character */
-#define MAX310X_SPCHR_XOFF2_BIT         (1 << 3) /* XOFF2 character */
-#define MAX310X_SPCHR_BREAK_BIT         (1 << 4) /* RX break */
-#define MAX310X_SPCHR_MULTIDROP_BIT     (1 << 5) /* 9-bit multidrop addr char */
-
-/* Status register bits */
-#define MAX310X_STS_GPIO0_BIT           (1 << 0) /* GPIO 0 interrupt */
-#define MAX310X_STS_GPIO1_BIT           (1 << 1) /* GPIO 1 interrupt */
-#define MAX310X_STS_GPIO2_BIT           (1 << 2) /* GPIO 2 interrupt */
-#define MAX310X_STS_GPIO3_BIT           (1 << 3) /* GPIO 3 interrupt */
-#define MAX310X_STS_CLKREADY_BIT        (1 << 5) /* Clock ready */
-#define MAX310X_STS_SLEEP_BIT           (1 << 6) /* Sleep interrupt */
-
-/* MODE1 register bits */
-#define MAX310X_MODE1_RXDIS_BIT         (1 << 0) /* RX disable */
-#define MAX310X_MODE1_TXDIS_BIT         (1 << 1) /* TX disable */
-#define MAX310X_MODE1_TXHIZ_BIT         (1 << 2) /* TX pin three-state */
-#define MAX310X_MODE1_RTSHIZ_BIT        (1 << 3) /* RTS pin three-state */
-#define MAX310X_MODE1_TRNSCVCTRL_BIT    (1 << 4) /* Transceiver ctrl enable */
-#define MAX310X_MODE1_FORCESLEEP_BIT    (1 << 5) /* Force sleep mode */
-#define MAX310X_MODE1_AUTOSLEEP_BIT     (1 << 6) /* Auto sleep enable */
-#define MAX310X_MODE1_IRQSEL_BIT        (1 << 7) /* IRQ pin enable */
-
-/* MODE2 register bits */
-#define MAX310X_MODE2_RST_BIT           (1 << 0) /* Chip reset */
-#define MAX310X_MODE2_FIFORST_BIT       (1 << 1) /* FIFO reset */
-#define MAX310X_MODE2_RXTRIGINV_BIT     (1 << 2) /* RX FIFO INT invert */
-#define MAX310X_MODE2_RXEMPTINV_BIT     (1 << 3) /* RX FIFO empty INT invert */
-#define MAX310X_MODE2_SPCHR_BIT         (1 << 4) /* Special chr detect enable */
-#define MAX310X_MODE2_LOOPBACK_BIT      (1 << 5) /* Internal loopback enable */
-#define MAX310X_MODE2_MULTIDROP_BIT     (1 << 6) /* 9-bit multidrop enable */
-#define MAX310X_MODE2_ECHOSUPR_BIT      (1 << 7) /* ECHO suppression enable */
-
-/* LCR register bits */
-#define MAX310X_LCR_LENGTH0_BIT         (1 << 0) /* Word length bit 0 */
-#define MAX310X_LCR_LENGTH1_BIT         (1 << 1) /* Word length bit 1
-                                                  *
-                                                  * Word length bits table:
-                                                  * 00 -> 5 bit words
-                                                  * 01 -> 6 bit words
-                                                  * 10 -> 7 bit words
-                                                  * 11 -> 8 bit words
-                                                  */
-#define MAX310X_LCR_STOPLEN_BIT         (1 << 2) /* STOP length bit
-                                                  *
-                                                  * STOP length bit table:
-                                                  * 0 -> 1 stop bit
-                                                  * 1 -> 1-1.5 stop bits if
-                                                  *      word length is 5,
-                                                  *      2 stop bits otherwise
-                                                  */
-#define MAX310X_LCR_PARITY_BIT          (1 << 3) /* Parity bit enable */
-#define MAX310X_LCR_EVENPARITY_BIT      (1 << 4) /* Even parity bit enable */
-#define MAX310X_LCR_FORCEPARITY_BIT     (1 << 5) /* 9-bit multidrop parity */
-#define MAX310X_LCR_TXBREAK_BIT         (1 << 6) /* TX break enable */
-#define MAX310X_LCR_RTS_BIT             (1 << 7) /* RTS pin control */
-#define MAX310X_LCR_WORD_LEN_5          (0x00)
-#define MAX310X_LCR_WORD_LEN_6          (0x01)
-#define MAX310X_LCR_WORD_LEN_7          (0x02)
-#define MAX310X_LCR_WORD_LEN_8          (0x03)
-
-/* IRDA register bits */
-#define MAX310X_IRDA_IRDAEN_BIT         (1 << 0) /* IRDA mode enable */
-#define MAX310X_IRDA_SIR_BIT            (1 << 1) /* SIR mode enable */
-#define MAX310X_IRDA_SHORTIR_BIT        (1 << 2) /* Short SIR mode enable */
-#define MAX310X_IRDA_MIR_BIT            (1 << 3) /* MIR mode enable */
-#define MAX310X_IRDA_RXINV_BIT          (1 << 4) /* RX logic inversion enable */
-#define MAX310X_IRDA_TXINV_BIT          (1 << 5) /* TX logic inversion enable */
-
-/* Flow control trigger level register masks */
-#define MAX310X_FLOWLVL_HALT_MASK       (0x000f) /* Flow control halt level */
-#define MAX310X_FLOWLVL_RES_MASK        (0x00f0) /* Flow control resume level */
-#define MAX310X_FLOWLVL_HALT(words)     ((words / 8) & 0x0f)
-#define MAX310X_FLOWLVL_RES(words)      (((words / 8) & 0x0f) << 4)
-
-/* FIFO interrupt trigger level register masks */
-#define MAX310X_FIFOTRIGLVL_TX_MASK     (0x0f) /* TX FIFO trigger level */
-#define MAX310X_FIFOTRIGLVL_RX_MASK     (0xf0) /* RX FIFO trigger level */
-#define MAX310X_FIFOTRIGLVL_TX(words)   ((words / 8) & 0x0f)
-#define MAX310X_FIFOTRIGLVL_RX(words)   (((words / 8) & 0x0f) << 4)
-
-/* Flow control register bits */
-#define MAX310X_FLOWCTRL_AUTORTS_BIT    (1 << 0) /* Auto RTS flow ctrl enable */
-#define MAX310X_FLOWCTRL_AUTOCTS_BIT    (1 << 1) /* Auto CTS flow ctrl enable */
-#define MAX310X_FLOWCTRL_GPIADDR_BIT    (1 << 2) /* Enables that GPIO inputs
-                                                  * are used in conjunction with
-                                                  * XOFF2 for definition of
-                                                  * special character */
-#define MAX310X_FLOWCTRL_SWFLOWEN_BIT   (1 << 3) /* Auto SW flow ctrl enable */
-#define MAX310X_FLOWCTRL_SWFLOW0_BIT    (1 << 4) /* SWFLOW bit 0 */
-#define MAX310X_FLOWCTRL_SWFLOW1_BIT    (1 << 5) /* SWFLOW bit 1
-                                                  *
-                                                  * SWFLOW bits 1 & 0 table:
-                                                  * 00 -> no transmitter flow
-                                                  *       control
-                                                  * 01 -> receiver compares
-                                                  *       XON2 and XOFF2
-                                                  *       and controls
-                                                  *       transmitter
-                                                  * 10 -> receiver compares
-                                                  *       XON1 and XOFF1
-                                                  *       and controls
-                                                  *       transmitter
-                                                  * 11 -> receiver compares
-                                                  *       XON1, XON2, XOFF1 and
-                                                  *       XOFF2 and controls
-                                                  *       transmitter
-                                                  */
-#define MAX310X_FLOWCTRL_SWFLOW2_BIT    (1 << 6) /* SWFLOW bit 2 */
-#define MAX310X_FLOWCTRL_SWFLOW3_BIT    (1 << 7) /* SWFLOW bit 3
-                                                  *
-                                                  * SWFLOW bits 3 & 2 table:
-                                                  * 00 -> no received flow
-                                                  *       control
-                                                  * 01 -> transmitter generates
-                                                  *       XON2 and XOFF2
-                                                  * 10 -> transmitter generates
-                                                  *       XON1 and XOFF1
-                                                  * 11 -> transmitter generates
-                                                  *       XON1, XON2, XOFF1 and
-                                                  *       XOFF2
-                                                  */
-
-/* GPIO configuration register bits */
-#define MAX310X_GPIOCFG_GP0OUT_BIT      (1 << 0) /* GPIO 0 output enable */
-#define MAX310X_GPIOCFG_GP1OUT_BIT      (1 << 1) /* GPIO 1 output enable */
-#define MAX310X_GPIOCFG_GP2OUT_BIT      (1 << 2) /* GPIO 2 output enable */
-#define MAX310X_GPIOCFG_GP3OUT_BIT      (1 << 3) /* GPIO 3 output enable */
-#define MAX310X_GPIOCFG_GP0OD_BIT       (1 << 4) /* GPIO 0 open-drain enable */
-#define MAX310X_GPIOCFG_GP1OD_BIT       (1 << 5) /* GPIO 1 open-drain enable */
-#define MAX310X_GPIOCFG_GP2OD_BIT       (1 << 6) /* GPIO 2 open-drain enable */
-#define MAX310X_GPIOCFG_GP3OD_BIT       (1 << 7) /* GPIO 3 open-drain enable */
-
-/* GPIO DATA register bits */
-#define MAX310X_GPIODATA_GP0OUT_BIT     (1 << 0) /* GPIO 0 output value */
-#define MAX310X_GPIODATA_GP1OUT_BIT     (1 << 1) /* GPIO 1 output value */
-#define MAX310X_GPIODATA_GP2OUT_BIT     (1 << 2) /* GPIO 2 output value */
-#define MAX310X_GPIODATA_GP3OUT_BIT     (1 << 3) /* GPIO 3 output value */
-#define MAX310X_GPIODATA_GP0IN_BIT      (1 << 4) /* GPIO 0 input value */
-#define MAX310X_GPIODATA_GP1IN_BIT      (1 << 5) /* GPIO 1 input value */
-#define MAX310X_GPIODATA_GP2IN_BIT      (1 << 6) /* GPIO 2 input value */
-#define MAX310X_GPIODATA_GP3IN_BIT      (1 << 7) /* GPIO 3 input value */
-
-/* PLL configuration register masks */
-#define MAX310X_PLLCFG_PREDIV_MASK      (0x3f) /* PLL predivision value */
-#define MAX310X_PLLCFG_PLLFACTOR_MASK   (0xc0) /* PLL multiplication factor */
-
-/* Baud rate generator configuration register bits */
-#define MAX310X_BRGCFG_2XMODE_BIT       (1 << 4) /* Double baud rate */
-#define MAX310X_BRGCFG_4XMODE_BIT       (1 << 5) /* Quadruple baud rate */
-
-/* Clock source register bits */
-#define MAX310X_CLKSRC_CRYST_BIT        (1 << 1) /* Crystal osc enable */
-#define MAX310X_CLKSRC_PLL_BIT          (1 << 2) /* PLL enable */
-#define MAX310X_CLKSRC_PLLBYP_BIT       (1 << 3) /* PLL bypass */
-#define MAX310X_CLKSRC_EXTCLK_BIT       (1 << 4) /* External clock enable */
-#define MAX310X_CLKSRC_CLK2RTS_BIT      (1 << 7) /* Baud clk to RTS pin */
-
-/* Misc definitions */
-#define MAX310X_FIFO_SIZE               (128)
-
-/* MAX3107 specific */
-#define MAX3107_REV_ID                  (0xa0)
-#define MAX3107_REV_MASK                (0xfe)
-
-/* IRQ status bits definitions */
-#define MAX310X_IRQ_TX                  (MAX310X_IRQ_TXFIFO_BIT | \
-                                         MAX310X_IRQ_TXEMPTY_BIT)
-#define MAX310X_IRQ_RX                  (MAX310X_IRQ_RXFIFO_BIT | \
-                                         MAX310X_IRQ_RXEMPTY_BIT)
-
-/* Supported chip types */
-enum {
-        MAX310X_TYPE_MAX3107    = 3107,
-        MAX310X_TYPE_MAX3108    = 3108,
-};
-
-struct max310x_port {
-        struct uart_driver      uart;
-        struct uart_port        port;
-
-        const char              *name;
-        int                     uartclk;
-
-        unsigned int            nr_gpio;
-#ifdef CONFIG_GPIOLIB
-        struct gpio_chip        gpio;
-#endif
-
-        struct regmap           *regmap;
-        struct regmap_config    regcfg;
-
-        struct workqueue_struct *wq;
-        struct work_struct      tx_work;
-
-        struct mutex            max310x_mutex;
-
-        struct max310x_pdata    *pdata;
-};
-
-static bool max3107_8_reg_writeable(struct device *dev, unsigned int reg)
-{
-        switch (reg) {
-        case MAX310X_IRQSTS_REG:
-        case MAX310X_LSR_IRQSTS_REG:
-        case MAX310X_SPCHR_IRQSTS_REG:
-        case MAX310X_STS_IRQSTS_REG:
-        case MAX310X_TXFIFOLVL_REG:
-        case MAX310X_RXFIFOLVL_REG:
-        case MAX3107_REVID_REG: /* Only available on MAX3107 */
-                return false;
-        default:
-                break;
-        }
-
-        return true;
-}
-
-static bool max310x_reg_volatile(struct device *dev, unsigned int reg)
-{
-        switch (reg) {
-        case MAX310X_RHR_REG:
-        case MAX310X_IRQSTS_REG:
-        case MAX310X_LSR_IRQSTS_REG:
-        case MAX310X_SPCHR_IRQSTS_REG:
-        case MAX310X_STS_IRQSTS_REG:
-        case MAX310X_TXFIFOLVL_REG:
-        case MAX310X_RXFIFOLVL_REG:
-        case MAX310X_GPIODATA_REG:
-                return true;
-        default:
-                break;
-        }
-
-        return false;
-}
-
-static bool max310x_reg_precious(struct device *dev, unsigned int reg)
-{
-        switch (reg) {
-        case MAX310X_RHR_REG:
-        case MAX310X_IRQSTS_REG:
-        case MAX310X_SPCHR_IRQSTS_REG:
-        case MAX310X_STS_IRQSTS_REG:
-                return true;
-        default:
-                break;
-        }
-
-        return false;
-}
-
-static void max310x_set_baud(struct max310x_port *s, int baud)
-{
-        unsigned int mode = 0, div = s->uartclk / baud;
-
-        if (!(div / 16)) {
-                /* Mode x2 */
-                mode = MAX310X_BRGCFG_2XMODE_BIT;
-                div = (s->uartclk * 2) / baud;
-        }
-
-        if (!(div / 16)) {
-                /* Mode x4 */
-                mode = MAX310X_BRGCFG_4XMODE_BIT;
-                div = (s->uartclk * 4) / baud;
-        }
-
-        regmap_write(s->regmap, MAX310X_BRGDIVMSB_REG,
-                     ((div / 16) >> 8) & 0xff);
-        regmap_write(s->regmap, MAX310X_BRGDIVLSB_REG, (div / 16) & 0xff);
-        regmap_write(s->regmap, MAX310X_BRGCFG_REG, (div % 16) | mode);
-}
-
-static void max310x_wait_pll(struct max310x_port *s)
-{
-        int tryes = 1000;
-
-        /* Wait for PLL only if crystal is used */
-        if (!(s->pdata->driver_flags & MAX310X_EXT_CLK)) {
-                unsigned int sts = 0;
-
-                while (tryes--) {
-                        regmap_read(s->regmap, MAX310X_STS_IRQSTS_REG, &sts);
-                        if (sts & MAX310X_STS_CLKREADY_BIT)
-                                break;
-                }
-        }
-}
-
-static int max310x_update_best_err(unsigned long f, long *besterr)
-{
-        /* Use baudrate 115200 for calculate error */
-        long err = f % (115200 * 16);
-
-        if ((*besterr < 0) || (*besterr > err)) {
-                *besterr = err;
-                return 0;
-        }
-
-        return 1;
-}
-
-static int max310x_set_ref_clk(struct max310x_port *s)
-{
-        unsigned int div, clksrc, pllcfg = 0;
-        long besterr = -1;
-        unsigned long fdiv, fmul, bestfreq = s->pdata->frequency;
-
-        /* First, update error without PLL */
-        max310x_update_best_err(s->pdata->frequency, &besterr);
-
-        /* Try all possible PLL dividers */
-        for (div = 1; (div <= 63) && besterr; div++) {
-                fdiv = DIV_ROUND_CLOSEST(s->pdata->frequency, div);
-
-                /* Try multiplier 6 */
-                fmul = fdiv * 6;
-                if ((fdiv >= 500000) && (fdiv <= 800000))
-                        if (!max310x_update_best_err(fmul, &besterr)) {
-                                pllcfg = (0 << 6) | div;
-                                bestfreq = fmul;
-                        }
-                /* Try multiplier 48 */
-                fmul = fdiv * 48;
-                if ((fdiv >= 850000) && (fdiv <= 1200000))
-                        if (!max310x_update_best_err(fmul, &besterr)) {
-                                pllcfg = (1 << 6) | div;
-                                bestfreq = fmul;
-                        }
-                /* Try multiplier 96 */
-                fmul = fdiv * 96;
-                if ((fdiv >= 425000) && (fdiv <= 1000000))
-                        if (!max310x_update_best_err(fmul, &besterr)) {
-                                pllcfg = (2 << 6) | div;
-                                bestfreq = fmul;
-                        }
-                /* Try multiplier 144 */
-                fmul = fdiv * 144;
-                if ((fdiv >= 390000) && (fdiv <= 667000))
-                        if (!max310x_update_best_err(fmul, &besterr)) {
-                                pllcfg = (3 << 6) | div;
-                                bestfreq = fmul;
-                        }
-        }
-
-        /* Configure clock source */
-        if (s->pdata->driver_flags & MAX310X_EXT_CLK)
-                clksrc = MAX310X_CLKSRC_EXTCLK_BIT;
-        else
-                clksrc = MAX310X_CLKSRC_CRYST_BIT;
-
-        /* Configure PLL */
-        if (pllcfg) {
-                clksrc |= MAX310X_CLKSRC_PLL_BIT;
-                regmap_write(s->regmap, MAX310X_PLLCFG_REG, pllcfg);
-        } else
-                clksrc |= MAX310X_CLKSRC_PLLBYP_BIT;
-
-        regmap_write(s->regmap, MAX310X_CLKSRC_REG, clksrc);
-
-        if (pllcfg)
-                max310x_wait_pll(s);
-
-        dev_dbg(s->port.dev, "Reference clock set to %lu Hz\n", bestfreq);
-
-        return (int)bestfreq;
-}
-
-static void max310x_handle_rx(struct max310x_port *s, unsigned int rxlen)
-{
-        unsigned int sts = 0, ch = 0, flag;
-        struct tty_struct *tty = tty_port_tty_get(&s->port.state->port);
-
-        if (!tty)
-                return;
-
-        if (unlikely(rxlen >= MAX310X_FIFO_SIZE)) {
-                dev_warn(s->port.dev, "Possible RX FIFO overrun %d\n", rxlen);
-                /* Ensure sanity of RX level */
-                rxlen = MAX310X_FIFO_SIZE;
-        }
-
-        dev_dbg(s->port.dev, "RX Len = %u\n", rxlen);
-
-        while (rxlen--) {
-                regmap_read(s->regmap, MAX310X_RHR_REG, &ch);
-                regmap_read(s->regmap, MAX310X_LSR_IRQSTS_REG, &sts);
-
-                sts &= MAX310X_LSR_RXPAR_BIT | MAX310X_LSR_FRERR_BIT |
-                       MAX310X_LSR_RXOVR_BIT | MAX310X_LSR_RXBRK_BIT;
-
-                s->port.icount.rx++;
-                flag = TTY_NORMAL;
-
-                if (unlikely(sts)) {
-                        if (sts & MAX310X_LSR_RXBRK_BIT) {
-                                s->port.icount.brk++;
-                                if (uart_handle_break(&s->port))
-                                        continue;
-                        } else if (sts & MAX310X_LSR_RXPAR_BIT)
-                                s->port.icount.parity++;
-                        else if (sts & MAX310X_LSR_FRERR_BIT)
-                                s->port.icount.frame++;
-                        else if (sts & MAX310X_LSR_RXOVR_BIT)
-                                s->port.icount.overrun++;
-
-                        sts &= s->port.read_status_mask;
-                        if (sts & MAX310X_LSR_RXBRK_BIT)
-                                flag = TTY_BREAK;
-                        else if (sts & MAX310X_LSR_RXPAR_BIT)
-                                flag = TTY_PARITY;
-                        else if (sts & MAX310X_LSR_FRERR_BIT)
-                                flag = TTY_FRAME;
-                        else if (sts & MAX310X_LSR_RXOVR_BIT)
-                                flag = TTY_OVERRUN;
-                }
-
-                if (uart_handle_sysrq_char(s->port, ch))
-                        continue;
-
-                if (sts & s->port.ignore_status_mask)
-                        continue;
-
-                uart_insert_char(&s->port, sts, MAX310X_LSR_RXOVR_BIT,
-                                 ch, flag);
-        }
-
-        tty_flip_buffer_push(tty);
-
-        tty_kref_put(tty);
-}
-
-static void max310x_handle_tx(struct max310x_port *s)
-{
-        struct circ_buf *xmit = &s->port.state->xmit;
-        unsigned int txlen = 0, to_send;
-
-        if (unlikely(s->port.x_char)) {
-                regmap_write(s->regmap, MAX310X_THR_REG, s->port.x_char);
-                s->port.icount.tx++;
-                s->port.x_char = 0;
-                return;
-        }
-
-        if (uart_circ_empty(xmit) || uart_tx_stopped(&s->port))
-                return;
-
-        /* Get length of data pending in circular buffer */
-        to_send = uart_circ_chars_pending(xmit);
-        if (likely(to_send)) {
-                /* Limit to size of TX FIFO */
-                regmap_read(s->regmap, MAX310X_TXFIFOLVL_REG, &txlen);
-                txlen = MAX310X_FIFO_SIZE - txlen;
-                to_send = (to_send > txlen) ? txlen : to_send;
-
-                dev_dbg(s->port.dev, "TX Len = %u\n", to_send);
-
-                /* Add data to send */
-                s->port.icount.tx += to_send;
-                while (to_send--) {
-                        regmap_write(s->regmap, MAX310X_THR_REG,
-                                     xmit->buf[xmit->tail]);
-                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                };
-        }
-
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&s->port);
-}
-
-static irqreturn_t max310x_ist(int irq, void *dev_id)
-{
-        struct max310x_port *s = (struct max310x_port *)dev_id;
-        unsigned int ists = 0, lsr = 0, rxlen = 0;
-
-        mutex_lock(&s->max310x_mutex);
-
-        for (;;) {
-                /* Read IRQ status & RX FIFO level */
-                regmap_read(s->regmap, MAX310X_IRQSTS_REG, &ists);
-                regmap_read(s->regmap, MAX310X_LSR_IRQSTS_REG, &lsr);
-                regmap_read(s->regmap, MAX310X_RXFIFOLVL_REG, &rxlen);
-                if (!ists && !(lsr & MAX310X_LSR_RXTO_BIT) && !rxlen)
-                        break;
-
-                dev_dbg(s->port.dev, "IRQ status: 0x%02x\n", ists);
-
-                if (rxlen)
-                        max310x_handle_rx(s, rxlen);
-                if (ists & MAX310X_IRQ_TX)
-                        max310x_handle_tx(s);
-                if (ists & MAX310X_IRQ_CTS_BIT)
-                        uart_handle_cts_change(&s->port,
-                                               !!(lsr & MAX310X_LSR_CTS_BIT));
-        }
-
-        mutex_unlock(&s->max310x_mutex);
-
-        return IRQ_HANDLED;
-}
-
-static void max310x_wq_proc(struct work_struct *ws)
-{
-        struct max310x_port *s = container_of(ws, struct max310x_port, tx_work);
-
-        mutex_lock(&s->max310x_mutex);
-        max310x_handle_tx(s);
-        mutex_unlock(&s->max310x_mutex);
-}
-
-static void max310x_start_tx(struct uart_port *port)
-{
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-
-        queue_work(s->wq, &s->tx_work);
-}
-
-static void max310x_stop_tx(struct uart_port *port)
-{
-        /* Do nothing */
-}
-
-static void max310x_stop_rx(struct uart_port *port)
-{
-        /* Do nothing */
-}
-
-static unsigned int max310x_tx_empty(struct uart_port *port)
-{
-        unsigned int val = 0;
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-
-        mutex_lock(&s->max310x_mutex);
-        regmap_read(s->regmap, MAX310X_TXFIFOLVL_REG, &val);
-        mutex_unlock(&s->max310x_mutex);
-
-        return val ? 0 : TIOCSER_TEMT;
-}
-
-static void max310x_enable_ms(struct uart_port *port)
-{
-        /* Modem status not supported */
-}
-
-static unsigned int max310x_get_mctrl(struct uart_port *port)
-{
-        /* DCD and DSR are not wired and CTS/RTS is handled automatically
-         * so just indicate DSR and CAR asserted
-         */
-        return TIOCM_DSR | TIOCM_CAR;
-}
-
-static void max310x_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        /* DCD and DSR are not wired and CTS/RTS is hadnled automatically
-         * so do nothing
-         */
-}
-
-static void max310x_break_ctl(struct uart_port *port, int break_state)
-{
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-
-        mutex_lock(&s->max310x_mutex);
-        regmap_update_bits(s->regmap, MAX310X_LCR_REG,
-                           MAX310X_LCR_TXBREAK_BIT,
-                           break_state ? MAX310X_LCR_TXBREAK_BIT : 0);
-        mutex_unlock(&s->max310x_mutex);
-}
-
-static void max310x_set_termios(struct uart_port *port,
-                                struct ktermios *termios,
-                                struct ktermios *old)
-{
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-        unsigned int lcr, flow = 0;
-        int baud;
-
-        mutex_lock(&s->max310x_mutex);
-
-        /* Mask termios capabilities we don't support */
-        termios->c_cflag &= ~CMSPAR;
-        termios->c_iflag &= ~IXANY;
-
-        /* Word size */
-        switch (termios->c_cflag & CSIZE) {
-        case CS5:
-                lcr = MAX310X_LCR_WORD_LEN_5;
-                break;
-        case CS6:
-                lcr = MAX310X_LCR_WORD_LEN_6;
-                break;
-        case CS7:
-                lcr = MAX310X_LCR_WORD_LEN_7;
-                break;
-        case CS8:
-        default:
-                lcr = MAX310X_LCR_WORD_LEN_8;
-                break;
-        }
-
-        /* Parity */
-        if (termios->c_cflag & PARENB) {
-                lcr |= MAX310X_LCR_PARITY_BIT;
-                if (!(termios->c_cflag & PARODD))
-                        lcr |= MAX310X_LCR_EVENPARITY_BIT;
-        }
-
-        /* Stop bits */
-        if (termios->c_cflag & CSTOPB)
-                lcr |= MAX310X_LCR_STOPLEN_BIT; /* 2 stops */
-
-        /* Update LCR register */
-        regmap_write(s->regmap, MAX310X_LCR_REG, lcr);
-
-        /* Set read status mask */
-        port->read_status_mask = MAX310X_LSR_RXOVR_BIT;
-        if (termios->c_iflag & INPCK)
-                port->read_status_mask |= MAX310X_LSR_RXPAR_BIT |
-                                          MAX310X_LSR_FRERR_BIT;
-        if (termios->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= MAX310X_LSR_RXBRK_BIT;
-
-        /* Set status ignore mask */
-        port->ignore_status_mask = 0;
-        if (termios->c_iflag & IGNBRK)
-                port->ignore_status_mask |= MAX310X_LSR_RXBRK_BIT;
-        if (!(termios->c_cflag & CREAD))
-                port->ignore_status_mask |= MAX310X_LSR_RXPAR_BIT |
-                                            MAX310X_LSR_RXOVR_BIT |
-                                            MAX310X_LSR_FRERR_BIT |
-                                            MAX310X_LSR_RXBRK_BIT;
-
-        /* Configure flow control */
-        regmap_write(s->regmap, MAX310X_XON1_REG, termios->c_cc[VSTART]);
-        regmap_write(s->regmap, MAX310X_XOFF1_REG, termios->c_cc[VSTOP]);
-        if (termios->c_cflag & CRTSCTS)
-                flow |= MAX310X_FLOWCTRL_AUTOCTS_BIT |
-                        MAX310X_FLOWCTRL_AUTORTS_BIT;
-        if (termios->c_iflag & IXON)
-                flow |= MAX310X_FLOWCTRL_SWFLOW3_BIT |
-                        MAX310X_FLOWCTRL_SWFLOWEN_BIT;
-        if (termios->c_iflag & IXOFF)
-                flow |= MAX310X_FLOWCTRL_SWFLOW1_BIT |
-                        MAX310X_FLOWCTRL_SWFLOWEN_BIT;
-        regmap_write(s->regmap, MAX310X_FLOWCTRL_REG, flow);
-
-        /* Get baud rate generator configuration */
-        baud = uart_get_baud_rate(port, termios, old,
-                                  port->uartclk / 16 / 0xffff,
-                                  port->uartclk / 4);
-
-        /* Setup baudrate generator */
-        max310x_set_baud(s, baud);
-
-        /* Update timeout according to new baud rate */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        mutex_unlock(&s->max310x_mutex);
-}
-
-static int max310x_startup(struct uart_port *port)
-{
-        unsigned int val, line = port->line;
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-
-        if (s->pdata->suspend)
-                s->pdata->suspend(0);
-
-        mutex_lock(&s->max310x_mutex);
-
-        /* Configure baud rate, 9600 as default */
-        max310x_set_baud(s, 9600);
-
-        /* Configure LCR register, 8N1 mode by default */
-        val = MAX310X_LCR_WORD_LEN_8;
-        regmap_write(s->regmap, MAX310X_LCR_REG, val);
-
-        /* Configure MODE1 register */
-        regmap_update_bits(s->regmap, MAX310X_MODE1_REG,
-                           MAX310X_MODE1_TRNSCVCTRL_BIT,
-                           (s->pdata->uart_flags[line] & MAX310X_AUTO_DIR_CTRL)
-                           ? MAX310X_MODE1_TRNSCVCTRL_BIT : 0);
-
-        /* Configure MODE2 register */
-        val = MAX310X_MODE2_RXEMPTINV_BIT;
-        if (s->pdata->uart_flags[line] & MAX310X_LOOPBACK)
-                val |= MAX310X_MODE2_LOOPBACK_BIT;
-        if (s->pdata->uart_flags[line] & MAX310X_ECHO_SUPRESS)
-                val |= MAX310X_MODE2_ECHOSUPR_BIT;
-
-        /* Reset FIFOs */
-        val |= MAX310X_MODE2_FIFORST_BIT;
-        regmap_write(s->regmap, MAX310X_MODE2_REG, val);
-
-        /* Configure FIFO trigger level register */
-        /* RX FIFO trigger for 16 words, TX FIFO trigger for 64 words */
-        val = MAX310X_FIFOTRIGLVL_RX(16) | MAX310X_FIFOTRIGLVL_TX(64);
-        regmap_write(s->regmap, MAX310X_FIFOTRIGLVL_REG, val);
-
-        /* Configure flow control levels */
-        /* Flow control halt level 96, resume level 48 */
-        val = MAX310X_FLOWLVL_RES(48) | MAX310X_FLOWLVL_HALT(96);
-        regmap_write(s->regmap, MAX310X_FLOWLVL_REG, val);
-
-        /* Clear timeout register */
-        regmap_write(s->regmap, MAX310X_RXTO_REG, 0);
-
-        /* Configure LSR interrupt enable register */
-        /* Enable RX timeout interrupt */
-        val = MAX310X_LSR_RXTO_BIT;
-        regmap_write(s->regmap, MAX310X_LSR_IRQEN_REG, val);
-
-        /* Clear FIFO reset */
-        regmap_update_bits(s->regmap, MAX310X_MODE2_REG,
-                           MAX310X_MODE2_FIFORST_BIT, 0);
-
-        /* Clear IRQ status register by reading it */
-        regmap_read(s->regmap, MAX310X_IRQSTS_REG, &val);
-
-        /* Configure interrupt enable register */
-        /* Enable CTS change interrupt */
-        val = MAX310X_IRQ_CTS_BIT;
-        /* Enable RX, TX interrupts */
-        val |= MAX310X_IRQ_RX | MAX310X_IRQ_TX;
-        regmap_write(s->regmap, MAX310X_IRQEN_REG, val);
-
-        mutex_unlock(&s->max310x_mutex);
-
-        return 0;
-}
-
-static void max310x_shutdown(struct uart_port *port)
-{
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-
-        /* Disable all interrupts */
-        mutex_lock(&s->max310x_mutex);
-        regmap_write(s->regmap, MAX310X_IRQEN_REG, 0);
-        mutex_unlock(&s->max310x_mutex);
-
-        if (s->pdata->suspend)
-                s->pdata->suspend(1);
-}
-
-static const char *max310x_type(struct uart_port *port)
-{
-        struct max310x_port *s = container_of(port, struct max310x_port, port);
-
-        return (port->type == PORT_MAX310X) ? s->name : NULL;
-}
-
-static int max310x_request_port(struct uart_port *port)
-{
-        /* Do nothing */
-        return 0;
-}
-
-static void max310x_release_port(struct uart_port *port)
-{
-        /* Do nothing */
-}
-
-static void max310x_config_port(struct uart_port *port, int flags)
-{
-        if (flags & UART_CONFIG_TYPE)
-                port->type = PORT_MAX310X;
-}
-
-static int max310x_verify_port(struct uart_port *port, struct serial_struct *ser)
-{
-        if ((ser->type == PORT_UNKNOWN) || (ser->type == PORT_MAX310X))
-                return 0;
-        if (ser->irq == port->irq)
-                return 0;
-
-        return -EINVAL;
-}
-
-static struct uart_ops max310x_ops = {
-        .tx_empty       = max310x_tx_empty,
-        .set_mctrl      = max310x_set_mctrl,
-        .get_mctrl      = max310x_get_mctrl,
-        .stop_tx        = max310x_stop_tx,
-        .start_tx       = max310x_start_tx,
-        .stop_rx        = max310x_stop_rx,
-        .enable_ms      = max310x_enable_ms,
-        .break_ctl      = max310x_break_ctl,
-        .startup        = max310x_startup,
-        .shutdown       = max310x_shutdown,
-        .set_termios    = max310x_set_termios,
-        .type           = max310x_type,
-        .request_port   = max310x_request_port,
-        .release_port   = max310x_release_port,
-        .config_port    = max310x_config_port,
-        .verify_port    = max310x_verify_port,
-};
-
-static int max310x_suspend(struct spi_device *spi, pm_message_t state)
-{
-        int ret;
-        struct max310x_port *s = dev_get_drvdata(&spi->dev);
-
-        dev_dbg(&spi->dev, "Suspend\n");
-
-        ret = uart_suspend_port(&s->uart, &s->port);
-
-        mutex_lock(&s->max310x_mutex);
-
-        /* Enable sleep mode */
-        regmap_update_bits(s->regmap, MAX310X_MODE1_REG,
-                           MAX310X_MODE1_FORCESLEEP_BIT,
-                           MAX310X_MODE1_FORCESLEEP_BIT);
-
-        mutex_unlock(&s->max310x_mutex);
-
-        if (s->pdata->suspend)
-                s->pdata->suspend(1);
-
-        return ret;
-}
-
-static int max310x_resume(struct spi_device *spi)
-{
-        struct max310x_port *s = dev_get_drvdata(&spi->dev);
-
-        dev_dbg(&spi->dev, "Resume\n");
-
-        if (s->pdata->suspend)
-                s->pdata->suspend(0);
-
-        mutex_lock(&s->max310x_mutex);
-
-        /* Disable sleep mode */
-        regmap_update_bits(s->regmap, MAX310X_MODE1_REG,
-                           MAX310X_MODE1_FORCESLEEP_BIT,
-                           0);
-
-        max310x_wait_pll(s);
-
-        mutex_unlock(&s->max310x_mutex);
-
-        return uart_resume_port(&s->uart, &s->port);
-}
-
-#ifdef CONFIG_GPIOLIB
-static int max310x_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        unsigned int val = 0;
-        struct max310x_port *s = container_of(chip, struct max310x_port, gpio);
-
-        mutex_lock(&s->max310x_mutex);
-        regmap_read(s->regmap, MAX310X_GPIODATA_REG, &val);
-        mutex_unlock(&s->max310x_mutex);
-
-        return !!((val >> 4) & (1 << offset));
-}
-
-static void max310x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-        struct max310x_port *s = container_of(chip, struct max310x_port, gpio);
-
-        mutex_lock(&s->max310x_mutex);
-        regmap_update_bits(s->regmap, MAX310X_GPIODATA_REG, 1 << offset, value ?
-                                                            1 << offset : 0);
-        mutex_unlock(&s->max310x_mutex);
-}
-
-static int max310x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-{
-        struct max310x_port *s = container_of(chip, struct max310x_port, gpio);
-
-        mutex_lock(&s->max310x_mutex);
-
-        regmap_update_bits(s->regmap, MAX310X_GPIOCFG_REG, 1 << offset, 0);
-
-        mutex_unlock(&s->max310x_mutex);
-
-        return 0;
-}
-
-static int max310x_gpio_direction_output(struct gpio_chip *chip,
-                                         unsigned offset, int value)
-{
-        struct max310x_port *s = container_of(chip, struct max310x_port, gpio);
-
-        mutex_lock(&s->max310x_mutex);
-
-        regmap_update_bits(s->regmap, MAX310X_GPIOCFG_REG, 1 << offset,
-                                                           1 << offset);
-        regmap_update_bits(s->regmap, MAX310X_GPIODATA_REG, 1 << offset, value ?
-                                                            1 << offset : 0);
-
-        mutex_unlock(&s->max310x_mutex);
-
-        return 0;
-}
-#endif
-
-/* Generic platform data */
-static struct max310x_pdata generic_plat_data = {
-        .driver_flags   = MAX310X_EXT_CLK,
-        .uart_flags[0]  = MAX310X_ECHO_SUPRESS,
-        .frequency      = 26000000,
-};
-
-static int max310x_probe(struct spi_device *spi)
-{
-        struct max310x_port *s;
-        struct device *dev = &spi->dev;
-        int chiptype = spi_get_device_id(spi)->driver_data;
-        struct max310x_pdata *pdata = dev->platform_data;
-        unsigned int val = 0;
-        int ret;
-
-        /* Check for IRQ */
-        if (spi->irq <= 0) {
-                dev_err(dev, "No IRQ specified\n");
-                return -ENOTSUPP;
-        }
-
-        /* Alloc port structure */
-        s = devm_kzalloc(dev, sizeof(struct max310x_port), GFP_KERNEL);
-        if (!s) {
-                dev_err(dev, "Error allocating port structure\n");
-                return -ENOMEM;
-        }
-        dev_set_drvdata(dev, s);
-
-        if (!pdata) {
-                dev_warn(dev, "No platform data supplied, using defaults\n");
-                pdata = &generic_plat_data;
-        }
-        s->pdata = pdata;
-
-        /* Individual chip settings */
-        switch (chiptype) {
-        case MAX310X_TYPE_MAX3107:
-                s->name = "MAX3107";
-                s->nr_gpio = 4;
-                s->uart.nr = 1;
-                s->regcfg.max_register = 0x1f;
-                break;
-        case MAX310X_TYPE_MAX3108:
-                s->name = "MAX3108";
-                s->nr_gpio = 4;
-                s->uart.nr = 1;
-                s->regcfg.max_register = 0x1e;
-                break;
-        default:
-                dev_err(dev, "Unsupported chip type %i\n", chiptype);
-                return -ENOTSUPP;
-        }
-
-        /* Check input frequency */
-        if ((pdata->driver_flags & MAX310X_EXT_CLK) &&
-           ((pdata->frequency < 500000) || (pdata->frequency > 35000000)))
-                goto err_freq;
-        /* Check frequency for quartz */
-        if (!(pdata->driver_flags & MAX310X_EXT_CLK) &&
-           ((pdata->frequency < 1000000) || (pdata->frequency > 4000000)))
-                goto err_freq;
-
-        mutex_init(&s->max310x_mutex);
-
-        /* Setup SPI bus */
-        spi->mode               = SPI_MODE_0;
-        spi->bits_per_word      = 8;
-        spi->max_speed_hz       = 26000000;
-        spi_setup(spi);
-
-        /* Setup regmap */
-        s->regcfg.reg_bits              = 8;
-        s->regcfg.val_bits              = 8;
-        s->regcfg.read_flag_mask        = 0x00;
-        s->regcfg.write_flag_mask       = 0x80;
-        s->regcfg.cache_type            = REGCACHE_RBTREE;
-        s->regcfg.writeable_reg         = max3107_8_reg_writeable;
-        s->regcfg.volatile_reg          = max310x_reg_volatile;
-        s->regcfg.precious_reg          = max310x_reg_precious;
-        s->regmap = devm_regmap_init_spi(spi, &s->regcfg);
-        if (IS_ERR(s->regmap)) {
-                ret = PTR_ERR(s->regmap);
-                dev_err(dev, "Failed to initialize register map\n");
-                goto err_out;
-        }
-
-        /* Reset chip & check SPI function */
-        ret = regmap_write(s->regmap, MAX310X_MODE2_REG, MAX310X_MODE2_RST_BIT);
-        if (ret) {
-                dev_err(dev, "SPI transfer failed\n");
-                goto err_out;
-        }
-        /* Clear chip reset */
-        regmap_write(s->regmap, MAX310X_MODE2_REG, 0);
-
-        switch (chiptype) {
-        case MAX310X_TYPE_MAX3107:
-                /* Check REV ID to ensure we are talking to what we expect */
-                regmap_read(s->regmap, MAX3107_REVID_REG, &val);
-                if (((val & MAX3107_REV_MASK) != MAX3107_REV_ID)) {
-                        dev_err(dev, "%s ID 0x%02x does not match\n",
-                                s->name, val);
-                        ret = -ENODEV;
-                        goto err_out;
-                }
-                break;
-        case MAX310X_TYPE_MAX3108:
-                /* MAX3108 have not REV ID register, we just check default value
-                 * from clocksource register to make sure everything works.
-                 */
-                regmap_read(s->regmap, MAX310X_CLKSRC_REG, &val);
-                if (val != (MAX310X_CLKSRC_EXTCLK_BIT |
-                            MAX310X_CLKSRC_PLLBYP_BIT)) {
-                        dev_err(dev, "%s not present\n", s->name);
-                        ret = -ENODEV;
-                        goto err_out;
-                }
-                break;
-        }
-
-        /* Board specific configure */
-        if (pdata->init)
-                pdata->init();
-        if (pdata->suspend)
-                pdata->suspend(0);
-
-        /* Calculate referecne clock */
-        s->uartclk = max310x_set_ref_clk(s);
-
-        /* Disable all interrupts */
-        regmap_write(s->regmap, MAX310X_IRQEN_REG, 0);
-
-        /* Setup MODE1 register */
-        val = MAX310X_MODE1_IRQSEL_BIT; /* Enable IRQ pin */
-        if (pdata->driver_flags & MAX310X_AUTOSLEEP)
-                val = MAX310X_MODE1_AUTOSLEEP_BIT;
-        regmap_write(s->regmap, MAX310X_MODE1_REG, val);
-
-        /* Setup interrupt */
-        ret = devm_request_threaded_irq(dev, spi->irq, NULL, max310x_ist,
-                                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                        dev_name(dev), s);
-        if (ret) {
-                dev_err(dev, "Unable to reguest IRQ %i\n", spi->irq);
-                goto err_out;
-        }
-
-        /* Register UART driver */
-        s->uart.owner           = THIS_MODULE;
-        s->uart.driver_name     = dev_name(dev);
-        s->uart.dev_name        = "ttyMAX";
-        s->uart.major           = MAX310X_MAJOR;
-        s->uart.minor           = MAX310X_MINOR;
-        ret = uart_register_driver(&s->uart);
-        if (ret) {
-                dev_err(dev, "Registering UART driver failed\n");
-                goto err_out;
-        }
-
-        /* Initialize workqueue for start TX */
-        s->wq = create_freezable_workqueue(dev_name(dev));
-        INIT_WORK(&s->tx_work, max310x_wq_proc);
-
-        /* Initialize UART port data */
-        s->port.line            = 0;
-        s->port.dev             = dev;
-        s->port.irq             = spi->irq;
-        s->port.type            = PORT_MAX310X;
-        s->port.fifosize        = MAX310X_FIFO_SIZE;
-        s->port.flags           = UPF_SKIP_TEST | UPF_FIXED_TYPE;
-        s->port.iotype          = UPIO_PORT;
-        s->port.membase         = (void __iomem *)0xffffffff; /* Bogus value */
-        s->port.uartclk         = s->uartclk;
-        s->port.ops             = &max310x_ops;
-        uart_add_one_port(&s->uart, &s->port);
-
-#ifdef CONFIG_GPIOLIB
-        /* Setup GPIO cotroller */
-        if (pdata->gpio_base) {
-                s->gpio.owner           = THIS_MODULE;
-                s->gpio.dev             = dev;
-                s->gpio.label           = dev_name(dev);
-                s->gpio.direction_input = max310x_gpio_direction_input;
-                s->gpio.get             = max310x_gpio_get;
-                s->gpio.direction_output= max310x_gpio_direction_output;
-                s->gpio.set             = max310x_gpio_set;
-                s->gpio.base            = pdata->gpio_base;
-                s->gpio.ngpio           = s->nr_gpio;
-                s->gpio.can_sleep       = 1;
-                if (gpiochip_add(&s->gpio)) {
-                        /* Indicate that we should not call gpiochip_remove */
-                        s->gpio.base = 0;
-                }
-        } else
-                dev_info(dev, "GPIO support not enabled\n");
-#endif
-
-        /* Go to suspend mode */
-        if (pdata->suspend)
-                pdata->suspend(1);
-
-        return 0;
-
-err_freq:
-        dev_err(dev, "Frequency parameter incorrect\n");
-        ret = -EINVAL;
-
-err_out:
-        dev_set_drvdata(dev, NULL);
-
-        return ret;
-}
-
-static int max310x_remove(struct spi_device *spi)
-{
-        struct device *dev = &spi->dev;
-        struct max310x_port *s = dev_get_drvdata(dev);
-        int ret = 0;
-
-        dev_dbg(dev, "Removing port\n");
-
-        devm_free_irq(dev, s->port.irq, s);
-
-        destroy_workqueue(s->wq);
-
-        uart_remove_one_port(&s->uart, &s->port);
-
-        uart_unregister_driver(&s->uart);
-
-#ifdef CONFIG_GPIOLIB
-        if (s->pdata->gpio_base) {
-                ret = gpiochip_remove(&s->gpio);
-                if (ret)
-                        dev_err(dev, "Failed to remove gpio chip: %d\n", ret);
-        }
-#endif
-
-        dev_set_drvdata(dev, NULL);
-
-        if (s->pdata->suspend)
-                s->pdata->suspend(1);
-        if (s->pdata->exit)
-                s->pdata->exit();
-
-        return ret;
-}
-
-static const struct spi_device_id max310x_id_table[] = {
-        { "max3107",    MAX310X_TYPE_MAX3107 },
-        { "max3108",    MAX310X_TYPE_MAX3108 },
-        { }
-};
-MODULE_DEVICE_TABLE(spi, max310x_id_table);
-
-static struct spi_driver max310x_driver = {
-        .driver = {
-                .name   = "max310x",
-                .owner  = THIS_MODULE,
-        },
-        .probe          = max310x_probe,
-        .remove         = max310x_remove,
-        .suspend        = max310x_suspend,
-        .resume         = max310x_resume,
-        .id_table       = max310x_id_table,
-};
-module_spi_driver(max310x_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>");
-MODULE_DESCRIPTION("MAX310X serial driver");
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index fcd56ab6053..3394b7cc172 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -380,7 +380,7 @@ static void mcf_config_port(struct uart_port *port, int flags)
         /* Clear mask, so no surprise interrupts. */
         writeb(0, port->membase + MCFUART_UIMR);
 
-        if (request_irq(port->irq, mcf_interrupt, 0, "UART", port))
+        if (request_irq(port->irq, mcf_interrupt, IRQF_DISABLED, "UART", port))
                 printk(KERN_ERR "MCF: unable to attach ColdFire UART %d "
                         "interrupt vector=%d\n", port->line, port->irq);
 }
@@ -571,7 +571,7 @@ static struct uart_driver mcf_driver = {
 
 /****************************************************************************/
 
-static int mcf_probe(struct platform_device *pdev)
+static int __devinit mcf_probe(struct platform_device *pdev)
 {
         struct mcf_platform_uart *platp = pdev->dev.platform_data;
         struct uart_port *port;
@@ -599,7 +599,7 @@ static int mcf_probe(struct platform_device *pdev)
 
 /****************************************************************************/
 
-static int mcf_remove(struct platform_device *pdev)
+static int __devexit mcf_remove(struct platform_device *pdev)
 {
         struct uart_port *port;
         int i;
@@ -617,7 +617,7 @@ static int mcf_remove(struct platform_device *pdev)
 
 static struct platform_driver mcf_platform_driver = {
         .probe          = mcf_probe,
-        .remove         = mcf_remove,
+        .remove         = __devexit_p(mcf_remove),
         .driver         = {
                 .name   = "mcfuart",
                 .owner  = THIS_MODULE,
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 2c01344dc33..cab52f4a88b 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -36,10 +36,8 @@
 #include <linux/serial_mfd.h>
 #include <linux/dma-mapping.h>
 #include <linux/pci.h>
-#include <linux/nmi.h>
 #include <linux/io.h>
 #include <linux/debugfs.h>
-#include <linux/pm_runtime.h>
 
 #define HSU_DMA_BUF_SIZE        2048
 
@@ -128,6 +126,11 @@ static inline void serial_out(struct uart_hsu_port *up, int offset, int value)
 
 #define HSU_REGS_BUFSIZE        1024
 
+static int hsu_show_regs_open(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
 
 static ssize_t port_show_regs(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
@@ -227,14 +230,14 @@ static ssize_t dma_show_regs(struct file *file, char __user *user_buf,
 
 static const struct file_operations port_regs_ops = {
         .owner          = THIS_MODULE,
-        .open           = simple_open,
+        .open           = hsu_show_regs_open,
         .read           = port_show_regs,
         .llseek         = default_llseek,
 };
 
 static const struct file_operations dma_regs_ops = {
         .owner          = THIS_MODULE,
-        .open           = simple_open,
+        .open           = hsu_show_regs_open,
         .read           = dma_show_regs,
         .llseek         = default_llseek,
 };
@@ -761,8 +764,6 @@ static int serial_hsu_startup(struct uart_port *port)
                 container_of(port, struct uart_hsu_port, port);
         unsigned long flags;
 
-        pm_runtime_get_sync(up->dev);
-
         /*
          * Clear the FIFO buffers and disable them.
          * (they will be reenabled in set_termios())
@@ -870,8 +871,6 @@ static void serial_hsu_shutdown(struct uart_port *port)
                                   UART_FCR_CLEAR_RCVR |
                                   UART_FCR_CLEAR_XMIT);
         serial_out(up, UART_FCR, 0);
-
-        pm_runtime_put(up->dev);
 }
 
 static void
@@ -880,6 +879,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
 {
         struct uart_hsu_port *up =
                         container_of(port, struct uart_hsu_port, port);
+        struct tty_struct *tty = port->state->port.tty;
         unsigned char cval, fcr = 0;
         unsigned long flags;
         unsigned int baud, quot;
@@ -902,7 +902,8 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
         }
 
         /* CMSPAR isn't supported by this driver */
-        termios->c_cflag &= ~CMSPAR;
+        if (tty)
+                tty->termios->c_cflag &= ~CMSPAR;
 
         if (termios->c_cflag & CSTOPB)
                 cval |= UART_LCR_STOP;
@@ -1114,8 +1115,6 @@ serial_hsu_console_write(struct console *co, const char *s, unsigned int count)
         unsigned int ier;
         int locked = 1;
 
-        touch_nmi_watchdog();
-
         local_irq_save(flags);
         if (up->port.sysrq)
                 locked = 0;
@@ -1152,6 +1151,7 @@ serial_hsu_console_setup(struct console *co, char *options)
         int bits = 8;
         int parity = 'n';
         int flow = 'n';
+        int ret;
 
         if (co->index == -1 || co->index >= serial_hsu_reg.nr)
                 co->index = 0;
@@ -1162,7 +1162,9 @@ serial_hsu_console_setup(struct console *co, char *options)
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
 
-        return uart_set_options(&up->port, co, baud, parity, bits, flow);
+        ret = uart_set_options(&up->port, co, baud, parity, bits, flow);
+
+        return ret;
 }
 
 static struct console serial_hsu_console = {
@@ -1171,13 +1173,9 @@ static struct console serial_hsu_console = {
         .device         = uart_console_device,
         .setup          = serial_hsu_console_setup,
         .flags          = CON_PRINTBUFFER,
-        .index          = -1,
+        .index          = 2,
         .data           = &serial_hsu_reg,
 };
-
-#define SERIAL_HSU_CONSOLE      (&serial_hsu_console)
-#else
-#define SERIAL_HSU_CONSOLE      NULL
 #endif
 
 struct uart_ops serial_hsu_pops = {
@@ -1207,7 +1205,6 @@ static struct uart_driver serial_hsu_reg = {
         .major          = TTY_MAJOR,
         .minor          = 128,
         .nr             = 3,
-        .cons           = SERIAL_HSU_CONSOLE,
 };
 
 #ifdef CONFIG_PM
@@ -1252,39 +1249,6 @@ static int serial_hsu_resume(struct pci_dev *pdev)
 #define serial_hsu_resume       NULL
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
-static int serial_hsu_runtime_idle(struct device *dev)
-{
-        int err;
-
-        err = pm_schedule_suspend(dev, 500);
-        if (err)
-                return -EBUSY;
-
-        return 0;
-}
-
-static int serial_hsu_runtime_suspend(struct device *dev)
-{
-        return 0;
-}
-
-static int serial_hsu_runtime_resume(struct device *dev)
-{
-        return 0;
-}
-#else
-#define serial_hsu_runtime_idle         NULL
-#define serial_hsu_runtime_suspend      NULL
-#define serial_hsu_runtime_resume       NULL
-#endif
-
-static const struct dev_pm_ops serial_hsu_pm_ops = {
-        .runtime_suspend = serial_hsu_runtime_suspend,
-        .runtime_resume = serial_hsu_runtime_resume,
-        .runtime_idle = serial_hsu_runtime_idle,
-};
-
 /* temp global pointer before we settle down on using one or four PCI dev */
 static struct hsu_port *phsu;
 
@@ -1342,12 +1306,15 @@ static int serial_hsu_probe(struct pci_dev *pdev,
                 }
                 uart_add_one_port(&serial_hsu_reg, &uport->port);
 
+#ifdef CONFIG_SERIAL_MFD_HSU_CONSOLE
+                if (index == 2) {
+                        register_console(&serial_hsu_console);
+                        uport->port.cons = &serial_hsu_console;
+                }
+#endif
                 pci_set_drvdata(pdev, uport);
         }
 
-        pm_runtime_put_noidle(&pdev->dev);
-        pm_runtime_allow(&pdev->dev);
-
         return 0;
 
 err_disable:
@@ -1444,9 +1411,6 @@ static void serial_hsu_remove(struct pci_dev *pdev)
         if (!priv)
                 return;
 
-        pm_runtime_forbid(&pdev->dev);
-        pm_runtime_get_noresume(&pdev->dev);
-
         /* For port 0/1/2, priv is the address of uart_hsu_port */
         if (pdev->device != 0x081E) {
                 up = priv;
@@ -1459,7 +1423,7 @@ static void serial_hsu_remove(struct pci_dev *pdev)
 }
 
 /* First 3 are UART ports, and the 4th is the DMA */
-static const struct pci_device_id pci_ids[] = {
+static const struct pci_device_id pci_ids[] __devinitdata = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },
@@ -1471,12 +1435,9 @@ static struct pci_driver hsu_pci_driver = {
         .name =         "HSU serial",
         .id_table =     pci_ids,
         .probe =        serial_hsu_probe,
-        .remove =       serial_hsu_remove,
+        .remove =       __devexit_p(serial_hsu_remove),
         .suspend =      serial_hsu_suspend,
         .resume =       serial_hsu_resume,
-        .driver = {
-                .pm = &serial_hsu_pm_ops,
-        },
 };
 
 static int __init hsu_pci_init(void)
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 7c23c4f4c58..a0bcd8a3758 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -34,7 +34,6 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/sysrq.h>
 #include <linux/console.h>
@@ -262,9 +261,8 @@ static unsigned int mpc5200b_psc_set_baudrate(struct uart_port *port,
                                   port->uartclk / 4);
         divisor = (port->uartclk + 2 * baud) / (4 * baud);
 
-        /* select the proper prescaler and set the divisor
-         * prefer high prescaler for more tolerance on low baudrates */
-        if (divisor > 0xffff || baud <= 115200) {
+        /* select the proper prescaler and set the divisor */
+        if (divisor > 0xffff) {
                 divisor = (divisor + 4) / 8;
                 prescaler = 0xdd00; /* /32 */
         } else
@@ -275,7 +273,7 @@ static unsigned int mpc5200b_psc_set_baudrate(struct uart_port *port,
 
 static void mpc52xx_psc_get_irq(struct uart_port *port, struct device_node *np)
 {
-        port->irqflags = 0;
+        port->irqflags = IRQF_DISABLED;
         port->irq = irq_of_parse_and_map(np, 0);
 }
 
@@ -508,7 +506,7 @@ static int __init mpc512x_psc_fifoc_init(void)
 
         psc_fifoc_irq = irq_of_parse_and_map(np, 0);
         of_node_put(np);
-        if (psc_fifoc_irq == 0) {
+        if (psc_fifoc_irq == NO_IRQ) {
                 pr_err("%s: Can't get FIFOC irq\n", __func__);
                 iounmap(psc_fifoc);
                 return -ENODEV;
@@ -598,7 +596,7 @@ static struct psc_ops mpc512x_psc_ops = {
 };
 #endif
 
-static const struct psc_ops *psc_ops;
+static struct psc_ops *psc_ops;
 
 /* ======================================================================== */
 /* UART operations                                                          */
@@ -775,15 +773,11 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
         }
 
         if (new->c_cflag & PARENB) {
-                if (new->c_cflag & CMSPAR)
-                        mr1 |= MPC52xx_PSC_MODE_PARFORCE;
-
-                /* With CMSPAR, PARODD also means high parity (same as termios) */
                 mr1 |= (new->c_cflag & PARODD) ?
                         MPC52xx_PSC_MODE_PARODD : MPC52xx_PSC_MODE_PAREVEN;
-        } else {
+        } else
                 mr1 |= MPC52xx_PSC_MODE_PARNONE;
-        }
+
 
         mr2 = 0;
 
@@ -1308,7 +1302,7 @@ static struct of_device_id mpc52xx_uart_of_match[] = {
         {},
 };
 
-static int mpc52xx_uart_of_probe(struct platform_device *op)
+static int __devinit mpc52xx_uart_of_probe(struct platform_device *op)
 {
         int idx = -1;
         unsigned int uartclk;
@@ -1359,7 +1353,7 @@ static int mpc52xx_uart_of_probe(struct platform_device *op)
         }
 
         psc_ops->get_irq(port, op->dev.of_node);
-        if (port->irq == 0) {
+        if (port->irq == NO_IRQ) {
                 dev_dbg(&op->dev, "Could not get irq\n");
                 return -EINVAL;
         }
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 58734d7e746..23bc743f2a2 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -23,14 +23,10 @@
  *    1 word. If SPI master controller doesn't support sclk frequency change,
  *    then the char need be sent out one by one with some delay
  *
- * 2. Currently only RX available interrupt is used, no need for waiting TXE
+ * 2. Currently only RX available interrrupt is used, no need for waiting TXE
  *    interrupt for a low speed UART device
  */
 
-#ifdef CONFIG_MAGIC_SYSRQ
-#define SUPPORT_SYSRQ
-#endif
-
 #include <linux/module.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>
@@ -77,9 +73,9 @@ struct uart_max3110 {
 /* global data structure, may need be removed */
 static struct uart_max3110 *pmax;
 
-static int receive_chars(struct uart_max3110 *max,
-                                unsigned short *str, int len);
-static int max3110_read_multi(struct uart_max3110 *max);
+static void receive_chars(struct uart_max3110 *max,
+                                unsigned char *str, int len);
+static int max3110_read_multi(struct uart_max3110 *max, u8 *buf);
 static void max3110_con_receive(struct uart_max3110 *max);
 
 static int max3110_write_then_read(struct uart_max3110 *max,
@@ -112,6 +108,7 @@ static int max3110_out(struct uart_max3110 *max, const u16 out)
 {
         void *buf;
         u16 *obuf, *ibuf;
+        u8  ch;
         int ret;
 
         buf = kzalloc(8, GFP_KERNEL | GFP_DMA);
@@ -128,7 +125,11 @@ static int max3110_out(struct uart_max3110 *max, const u16 out)
                 goto exit;
         }
 
-        receive_chars(max, ibuf, 1);
+        /* If some valid data is read back */
+        if (*ibuf & MAX3110_READ_DATA_AVAILABLE) {
+                ch = *ibuf & 0xff;
+                receive_chars(max, &ch, 1);
+        }
 
 exit:
         kfree(buf);
@@ -141,11 +142,12 @@ exit:
  *
  * Return how many valide bytes are read back
  */
-static int max3110_read_multi(struct uart_max3110 *max)
+static int max3110_read_multi(struct uart_max3110 *max, u8 *rxbuf)
 {
         void *buf;
         u16 *obuf, *ibuf;
-        int ret, blen;
+        u8 *pbuf, valid_str[M3110_RX_FIFO_DEPTH];
+        int i, j, blen;
 
         blen = M3110_RX_FIFO_DEPTH * sizeof(u16);
         buf = kzalloc(blen * 2, GFP_KERNEL | GFP_DMA);
@@ -163,10 +165,19 @@ static int max3110_read_multi(struct uart_max3110 *max)
                 return 0;
         }
 
-        ret = receive_chars(max, ibuf, M3110_RX_FIFO_DEPTH);
+        /* If caller doesn't provide a buffer, then handle received char */
+        pbuf = rxbuf ? rxbuf : valid_str;
+
+        for (i = 0, j = 0; i < M3110_RX_FIFO_DEPTH; i++) {
+                if (ibuf[i] & MAX3110_READ_DATA_AVAILABLE)
+                        pbuf[j++] = ibuf[i] & 0xff;
+        }
+
+        if (j && (pbuf == valid_str))
+                receive_chars(max, valid_str, j);
 
         kfree(buf);
-        return ret;
+        return j;
 }
 
 static void serial_m3110_con_putchar(struct uart_port *port, int ch)
@@ -196,7 +207,7 @@ static void serial_m3110_con_write(struct console *co,
         uart_console_write(&pmax->port, s, count, serial_m3110_con_putchar);
 
         if (!test_and_set_bit(CON_TX_NEEDED, &pmax->uart_flags))
-                wake_up(&pmax->wq);
+                wake_up_process(pmax->main_thread);
 }
 
 static int __init
@@ -265,7 +276,8 @@ static void send_circ_buf(struct uart_max3110 *max,
 {
         void *buf;
         u16 *obuf, *ibuf;
-        int i, len, blen, dma_size, left, ret = 0;
+        u8 valid_str[WORDS_PER_XFER];
+        int i, j, len, blen, dma_size, left, ret = 0;
 
 
         dma_size = WORDS_PER_XFER * sizeof(u16) * 2;
@@ -289,13 +301,18 @@ static void send_circ_buf(struct uart_max3110 *max,
                         }
 
                         /* Fail to send msg to console is not very critical */
-
                         ret = max3110_write_then_read(max, obuf, ibuf, blen, 0);
                         if (ret)
                                 pr_warning(PR_FMT "%s(): get err msg %d\n",
                                                 __func__, ret);
 
-                        receive_chars(max, ibuf, len);
+                        for (i = 0, j = 0; i < len; i++) {
+                                if (ibuf[i] & MAX3110_READ_DATA_AVAILABLE)
+                                        valid_str[j++] = ibuf[i] & 0xff;
+                        }
+
+                        if (j)
+                                receive_chars(max, valid_str, j);
 
                         max->port.icount.tx += len;
                         left -= len;
@@ -332,54 +349,33 @@ static void serial_m3110_start_tx(struct uart_port *port)
                 container_of(port, struct uart_max3110, port);
 
         if (!test_and_set_bit(UART_TX_NEEDED, &max->uart_flags))
-                wake_up(&max->wq);
+                wake_up_process(max->main_thread);
 }
 
-static int
-receive_chars(struct uart_max3110 *max, unsigned short *str, int len)
+static void receive_chars(struct uart_max3110 *max, unsigned char *str, int len)
 {
         struct uart_port *port = &max->port;
         struct tty_struct *tty;
-        char buf[M3110_RX_FIFO_DEPTH];
-        int r, w, usable;
+        int usable;
 
         /* If uart is not opened, just return */
         if (!port->state)
-                return 0;
+                return;
 
-        tty = tty_port_tty_get(&port->state->port);
+        tty = port->state->port.tty;
         if (!tty)
-                return 0;
-
-        for (r = 0, w = 0; r < len; r++) {
-                if (str[r] & MAX3110_BREAK &&
-                    uart_handle_break(port))
-                        continue;
-
-                if (str[r] & MAX3110_READ_DATA_AVAILABLE) {
-                        if (uart_handle_sysrq_char(port, str[r] & 0xff))
-                                continue;
-
-                        buf[w++] = str[r] & 0xff;
-                }
-        }
-
-        if (!w) {
-                tty_kref_put(tty);
-                return 0;
-        }
+                return;
 
-        for (r = 0; w; r += usable, w -= usable) {
-                usable = tty_buffer_request_room(tty, w);
+        while (len) {
+                usable = tty_buffer_request_room(tty, len);
                 if (usable) {
-                        tty_insert_flip_string(tty, buf + r, usable);
+                        tty_insert_flip_string(tty, str, usable);
+                        str += usable;
                         port->icount.rx += usable;
                 }
+                len -= usable;
         }
         tty_flip_buffer_push(tty);
-        tty_kref_put(tty);
-
-        return r;
 }
 
 /*
@@ -394,15 +390,28 @@ receive_chars(struct uart_max3110 *max, unsigned short *str, int len)
  */
 static void max3110_con_receive(struct uart_max3110 *max)
 {
-        int loop = 1, num;
+        int loop = 1, num, total = 0;
+        u8 recv_buf[512], *pbuf;
 
+        pbuf = recv_buf;
         do {
-                num = max3110_read_multi(max);
+                num = max3110_read_multi(max, pbuf);
 
                 if (num) {
                         loop = 5;
+                        pbuf += num;
+                        total += num;
+
+                        if (total >= 504) {
+                                receive_chars(max, recv_buf, total);
+                                pbuf = recv_buf;
+                                total = 0;
+                        }
                 }
         } while (--loop);
+
+        if (total)
+                receive_chars(max, recv_buf, total);
 }
 
 static int max3110_main_thread(void *_max)
@@ -415,8 +424,7 @@ static int max3110_main_thread(void *_max)
         pr_info(PR_FMT "start main thread\n");
 
         do {
-                wait_event_interruptible(*wq,
-                                max->uart_flags || kthread_should_stop());
+                wait_event_interruptible(*wq, max->uart_flags || kthread_should_stop());
 
                 mutex_lock(&max->thread_mutex);
 
@@ -444,9 +452,8 @@ static irqreturn_t serial_m3110_irq(int irq, void *dev_id)
 
         /* max3110's irq is a falling edge, not level triggered,
          * so no need to disable the irq */
-
         if (!test_and_set_bit(BIT_IRQ_PENDING, &max->uart_flags))
-                wake_up(&max->wq);
+                wake_up_process(max->main_thread);
 
         return IRQ_HANDLED;
 }
@@ -773,7 +780,7 @@ static int serial_m3110_resume(struct spi_device *spi)
 #define serial_m3110_resume     NULL
 #endif
 
-static int serial_m3110_probe(struct spi_device *spi)
+static int __devinit serial_m3110_probe(struct spi_device *spi)
 {
         struct uart_max3110 *max;
         void *buffer;
@@ -855,7 +862,7 @@ err_get_page:
         return ret;
 }
 
-static int serial_m3110_remove(struct spi_device *dev)
+static int __devexit serial_m3110_remove(struct spi_device *dev)
 {
         struct uart_max3110 *max = spi_get_drvdata(dev);
 
@@ -876,10 +883,11 @@ static int serial_m3110_remove(struct spi_device *dev)
 static struct spi_driver uart_max3110_driver = {
         .driver = {
                         .name   = "spi_max3111",
+                        .bus    = &spi_bus_type,
                         .owner  = THIS_MODULE,
         },
         .probe          = serial_m3110_probe,
-        .remove         = serial_m3110_remove,
+        .remove         = __devexit_p(serial_m3110_remove),
         .suspend        = serial_m3110_suspend,
         .resume         = serial_m3110_resume,
 };
diff --git a/drivers/tty/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h
index 35af0739513..c37ea48c825 100644
--- a/drivers/tty/serial/mrst_max3110.h
+++ b/drivers/tty/serial/mrst_max3110.h
@@ -7,7 +7,6 @@
 /* status bits for all 4 MAX3110 operate modes */
 #define MAX3110_READ_DATA_AVAILABLE     (1 << 15)
 #define MAX3110_WRITE_BUF_EMPTY         (1 << 14)
-#define MAX3110_BREAK                   (1 << 10)
 
 #define WC_TAG                  (3 << 14)
 #define RC_TAG                  (1 << 14)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 95fd39be293..e6ba8387650 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -19,7 +19,6 @@
 # define SUPPORT_SYSRQ
 #endif
 
-#include <linux/atomic.h>
 #include <linux/hrtimer.h>
 #include <linux/module.h>
 #include <linux/io.h>
@@ -34,8 +33,6 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
 
 #include "msm_serial.h"
 
@@ -592,8 +589,9 @@ static void msm_release_port(struct uart_port *port)
                 iowrite32(GSBI_PROTOCOL_IDLE, msm_port->gsbi_base +
                           GSBI_CONTROL);
 
-                gsbi_resource = platform_get_resource(pdev,
-                                                        IORESOURCE_MEM, 1);
+                gsbi_resource = platform_get_resource_byname(pdev,
+                                                             IORESOURCE_MEM,
+                                                             "gsbi_resource");
 
                 if (unlikely(!gsbi_resource))
                         return;
@@ -614,7 +612,8 @@ static int msm_request_port(struct uart_port *port)
         resource_size_t size;
         int ret;
 
-        uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        uart_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                     "uart_resource");
         if (unlikely(!uart_resource))
                 return -ENXIO;
 
@@ -629,7 +628,8 @@ static int msm_request_port(struct uart_port *port)
                 goto fail_release_port;
         }
 
-        gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        gsbi_resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                     "gsbi_resource");
         /* Is this a GSBI-based port? */
         if (gsbi_resource) {
                 size = resource_size(gsbi_resource);
@@ -804,6 +804,8 @@ static int __init msm_console_setup(struct console *co, char *options)
         if (unlikely(!port->membase))
                 return -ENXIO;
 
+        port->cons = co;
+
         msm_init_clock(port);
 
         if (options)
@@ -857,8 +859,6 @@ static struct uart_driver msm_uart_driver = {
         .cons = MSM_CONSOLE,
 };
 
-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
-
 static int __init msm_serial_probe(struct platform_device *pdev)
 {
         struct msm_port *msm_port;
@@ -866,9 +866,6 @@ static int __init msm_serial_probe(struct platform_device *pdev)
         struct uart_port *port;
         int irq;
 
-        if (pdev->id == -1)
-                pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
-
         if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
                 return -ENXIO;
 
@@ -878,7 +875,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
         port->dev = &pdev->dev;
         msm_port = UART_TO_MSM(port);
 
-        if (platform_get_resource(pdev, IORESOURCE_MEM, 1))
+        if (platform_get_resource_byname(pdev, IORESOURCE_MEM, "gsbi_resource"))
                 msm_port->is_uartdm = 1;
         else
                 msm_port->is_uartdm = 0;
@@ -896,13 +893,14 @@ static int __init msm_serial_probe(struct platform_device *pdev)
                         return PTR_ERR(msm_port->clk);
 
         if (msm_port->is_uartdm)
-                clk_set_rate(msm_port->clk, 1843200);
+                clk_set_rate(msm_port->clk, 7372800);
 
         port->uartclk = clk_get_rate(msm_port->clk);
         printk(KERN_INFO "uartclk = %d\n", port->uartclk);
 
 
-        resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                     "uart_resource");
         if (unlikely(!resource))
                 return -ENXIO;
         port->mapbase = resource->start;
@@ -917,7 +915,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
         return uart_add_one_port(&msm_uart_driver, port);
 }
 
-static int msm_serial_remove(struct platform_device *pdev)
+static int __devexit msm_serial_remove(struct platform_device *pdev)
 {
         struct msm_port *msm_port = platform_get_drvdata(pdev);
 
@@ -926,17 +924,11 @@ static int msm_serial_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id msm_match_table[] = {
-        { .compatible = "qcom,msm-uart" },
-        {}
-};
-
 static struct platform_driver msm_platform_driver = {
         .remove = msm_serial_remove,
         .driver = {
                 .name = "msm_serial",
                 .owner = THIS_MODULE,
-                .of_match_table = msm_match_table,
         },
 };
 
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 1fa92284ade..624701f8138 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -30,8 +30,6 @@
 
 #include <linux/serial.h>
 #include <linux/serial_core.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -50,6 +48,7 @@
 
 #include <linux/atomic.h>
 #include <asm/irq.h>
+#include <asm/system.h>
 
 #include <mach/hardware.h>
 #include <mach/dma.h>
@@ -401,7 +400,7 @@ static int msm_hs_request_port(struct uart_port *port)
         return 0;
 }
 
-static int msm_hs_remove(struct platform_device *pdev)
+static int __devexit msm_hs_remove(struct platform_device *pdev)
 {
 
         struct msm_hs_port *msm_uport;
@@ -421,9 +420,9 @@ static int msm_hs_remove(struct platform_device *pdev)
                       msm_uport->rx.rbuffer);
         dma_pool_destroy(msm_uport->rx.pool);
 
-        dma_unmap_single(dev, msm_uport->rx.cmdptr_dmaaddr, sizeof(u32),
+        dma_unmap_single(dev, msm_uport->rx.cmdptr_dmaaddr, sizeof(u32 *),
                          DMA_TO_DEVICE);
-        dma_unmap_single(dev, msm_uport->tx.mapped_cmd_ptr_ptr, sizeof(u32),
+        dma_unmap_single(dev, msm_uport->tx.mapped_cmd_ptr_ptr, sizeof(u32 *),
                          DMA_TO_DEVICE);
         dma_unmap_single(dev, msm_uport->tx.mapped_cmd_ptr, sizeof(dmov_box),
                          DMA_TO_DEVICE);
@@ -811,7 +810,7 @@ static void msm_hs_submit_tx_locked(struct uart_port *uport)
         *tx->command_ptr_ptr = CMD_PTR_LP | DMOV_CMD_ADDR(tx->mapped_cmd_ptr);
 
         dma_sync_single_for_device(uport->dev, tx->mapped_cmd_ptr_ptr,
-                                   sizeof(u32), DMA_TO_DEVICE);
+                                   sizeof(u32 *), DMA_TO_DEVICE);
 
         /* Save tx_count to use in Callback */
         tx->tx_count = tx_count;
@@ -1086,10 +1085,12 @@ static void msm_hs_config_port(struct uart_port *uport, int cfg_flags)
 }
 
 /*  Handle CTS changes (Called from interrupt handler) */
-static void msm_hs_handle_delta_cts_locked(struct uart_port *uport)
+static void msm_hs_handle_delta_cts(struct uart_port *uport)
 {
+        unsigned long flags;
         struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
 
+        spin_lock_irqsave(&uport->lock, flags);
         clk_enable(msm_uport->clk);
 
         /* clear interrupt */
@@ -1097,6 +1098,7 @@ static void msm_hs_handle_delta_cts_locked(struct uart_port *uport)
         uport->icount.cts++;
 
         clk_disable(msm_uport->clk);
+        spin_unlock_irqrestore(&uport->lock, flags);
 
         /* clear the IOCTL TIOCMIWAIT if called */
         wake_up_interruptible(&uport->state->port.delta_msr_wait);
@@ -1244,7 +1246,7 @@ static irqreturn_t msm_hs_isr(int irq, void *dev)
 
         /* Change in CTS interrupt */
         if (isr_status & UARTDM_ISR_DELTA_CTS_BMSK)
-                msm_hs_handle_delta_cts_locked(uport);
+                msm_hs_handle_delta_cts(uport);
 
         spin_unlock_irqrestore(&uport->lock, flags);
 
@@ -1521,7 +1523,7 @@ err_msm_hs_init_clk:
 }
 
 /* Initialize tx and rx data structures */
-static int uartdm_init_port(struct uart_port *uport)
+static int __devinit uartdm_init_port(struct uart_port *uport)
 {
         int ret = 0;
         struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
@@ -1533,7 +1535,7 @@ static int uartdm_init_port(struct uart_port *uport)
         if (!tx->command_ptr)
                 return -ENOMEM;
 
-        tx->command_ptr_ptr = kmalloc(sizeof(u32), GFP_KERNEL | __GFP_DMA);
+        tx->command_ptr_ptr = kmalloc(sizeof(u32 *), GFP_KERNEL | __GFP_DMA);
         if (!tx->command_ptr_ptr) {
                 ret = -ENOMEM;
                 goto err_tx_command_ptr_ptr;
@@ -1543,7 +1545,7 @@ static int uartdm_init_port(struct uart_port *uport)
                                             sizeof(dmov_box), DMA_TO_DEVICE);
         tx->mapped_cmd_ptr_ptr = dma_map_single(uport->dev,
                                                 tx->command_ptr_ptr,
-                                                sizeof(u32), DMA_TO_DEVICE);
+                                                sizeof(u32 *), DMA_TO_DEVICE);
         tx->xfer.cmdptr = DMOV_CMD_ADDR(tx->mapped_cmd_ptr_ptr);
 
         init_waitqueue_head(&rx->wait);
@@ -1571,7 +1573,7 @@ static int uartdm_init_port(struct uart_port *uport)
                 goto err_rx_command_ptr;
         }
 
-        rx->command_ptr_ptr = kmalloc(sizeof(u32), GFP_KERNEL | __GFP_DMA);
+        rx->command_ptr_ptr = kmalloc(sizeof(u32 *), GFP_KERNEL | __GFP_DMA);
         if (!rx->command_ptr_ptr) {
                 pr_err("%s(): cannot allocate rx->command_ptr_ptr", __func__);
                 ret = -ENOMEM;
@@ -1589,7 +1591,7 @@ static int uartdm_init_port(struct uart_port *uport)
         *rx->command_ptr_ptr = CMD_PTR_LP | DMOV_CMD_ADDR(rx->mapped_cmd_ptr);
 
         rx->cmdptr_dmaaddr = dma_map_single(uport->dev, rx->command_ptr_ptr,
-                                            sizeof(u32), DMA_TO_DEVICE);
+                                            sizeof(u32 *), DMA_TO_DEVICE);
         rx->xfer.cmdptr = DMOV_CMD_ADDR(rx->cmdptr_dmaaddr);
 
         INIT_WORK(&rx->tty_work, msm_hs_tty_flip_buffer_work);
@@ -1605,7 +1607,7 @@ err_dma_pool_alloc:
         dma_pool_destroy(msm_uport->rx.pool);
 err_dma_pool_create:
         dma_unmap_single(uport->dev, msm_uport->tx.mapped_cmd_ptr_ptr,
-                                sizeof(u32), DMA_TO_DEVICE);
+                                sizeof(u32 *), DMA_TO_DEVICE);
         dma_unmap_single(uport->dev, msm_uport->tx.mapped_cmd_ptr,
                                 sizeof(dmov_box), DMA_TO_DEVICE);
         kfree(msm_uport->tx.command_ptr_ptr);
@@ -1614,7 +1616,7 @@ err_tx_command_ptr_ptr:
         return ret;
 }
 
-static int msm_hs_probe(struct platform_device *pdev)
+static int __devinit msm_hs_probe(struct platform_device *pdev)
 {
         int ret;
         struct uart_port *uport;
@@ -1838,7 +1840,7 @@ static const struct dev_pm_ops msm_hs_dev_pm_ops = {
 
 static struct platform_driver msm_serial_hs_platform_driver = {
         .probe = msm_hs_probe,
-        .remove = msm_hs_remove,
+        .remove = __devexit_p(msm_hs_remove),
         .driver = {
                 .name = "msm_serial_hs",
                 .owner = THIS_MODULE,
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c
index 925d1fa153d..4f41dcdcb77 100644
--- a/drivers/tty/serial/msm_smd_tty.c
+++ b/drivers/tty/serial/msm_smd_tty.c
@@ -203,6 +203,7 @@ static int __init smd_tty_init(void)
         if (smd_tty_driver == 0)
                 return -ENOMEM;
 
+        smd_tty_driver->owner = THIS_MODULE;
         smd_tty_driver->driver_name = "smd_tty_driver";
         smd_tty_driver->name = "smd";
         smd_tty_driver->major = 0;
@@ -223,11 +224,9 @@ static int __init smd_tty_init(void)
                 return ret;
 
         for (i = 0; i < smd_tty_channels_len; i++) {
-                struct tty_port *port = &smd_tty[smd_tty_channels[i].id].port;
-                tty_port_init(port);
-                port->ops = &smd_tty_port_ops;
-                tty_port_register_device(port, smd_tty_driver,
-                                smd_tty_channels[i].id, NULL);
+                tty_port_init(&smd_tty[smd_tty_channels[i].id].port);
+                smd_tty[smd_tty_channels[i].id].port.ops = &smd_tty_port_ops;
+                tty_register_device(smd_tty_driver, smd_tty_channels[i].id, 0);
         }
 
         return 0;
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index e2775b6df5a..9711e06a837 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -17,11 +17,10 @@
 */
 
 #include <linux/module.h>
+#include <linux/tty.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/console.h>
 #include <linux/delay.h> /* for udelay */
 #include <linux/device.h>
@@ -498,7 +497,7 @@ static int __init mux_probe(struct parisc_device *dev)
                 port->membase   = ioremap_nocache(port->mapbase, MUX_LINE_OFFSET);
                 port->iotype    = UPIO_MEM;
                 port->type      = PORT_MUX;
-                port->irq       = 0;
+                port->irq       = NO_IRQ;
                 port->uartclk   = 0;
                 port->fifosize  = MUX_FIFO_SIZE;
                 port->ops       = &mux_pops;
@@ -520,7 +519,7 @@ static int __init mux_probe(struct parisc_device *dev)
         return 0;
 }
 
-static int mux_remove(struct parisc_device *dev)
+static int __devexit mux_remove(struct parisc_device *dev)
 {
         int i, j;
         int port_count = (long)dev_get_drvdata(&dev->dev);
@@ -571,14 +570,14 @@ static struct parisc_driver builtin_serial_mux_driver = {
         .name =         "builtin_serial_mux",
         .id_table =     builtin_mux_tbl,
         .probe =        mux_probe,
-        .remove =       mux_remove,
+        .remove =       __devexit_p(mux_remove),
 };
 
 static struct parisc_driver serial_mux_driver = {
         .name =         "serial_mux",
         .id_table =     mux_tbl,
         .probe =        mux_probe,
-        .remove =       mux_remove,
+        .remove =       __devexit_p(mux_remove),
 };
 
 /**
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 6db23b035ef..7e02c9c344f 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -32,10 +32,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/of_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/fsl/mxs-dma.h>
 
 #include <asm/cacheflush.h>
 
@@ -73,18 +69,8 @@
 
 #define AUART_CTRL0_SFTRST                      (1 << 31)
 #define AUART_CTRL0_CLKGATE                     (1 << 30)
-#define AUART_CTRL0_RXTO_ENABLE                 (1 << 27)
-#define AUART_CTRL0_RXTIMEOUT(v)                (((v) & 0x7ff) << 16)
-#define AUART_CTRL0_XFER_COUNT(v)               ((v) & 0xffff)
-
-#define AUART_CTRL1_XFER_COUNT(v)               ((v) & 0xffff)
-
-#define AUART_CTRL2_DMAONERR                    (1 << 26)
-#define AUART_CTRL2_TXDMAE                      (1 << 25)
-#define AUART_CTRL2_RXDMAE                      (1 << 24)
 
 #define AUART_CTRL2_CTSEN                       (1 << 15)
-#define AUART_CTRL2_RTSEN                       (1 << 14)
 #define AUART_CTRL2_RTS                         (1 << 11)
 #define AUART_CTRL2_RXE                         (1 << 9)
 #define AUART_CTRL2_TXE                         (1 << 8)
@@ -122,170 +108,29 @@
 #define AUART_STAT_BERR                         (1 << 18)
 #define AUART_STAT_PERR                         (1 << 17)
 #define AUART_STAT_FERR                         (1 << 16)
-#define AUART_STAT_RXCOUNT_MASK                 0xffff
 
 static struct uart_driver auart_driver;
 
-enum mxs_auart_type {
-        IMX23_AUART,
-        IMX28_AUART,
-};
-
 struct mxs_auart_port {
         struct uart_port port;
 
-#define MXS_AUART_DMA_CONFIG    0x1
-#define MXS_AUART_DMA_ENABLED   0x2
-#define MXS_AUART_DMA_TX_SYNC   2  /* bit 2 */
-#define MXS_AUART_DMA_RX_READY  3  /* bit 3 */
-        unsigned long flags;
+        unsigned int flags;
         unsigned int ctrl;
-        enum mxs_auart_type devtype;
 
         unsigned int irq;
 
         struct clk *clk;
         struct device *dev;
-
-        /* for DMA */
-        struct mxs_dma_data dma_data;
-        int dma_channel_rx, dma_channel_tx;
-        int dma_irq_rx, dma_irq_tx;
-        int dma_channel;
-
-        struct scatterlist tx_sgl;
-        struct dma_chan *tx_dma_chan;
-        void *tx_dma_buf;
-
-        struct scatterlist rx_sgl;
-        struct dma_chan *rx_dma_chan;
-        void *rx_dma_buf;
-};
-
-static struct platform_device_id mxs_auart_devtype[] = {
-        { .name = "mxs-auart-imx23", .driver_data = IMX23_AUART },
-        { .name = "mxs-auart-imx28", .driver_data = IMX28_AUART },
-        { /* sentinel */ }
 };
-MODULE_DEVICE_TABLE(platform, mxs_auart_devtype);
-
-static struct of_device_id mxs_auart_dt_ids[] = {
-        {
-                .compatible = "fsl,imx28-auart",
-                .data = &mxs_auart_devtype[IMX28_AUART]
-        }, {
-                .compatible = "fsl,imx23-auart",
-                .data = &mxs_auart_devtype[IMX23_AUART]
-        }, { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, mxs_auart_dt_ids);
-
-static inline int is_imx28_auart(struct mxs_auart_port *s)
-{
-        return s->devtype == IMX28_AUART;
-}
-
-static inline bool auart_dma_enabled(struct mxs_auart_port *s)
-{
-        return s->flags & MXS_AUART_DMA_ENABLED;
-}
 
 static void mxs_auart_stop_tx(struct uart_port *u);
 
 #define to_auart_port(u) container_of(u, struct mxs_auart_port, port)
 
-static void mxs_auart_tx_chars(struct mxs_auart_port *s);
-
-static void dma_tx_callback(void *param)
+static inline void mxs_auart_tx_chars(struct mxs_auart_port *s)
 {
-        struct mxs_auart_port *s = param;
         struct circ_buf *xmit = &s->port.state->xmit;
 
-        dma_unmap_sg(s->dev, &s->tx_sgl, 1, DMA_TO_DEVICE);
-
-        /* clear the bit used to serialize the DMA tx. */
-        clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags);
-        smp_mb__after_clear_bit();
-
-        /* wake up the possible processes. */
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&s->port);
-
-        mxs_auart_tx_chars(s);
-}
-
-static int mxs_auart_dma_tx(struct mxs_auart_port *s, int size)
-{
-        struct dma_async_tx_descriptor *desc;
-        struct scatterlist *sgl = &s->tx_sgl;
-        struct dma_chan *channel = s->tx_dma_chan;
-        u32 pio;
-
-        /* [1] : send PIO. Note, the first pio word is CTRL1. */
-        pio = AUART_CTRL1_XFER_COUNT(size);
-        desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)&pio,
-                                        1, DMA_TRANS_NONE, 0);
-        if (!desc) {
-                dev_err(s->dev, "step 1 error\n");
-                return -EINVAL;
-        }
-
-        /* [2] : set DMA buffer. */
-        sg_init_one(sgl, s->tx_dma_buf, size);
-        dma_map_sg(s->dev, sgl, 1, DMA_TO_DEVICE);
-        desc = dmaengine_prep_slave_sg(channel, sgl,
-                        1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-        if (!desc) {
-                dev_err(s->dev, "step 2 error\n");
-                return -EINVAL;
-        }
-
-        /* [3] : submit the DMA */
-        desc->callback = dma_tx_callback;
-        desc->callback_param = s;
-        dmaengine_submit(desc);
-        dma_async_issue_pending(channel);
-        return 0;
-}
-
-static void mxs_auart_tx_chars(struct mxs_auart_port *s)
-{
-        struct circ_buf *xmit = &s->port.state->xmit;
-
-        if (auart_dma_enabled(s)) {
-                int i = 0;
-                int size;
-                void *buffer = s->tx_dma_buf;
-
-                if (test_and_set_bit(MXS_AUART_DMA_TX_SYNC, &s->flags))
-                        return;
-
-                while (!uart_circ_empty(xmit) && !uart_tx_stopped(&s->port)) {
-                        size = min_t(u32, UART_XMIT_SIZE - i,
-                                     CIRC_CNT_TO_END(xmit->head,
-                                                     xmit->tail,
-                                                     UART_XMIT_SIZE));
-                        memcpy(buffer + i, xmit->buf + xmit->tail, size);
-                        xmit->tail = (xmit->tail + size) & (UART_XMIT_SIZE - 1);
-
-                        i += size;
-                        if (i >= UART_XMIT_SIZE)
-                                break;
-                }
-
-                if (uart_tx_stopped(&s->port))
-                        mxs_auart_stop_tx(&s->port);
-
-                if (i) {
-                        mxs_auart_dma_tx(s, i);
-                } else {
-                        clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags);
-                        smp_mb__after_clear_bit();
-                }
-                return;
-        }
-
-
         while (!(readl(s->port.membase + AUART_STAT) &
                  AUART_STAT_TXFF)) {
                 if (s->port.x_char) {
@@ -300,12 +145,11 @@ static void mxs_auart_tx_chars(struct mxs_auart_port *s)
                         writel(xmit->buf[xmit->tail],
                                      s->port.membase + AUART_DATA);
                         xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                                uart_write_wakeup(&s->port);
                 } else
                         break;
         }
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&s->port);
-
         if (uart_circ_empty(&(s->port.state->xmit)))
                 writel(AUART_INTR_TXIEN,
                              s->port.membase + AUART_INTR_CLR);
@@ -412,12 +256,9 @@ static void mxs_auart_set_mctrl(struct uart_port *u, unsigned mctrl)
 
         u32 ctrl = readl(u->membase + AUART_CTRL2);
 
-        ctrl &= ~AUART_CTRL2_RTSEN;
-        if (mctrl & TIOCM_RTS) {
-                if (tty_port_cts_enabled(&u->state->port))
-                        ctrl |= AUART_CTRL2_RTSEN;
-        }
-
+        ctrl &= ~AUART_CTRL2_RTS;
+        if (mctrl & TIOCM_RTS)
+                ctrl |= AUART_CTRL2_RTS;
         s->ctrl = mctrl;
         writel(ctrl, u->membase + AUART_CTRL2);
 }
@@ -439,159 +280,10 @@ static u32 mxs_auart_get_mctrl(struct uart_port *u)
         return mctrl;
 }
 
-static bool mxs_auart_dma_filter(struct dma_chan *chan, void *param)
-{
-        struct mxs_auart_port *s = param;
-
-        if (!mxs_dma_is_apbx(chan))
-                return false;
-
-        if (s->dma_channel == chan->chan_id) {
-                chan->private = &s->dma_data;
-                return true;
-        }
-        return false;
-}
-
-static int mxs_auart_dma_prep_rx(struct mxs_auart_port *s);
-static void dma_rx_callback(void *arg)
-{
-        struct mxs_auart_port *s = (struct mxs_auart_port *) arg;
-        struct tty_struct *tty = s->port.state->port.tty;
-        int count;
-        u32 stat;
-
-        dma_unmap_sg(s->dev, &s->rx_sgl, 1, DMA_FROM_DEVICE);
-
-        stat = readl(s->port.membase + AUART_STAT);
-        stat &= ~(AUART_STAT_OERR | AUART_STAT_BERR |
-                        AUART_STAT_PERR | AUART_STAT_FERR);
-
-        count = stat & AUART_STAT_RXCOUNT_MASK;
-        tty_insert_flip_string(tty, s->rx_dma_buf, count);
-
-        writel(stat, s->port.membase + AUART_STAT);
-        tty_flip_buffer_push(tty);
-
-        /* start the next DMA for RX. */
-        mxs_auart_dma_prep_rx(s);
-}
-
-static int mxs_auart_dma_prep_rx(struct mxs_auart_port *s)
-{
-        struct dma_async_tx_descriptor *desc;
-        struct scatterlist *sgl = &s->rx_sgl;
-        struct dma_chan *channel = s->rx_dma_chan;
-        u32 pio[1];
-
-        /* [1] : send PIO */
-        pio[0] = AUART_CTRL0_RXTO_ENABLE
-                | AUART_CTRL0_RXTIMEOUT(0x80)
-                | AUART_CTRL0_XFER_COUNT(UART_XMIT_SIZE);
-        desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio,
-                                        1, DMA_TRANS_NONE, 0);
-        if (!desc) {
-                dev_err(s->dev, "step 1 error\n");
-                return -EINVAL;
-        }
-
-        /* [2] : send DMA request */
-        sg_init_one(sgl, s->rx_dma_buf, UART_XMIT_SIZE);
-        dma_map_sg(s->dev, sgl, 1, DMA_FROM_DEVICE);
-        desc = dmaengine_prep_slave_sg(channel, sgl, 1, DMA_DEV_TO_MEM,
-                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-        if (!desc) {
-                dev_err(s->dev, "step 2 error\n");
-                return -1;
-        }
-
-        /* [3] : submit the DMA, but do not issue it. */
-        desc->callback = dma_rx_callback;
-        desc->callback_param = s;
-        dmaengine_submit(desc);
-        dma_async_issue_pending(channel);
-        return 0;
-}
-
-static void mxs_auart_dma_exit_channel(struct mxs_auart_port *s)
-{
-        if (s->tx_dma_chan) {
-                dma_release_channel(s->tx_dma_chan);
-                s->tx_dma_chan = NULL;
-        }
-        if (s->rx_dma_chan) {
-                dma_release_channel(s->rx_dma_chan);
-                s->rx_dma_chan = NULL;
-        }
-
-        kfree(s->tx_dma_buf);
-        kfree(s->rx_dma_buf);
-        s->tx_dma_buf = NULL;
-        s->rx_dma_buf = NULL;
-}
-
-static void mxs_auart_dma_exit(struct mxs_auart_port *s)
-{
-
-        writel(AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE | AUART_CTRL2_DMAONERR,
-                s->port.membase + AUART_CTRL2_CLR);
-
-        mxs_auart_dma_exit_channel(s);
-        s->flags &= ~MXS_AUART_DMA_ENABLED;
-        clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags);
-        clear_bit(MXS_AUART_DMA_RX_READY, &s->flags);
-}
-
-static int mxs_auart_dma_init(struct mxs_auart_port *s)
-{
-        dma_cap_mask_t mask;
-
-        if (auart_dma_enabled(s))
-                return 0;
-
-        /* We do not get the right DMA channels. */
-        if (s->dma_channel_rx == -1 || s->dma_channel_rx == -1)
-                return -EINVAL;
-
-        /* init for RX */
-        dma_cap_zero(mask);
-        dma_cap_set(DMA_SLAVE, mask);
-        s->dma_channel = s->dma_channel_rx;
-        s->dma_data.chan_irq = s->dma_irq_rx;
-        s->rx_dma_chan = dma_request_channel(mask, mxs_auart_dma_filter, s);
-        if (!s->rx_dma_chan)
-                goto err_out;
-        s->rx_dma_buf = kzalloc(UART_XMIT_SIZE, GFP_KERNEL | GFP_DMA);
-        if (!s->rx_dma_buf)
-                goto err_out;
-
-        /* init for TX */
-        s->dma_channel = s->dma_channel_tx;
-        s->dma_data.chan_irq = s->dma_irq_tx;
-        s->tx_dma_chan = dma_request_channel(mask, mxs_auart_dma_filter, s);
-        if (!s->tx_dma_chan)
-                goto err_out;
-        s->tx_dma_buf = kzalloc(UART_XMIT_SIZE, GFP_KERNEL | GFP_DMA);
-        if (!s->tx_dma_buf)
-                goto err_out;
-
-        /* set the flags */
-        s->flags |= MXS_AUART_DMA_ENABLED;
-        dev_dbg(s->dev, "enabled the DMA support.");
-
-        return 0;
-
-err_out:
-        mxs_auart_dma_exit_channel(s);
-        return -EINVAL;
-
-}
-
 static void mxs_auart_settermios(struct uart_port *u,
                                  struct ktermios *termios,
                                  struct ktermios *old)
 {
-        struct mxs_auart_port *s = to_auart_port(u);
         u32 bm, ctrl, ctrl2, div;
         unsigned int cflag, baud;
 
@@ -663,23 +355,10 @@ static void mxs_auart_settermios(struct uart_port *u,
                 ctrl |= AUART_LINECTRL_STP2;
 
         /* figure out the hardware flow control settings */
-        if (cflag & CRTSCTS) {
-                /*
-                 * The DMA has a bug(see errata:2836) in mx23.
-                 * So we can not implement the DMA for auart in mx23,
-                 * we can only implement the DMA support for auart
-                 * in mx28.
-                 */
-                if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG)) {
-                        if (!mxs_auart_dma_init(s))
-                                /* enable DMA tranfer */
-                                ctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE
-                                       | AUART_CTRL2_DMAONERR;
-                }
-                ctrl2 |= AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN;
-        } else {
-                ctrl2 &= ~(AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN);
-        }
+        if (cflag & CRTSCTS)
+                ctrl2 |= AUART_CTRL2_CTSEN;
+        else
+                ctrl2 &= ~AUART_CTRL2_CTSEN;
 
         /* set baud rate */
         baud = uart_get_baud_rate(u, termios, old, 0, u->uartclk);
@@ -689,21 +368,6 @@ static void mxs_auart_settermios(struct uart_port *u,
 
         writel(ctrl, u->membase + AUART_LINECTRL);
         writel(ctrl2, u->membase + AUART_CTRL2);
-
-        uart_update_timeout(u, termios->c_cflag, baud);
-
-        /* prepare for the DMA RX. */
-        if (auart_dma_enabled(s) &&
-                !test_and_set_bit(MXS_AUART_DMA_RX_READY, &s->flags)) {
-                if (!mxs_auart_dma_prep_rx(s)) {
-                        /* Disable the normal RX interrupt. */
-                        writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN,
-                                        u->membase + AUART_INTR_CLR);
-                } else {
-                        mxs_auart_dma_exit(s);
-                        dev_err(s->dev, "We can not start up the DMA.\n");
-                }
-        }
 }
 
 static irqreturn_t mxs_auart_irq_handle(int irq, void *context)
@@ -722,8 +386,7 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context)
         }
 
         if (istat & (AUART_INTR_RTIS | AUART_INTR_RXIS)) {
-                if (!auart_dma_enabled(s))
-                        mxs_auart_rx_chars(s);
+                mxs_auart_rx_chars(s);
                 istat &= ~(AUART_INTR_RTIS | AUART_INTR_RXIS);
         }
 
@@ -761,7 +424,7 @@ static int mxs_auart_startup(struct uart_port *u)
 {
         struct mxs_auart_port *s = to_auart_port(u);
 
-        clk_prepare_enable(s->clk);
+        clk_enable(s->clk);
 
         writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR);
 
@@ -783,17 +446,14 @@ static void mxs_auart_shutdown(struct uart_port *u)
 {
         struct mxs_auart_port *s = to_auart_port(u);
 
-        if (auart_dma_enabled(s))
-                mxs_auart_dma_exit(s);
-
         writel(AUART_CTRL2_UARTEN, u->membase + AUART_CTRL2_CLR);
 
+        writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_SET);
+
         writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN,
                         u->membase + AUART_INTR_CLR);
 
-        writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_SET);
-
-        clk_disable_unprepare(s->clk);
+        clk_disable(s->clk);
 }
 
 static unsigned int mxs_auart_tx_empty(struct uart_port *u)
@@ -974,7 +634,7 @@ auart_console_setup(struct console *co, char *options)
         if (!s)
                 return -ENODEV;
 
-        clk_prepare_enable(s->clk);
+        clk_enable(s->clk);
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -983,7 +643,7 @@ auart_console_setup(struct console *co, char *options)
 
         ret = uart_set_options(&s->port, co, baud, parity, bits, flow);
 
-        clk_disable_unprepare(s->clk);
+        clk_disable(s->clk);
 
         return ret;
 }
@@ -1011,54 +671,12 @@ static struct uart_driver auart_driver = {
 #endif
 };
 
-/*
- * This function returns 1 if pdev isn't a device instatiated by dt, 0 if it
- * could successfully get all information from dt or a negative errno.
- */
-static int serial_mxs_probe_dt(struct mxs_auart_port *s,
-                struct platform_device *pdev)
-{
-        struct device_node *np = pdev->dev.of_node;
-        u32 dma_channel[2];
-        int ret;
-
-        if (!np)
-                /* no device tree device */
-                return 1;
-
-        ret = of_alias_get_id(np, "serial");
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to get alias id: %d\n", ret);
-                return ret;
-        }
-        s->port.line = ret;
-
-        s->dma_irq_rx = platform_get_irq(pdev, 1);
-        s->dma_irq_tx = platform_get_irq(pdev, 2);
-
-        ret = of_property_read_u32_array(np, "fsl,auart-dma-channel",
-                                        dma_channel, 2);
-        if (ret == 0) {
-                s->dma_channel_rx = dma_channel[0];
-                s->dma_channel_tx = dma_channel[1];
-
-                s->flags |= MXS_AUART_DMA_CONFIG;
-        } else {
-                s->dma_channel_rx = -1;
-                s->dma_channel_tx = -1;
-        }
-        return 0;
-}
-
-static int mxs_auart_probe(struct platform_device *pdev)
+static int __devinit mxs_auart_probe(struct platform_device *pdev)
 {
-        const struct of_device_id *of_id =
-                        of_match_device(mxs_auart_dt_ids, &pdev->dev);
         struct mxs_auart_port *s;
         u32 version;
         int ret = 0;
         struct resource *r;
-        struct pinctrl *pinctrl;
 
         s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);
         if (!s) {
@@ -1066,23 +684,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        ret = serial_mxs_probe_dt(s, pdev);
-        if (ret > 0)
-                s->port.line = pdev->id < 0 ? 0 : pdev->id;
-        else if (ret < 0)
-                goto out_free;
-
-        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-        if (IS_ERR(pinctrl)) {
-                ret = PTR_ERR(pinctrl);
-                goto out_free;
-        }
-
-        if (of_id) {
-                pdev->id_entry = of_id->data;
-                s->devtype = pdev->id_entry->driver_data;
-        }
-
         s->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(s->clk)) {
                 ret = PTR_ERR(s->clk);
@@ -1099,11 +700,13 @@ static int mxs_auart_probe(struct platform_device *pdev)
         s->port.membase = ioremap(r->start, resource_size(r));
         s->port.ops = &mxs_auart_ops;
         s->port.iotype = UPIO_MEM;
+        s->port.line = pdev->id < 0 ? 0 : pdev->id;
         s->port.fifosize = 16;
         s->port.uartclk = clk_get_rate(s->clk);
         s->port.type = PORT_IMX;
         s->port.dev = s->dev = get_device(&pdev->dev);
 
+        s->flags = 0;
         s->ctrl = 0;
 
         s->irq = platform_get_irq(pdev, 0);
@@ -1114,7 +717,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, s);
 
-        auart_port[s->port.line] = s;
+        auart_port[pdev->id] = s;
 
         mxs_auart_reset(&s->port);
 
@@ -1133,7 +736,6 @@ out_free_irq:
         auart_port[pdev->id] = NULL;
         free_irq(s->irq, s);
 out_free_clk:
-        put_device(s->dev);
         clk_put(s->clk);
 out_free:
         kfree(s);
@@ -1141,7 +743,7 @@ out:
         return ret;
 }
 
-static int mxs_auart_remove(struct platform_device *pdev)
+static int __devexit mxs_auart_remove(struct platform_device *pdev)
 {
         struct mxs_auart_port *s = platform_get_drvdata(pdev);
 
@@ -1149,7 +751,6 @@ static int mxs_auart_remove(struct platform_device *pdev)
 
         auart_port[pdev->id] = NULL;
 
-        put_device(s->dev);
         clk_put(s->clk);
         free_irq(s->irq, s);
         kfree(s);
@@ -1159,11 +760,10 @@ static int mxs_auart_remove(struct platform_device *pdev)
 
 static struct platform_driver mxs_auart_driver = {
         .probe = mxs_auart_probe,
-        .remove = mxs_auart_remove,
+        .remove = __devexit_p(mxs_auart_remove),
         .driver = {
                 .name = "mxs-auart",
                 .owner = THIS_MODULE,
-                .of_match_table = mxs_auart_dt_ids,
         },
 };
 
@@ -1196,4 +796,3 @@ module_init(mxs_auart_init);
 module_exit(mxs_auart_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Freescale MXS application uart driver");
-MODULE_ALIAS("platform:mxs-auart");
diff --git a/drivers/tty/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c
index dd4c31d1aee..de173671e3d 100644
--- a/drivers/tty/serial/nwpserial.c
+++ b/drivers/tty/serial/nwpserial.c
@@ -10,13 +10,11 @@
  *
  */
 #include <linux/init.h>
-#include <linux/export.h>
 #include <linux/console.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
 #include <linux/serial_core.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/irqreturn.h>
 #include <linux/mutex.h>
 #include <linux/of_platform.h>
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index e7cae1c2d7d..e58cece6f44 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -12,49 +12,23 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/delay.h>
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
-#include <linux/serial_reg.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <linux/of_serial.h>
 #include <linux/of_platform.h>
 #include <linux/nwpserial.h>
-#include <linux/clk.h>
 
 struct of_serial_info {
-        struct clk *clk;
         int type;
         int line;
 };
 
-#ifdef CONFIG_ARCH_TEGRA
-void tegra_serial_handle_break(struct uart_port *p)
-{
-        unsigned int status, tmout = 10000;
-
-        do {
-                status = p->serial_in(p, UART_LSR);
-                if (status & (UART_LSR_FIFOE | UART_LSR_BRK_ERROR_BITS))
-                        status = p->serial_in(p, UART_RX);
-                else
-                        break;
-                if (--tmout == 0)
-                        break;
-                udelay(1);
-        } while (1);
-}
-/* FIXME remove this export when tegra finishes conversion to open firmware */
-EXPORT_SYMBOL_GPL(tegra_serial_handle_break);
-#endif
-
 /*
  * Fill a struct uart_port for a given device node
  */
-static int of_platform_serial_setup(struct platform_device *ofdev,
-                        int type, struct uart_port *port,
-                        struct of_serial_info *info)
+static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
+                                        int type, struct uart_port *port)
 {
         struct resource resource;
         struct device_node *np = ofdev->dev.of_node;
@@ -63,17 +37,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
 
         memset(port, 0, sizeof *port);
         if (of_property_read_u32(np, "clock-frequency", &clk)) {
-
-                /* Get clk rate through clk driver if present */
-                info->clk = clk_get(&ofdev->dev, NULL);
-                if (IS_ERR(info->clk)) {
-                        dev_warn(&ofdev->dev,
-                                "clk or clock-frequency not defined\n");
-                        return PTR_ERR(info->clk);
-                }
-
-                clk_prepare_enable(info->clk);
-                clk = clk_get_rate(info->clk);
+                dev_warn(&ofdev->dev, "no clock-frequency property set\n");
+                return -ENODEV;
         }
         /* If current-speed was set, then try not to change it. */
         if (of_property_read_u32(np, "current-speed", &spd) == 0)
@@ -82,7 +47,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
         ret = of_address_to_resource(np, 0, &resource);
         if (ret) {
                 dev_warn(&ofdev->dev, "invalid address\n");
-                goto out;
+                return ret;
         }
 
         spin_lock_init(&port->lock);
@@ -109,8 +74,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
                 default:
                         dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
                                  prop);
-                        ret = -EINVAL;
-                        goto out;
+                        return -EINVAL;
                 }
         }
 
@@ -118,27 +82,16 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
         port->uartclk = clk;
         port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
                 | UPF_FIXED_PORT | UPF_FIXED_TYPE;
-
-        if (of_find_property(np, "no-loopback-test", NULL))
-                port->flags |= UPF_SKIP_TEST;
-
         port->dev = &ofdev->dev;
 
-        if (type == PORT_TEGRA)
-                port->handle_break = tegra_serial_handle_break;
-
         return 0;
-out:
-        if (info->clk)
-                clk_disable_unprepare(info->clk);
-        return ret;
 }
 
 /*
  * Try to register a serial port
  */
 static struct of_device_id of_platform_serial_table[];
-static int of_platform_serial_probe(struct platform_device *ofdev)
+static int __devinit of_platform_serial_probe(struct platform_device *ofdev)
 {
         const struct of_device_id *match;
         struct of_serial_info *info;
@@ -158,22 +111,15 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
                 return -ENOMEM;
 
         port_type = (unsigned long)match->data;
-        ret = of_platform_serial_setup(ofdev, port_type, &port, info);
+        ret = of_platform_serial_setup(ofdev, port_type, &port);
         if (ret)
                 goto out;
 
         switch (port_type) {
 #ifdef CONFIG_SERIAL_8250
         case PORT_8250 ... PORT_MAX_8250:
-        {
-                /* For now the of bindings don't support the extra
-                   8250 specific bits */
-                struct uart_8250_port port8250;
-                memset(&port8250, 0, sizeof(port8250));
-                port8250.port = port;
-                ret = serial8250_register_8250_port(&port8250);
+                ret = serial8250_register_port(&port);
                 break;
-        }
 #endif
 #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
         case PORT_NWPSERIAL:
@@ -221,9 +167,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
                 /* need to add code for these */
                 break;
         }
-
-        if (info->clk)
-                clk_disable_unprepare(info->clk);
         kfree(info);
         return 0;
 }
@@ -231,7 +174,7 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
 /*
  * A few common types, add more as needed.
  */
-static struct of_device_id of_platform_serial_table[] = {
+static struct of_device_id __devinitdata of_platform_serial_table[] = {
         { .compatible = "ns8250",   .data = (void *)PORT_8250, },
         { .compatible = "ns16450",  .data = (void *)PORT_16450, },
         { .compatible = "ns16550a", .data = (void *)PORT_16550A, },
@@ -239,7 +182,6 @@ static struct of_device_id of_platform_serial_table[] = {
         { .compatible = "ns16750",  .data = (void *)PORT_16750, },
         { .compatible = "ns16850",  .data = (void *)PORT_16850, },
         { .compatible = "nvidia,tegra20-uart", .data = (void *)PORT_TEGRA, },
-        { .compatible = "nxp,lpc3220-uart", .data = (void *)PORT_LPC3220, },
 #ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
         { .compatible = "ibm,qpace-nwp-serial",
                 .data = (void *)PORT_NWPSERIAL, },
@@ -258,7 +200,17 @@ static struct platform_driver of_platform_serial_driver = {
         .remove = of_platform_serial_remove,
 };
 
-module_platform_driver(of_platform_serial_driver);
+static int __init of_platform_serial_init(void)
+{
+        return platform_driver_register(&of_platform_serial_driver);
+}
+module_init(of_platform_serial_init);
+
+static void __exit of_platform_serial_exit(void)
+{
+        return platform_driver_unregister(&of_platform_serial_driver);
+};
+module_exit(of_platform_serial_exit);
 
 MODULE_AUTHOR("Arnd Bergmann <arnd@arndb.de>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 57d6b29c039..5e713d3ef1f 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -32,144 +32,22 @@
 #include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
-#include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <linux/serial_core.h>
 #include <linux/irq.h>
-#include <linux/pm_runtime.h>
-#include <linux/of.h>
-#include <linux/gpio.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/platform_data/serial-omap.h>
 
-#define OMAP_MAX_HSUART_PORTS   6
-
-#define UART_BUILD_REVISION(x, y)       (((x) << 8) | (y))
-
-#define OMAP_UART_REV_42 0x0402
-#define OMAP_UART_REV_46 0x0406
-#define OMAP_UART_REV_52 0x0502
-#define OMAP_UART_REV_63 0x0603
-
-#define UART_ERRATA_i202_MDR1_ACCESS    BIT(0)
-#define UART_ERRATA_i291_DMA_FORCEIDLE  BIT(1)
-
-#define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
-
-/* SCR register bitmasks */
-#define OMAP_UART_SCR_RX_TRIG_GRANU1_MASK               (1 << 7)
-#define OMAP_UART_SCR_TX_EMPTY                  (1 << 3)
-
-/* FCR register bitmasks */
-#define OMAP_UART_FCR_RX_FIFO_TRIG_MASK                 (0x3 << 6)
-#define OMAP_UART_FCR_TX_FIFO_TRIG_MASK                 (0x3 << 4)
-
-/* MVR register bitmasks */
-#define OMAP_UART_MVR_SCHEME_SHIFT      30
-
-#define OMAP_UART_LEGACY_MVR_MAJ_MASK   0xf0
-#define OMAP_UART_LEGACY_MVR_MAJ_SHIFT  4
-#define OMAP_UART_LEGACY_MVR_MIN_MASK   0x0f
-
-#define OMAP_UART_MVR_MAJ_MASK          0x700
-#define OMAP_UART_MVR_MAJ_SHIFT         8
-#define OMAP_UART_MVR_MIN_MASK          0x3f
-
-#define OMAP_UART_DMA_CH_FREE   -1
-
-#define MSR_SAVE_FLAGS          UART_MSR_ANY_DELTA
-#define OMAP_MODE13X_SPEED      230400
-
-/* WER = 0x7F
- * Enable module level wakeup in WER reg
- */
-#define OMAP_UART_WER_MOD_WKUP  0X7F
-
-/* Enable XON/XOFF flow control on output */
-#define OMAP_UART_SW_TX         0x08
-
-/* Enable XON/XOFF flow control on input */
-#define OMAP_UART_SW_RX         0x02
-
-#define OMAP_UART_SW_CLR        0xF0
-
-#define OMAP_UART_TCR_TRIG      0x0F
-
-struct uart_omap_dma {
-        u8                      uart_dma_tx;
-        u8                      uart_dma_rx;
-        int                     rx_dma_channel;
-        int                     tx_dma_channel;
-        dma_addr_t              rx_buf_dma_phys;
-        dma_addr_t              tx_buf_dma_phys;
-        unsigned int            uart_base;
-        /*
-         * Buffer for rx dma.It is not required for tx because the buffer
-         * comes from port structure.
-         */
-        unsigned char           *rx_buf;
-        unsigned int            prev_rx_dma_pos;
-        int                     tx_buf_size;
-        int                     tx_dma_used;
-        int                     rx_dma_used;
-        spinlock_t              tx_lock;
-        spinlock_t              rx_lock;
-        /* timer to poll activity on rx dma */
-        struct timer_list       rx_timer;
-        unsigned int            rx_buf_size;
-        unsigned int            rx_poll_rate;
-        unsigned int            rx_timeout;
-};
-
-struct uart_omap_port {
-        struct uart_port        port;
-        struct uart_omap_dma    uart_dma;
-        struct device           *dev;
-
-        unsigned char           ier;
-        unsigned char           lcr;
-        unsigned char           mcr;
-        unsigned char           fcr;
-        unsigned char           efr;
-        unsigned char           dll;
-        unsigned char           dlh;
-        unsigned char           mdr1;
-        unsigned char           scr;
-
-        int                     use_dma;
-        /*
-         * Some bits in registers are cleared on a read, so they must
-         * be saved whenever the register is read but the bits will not
-         * be immediately processed.
-         */
-        unsigned int            lsr_break_flag;
-        unsigned char           msr_saved_flags;
-        char                    name[20];
-        unsigned long           port_activity;
-        int                     context_loss_cnt;
-        u32                     errata;
-        u8                      wakeups_enabled;
-
-        int                     DTR_gpio;
-        int                     DTR_inverted;
-        int                     DTR_active;
-
-        struct pm_qos_request   pm_qos_request;
-        u32                     latency;
-        u32                     calc_latency;
-        struct work_struct      qos_work;
-        struct pinctrl          *pins;
-};
-
-#define to_uart_omap_port(p)    ((container_of((p), struct uart_omap_port, port)))
+#include <plat/dma.h>
+#include <plat/dmtimer.h>
+#include <plat/omap-serial.h>
 
 static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
 /* Forward declaration of functions */
-static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1);
-
-static struct workqueue_struct *serial_omap_uart_wq;
+static void uart_tx_dma_callback(int lch, u16 ch_status, void *data);
+static void serial_omap_rx_timeout(unsigned long uart_no);
+static int serial_omap_start_rxdma(struct uart_omap_port *up);
 
 static inline unsigned int serial_in(struct uart_omap_port *up, int offset)
 {
@@ -191,46 +69,6 @@ static inline void serial_omap_clear_fifos(struct uart_omap_port *up)
         serial_out(up, UART_FCR, 0);
 }
 
-static int serial_omap_get_context_loss_count(struct uart_omap_port *up)
-{
-        struct omap_uart_port_info *pdata = up->dev->platform_data;
-
-        if (!pdata || !pdata->get_context_loss_count)
-                return 0;
-
-        return pdata->get_context_loss_count(up->dev);
-}
-
-static void serial_omap_set_forceidle(struct uart_omap_port *up)
-{
-        struct omap_uart_port_info *pdata = up->dev->platform_data;
-
-        if (!pdata || !pdata->set_forceidle)
-                return;
-
-        pdata->set_forceidle(up->dev);
-}
-
-static void serial_omap_set_noidle(struct uart_omap_port *up)
-{
-        struct omap_uart_port_info *pdata = up->dev->platform_data;
-
-        if (!pdata || !pdata->set_noidle)
-                return;
-
-        pdata->set_noidle(up->dev);
-}
-
-static void serial_omap_enable_wakeup(struct uart_omap_port *up, bool enable)
-{
-        struct omap_uart_port_info *pdata = up->dev->platform_data;
-
-        if (!pdata || !pdata->enable_wakeup)
-                return;
-
-        pdata->enable_wakeup(up->dev, enable);
-}
-
 /*
  * serial_omap_get_divisor - calculate divisor value
  * @port: uart port info
@@ -256,55 +94,132 @@ serial_omap_get_divisor(struct uart_port *port, unsigned int baud)
         return port->uartclk/(baud * divisor);
 }
 
-static void serial_omap_enable_ms(struct uart_port *port)
+static void serial_omap_stop_rxdma(struct uart_omap_port *up)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        if (up->uart_dma.rx_dma_used) {
+                del_timer(&up->uart_dma.rx_timer);
+                omap_stop_dma(up->uart_dma.rx_dma_channel);
+                omap_free_dma(up->uart_dma.rx_dma_channel);
+                up->uart_dma.rx_dma_channel = OMAP_UART_DMA_CH_FREE;
+                up->uart_dma.rx_dma_used = false;
+        }
+}
 
-        dev_dbg(up->port.dev, "serial_omap_enable_ms+%d\n", up->port.line);
+static void serial_omap_enable_ms(struct uart_port *port)
+{
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
 
-        pm_runtime_get_sync(up->dev);
+        dev_dbg(up->port.dev, "serial_omap_enable_ms+%d\n", up->pdev->id);
         up->ier |= UART_IER_MSI;
         serial_out(up, UART_IER, up->ier);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
 }
 
 static void serial_omap_stop_tx(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
+
+        if (up->use_dma &&
+                up->uart_dma.tx_dma_channel != OMAP_UART_DMA_CH_FREE) {
+                /*
+                 * Check if dma is still active. If yes do nothing,
+                 * return. Else stop dma
+                 */
+                if (omap_get_dma_active_status(up->uart_dma.tx_dma_channel))
+                        return;
+                omap_stop_dma(up->uart_dma.tx_dma_channel);
+                omap_free_dma(up->uart_dma.tx_dma_channel);
+                up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
+        }
 
-        pm_runtime_get_sync(up->dev);
         if (up->ier & UART_IER_THRI) {
                 up->ier &= ~UART_IER_THRI;
                 serial_out(up, UART_IER, up->ier);
         }
-
-        serial_omap_set_forceidle(up);
-
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
 }
 
 static void serial_omap_stop_rx(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
 
-        pm_runtime_get_sync(up->dev);
+        if (up->use_dma)
+                serial_omap_stop_rxdma(up);
         up->ier &= ~UART_IER_RLSI;
         up->port.read_status_mask &= ~UART_LSR_DR;
         serial_out(up, UART_IER, up->ier);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
 }
 
-static void transmit_chars(struct uart_omap_port *up, unsigned int lsr)
+static inline void receive_chars(struct uart_omap_port *up, int *status)
+{
+        struct tty_struct *tty = up->port.state->port.tty;
+        unsigned int flag;
+        unsigned char ch, lsr = *status;
+        int max_count = 256;
+
+        do {
+                if (likely(lsr & UART_LSR_DR))
+                        ch = serial_in(up, UART_RX);
+                flag = TTY_NORMAL;
+                up->port.icount.rx++;
+
+                if (unlikely(lsr & UART_LSR_BRK_ERROR_BITS)) {
+                        /*
+                         * 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 ignored.
+                         */
+                        lsr &= up->port.read_status_mask;
+
+#ifdef CONFIG_SERIAL_OMAP_CONSOLE
+                        if (up->port.line == up->port.cons->index) {
+                                /* Recover the break flag from console xmit */
+                                lsr |= up->lsr_break_flag;
+                        }
+#endif
+                        if (lsr & UART_LSR_BI)
+                                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))
+                        goto ignore_char;
+                uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag);
+ignore_char:
+                lsr = serial_in(up, UART_LSR);
+        } while ((lsr & (UART_LSR_DR | UART_LSR_BI)) && (max_count-- > 0));
+        spin_unlock(&up->port.lock);
+        tty_flip_buffer_push(tty);
+        spin_lock(&up->port.lock);
+}
+
+static void transmit_chars(struct uart_omap_port *up)
 {
         struct circ_buf *xmit = &up->port.state->xmit;
         int count;
 
-        if (!(lsr & UART_LSR_THRE))
-                return;
-
         if (up->port.x_char) {
                 serial_out(up, UART_TX, up->port.x_char);
                 up->port.icount.tx++;
@@ -324,11 +239,8 @@ static void transmit_chars(struct uart_omap_port *up, unsigned int lsr)
                         break;
         } while (--count > 0);
 
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {
-                spin_unlock(&up->port.lock);
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(&up->port);
-                spin_lock(&up->port.lock);
-        }
 
         if (uart_circ_empty(xmit))
                 serial_omap_stop_tx(&up->port);
@@ -344,41 +256,63 @@ static inline void serial_omap_enable_ier_thri(struct uart_omap_port *up)
 
 static void serial_omap_start_tx(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
+        struct circ_buf *xmit;
+        unsigned int start;
+        int ret = 0;
 
-        pm_runtime_get_sync(up->dev);
-        serial_omap_enable_ier_thri(up);
-        serial_omap_set_noidle(up);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
-}
+        if (!up->use_dma) {
+                serial_omap_enable_ier_thri(up);
+                return;
+        }
 
-static void serial_omap_throttle(struct uart_port *port)
-{
-        struct uart_omap_port *up = to_uart_omap_port(port);
-        unsigned long flags;
+        if (up->uart_dma.tx_dma_used)
+                return;
 
-        pm_runtime_get_sync(up->dev);
-        spin_lock_irqsave(&up->port.lock, flags);
-        up->ier &= ~(UART_IER_RLSI | UART_IER_RDI);
-        serial_out(up, UART_IER, up->ier);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
-}
+        xmit = &up->port.state->xmit;
 
-static void serial_omap_unthrottle(struct uart_port *port)
-{
-        struct uart_omap_port *up = to_uart_omap_port(port);
-        unsigned long flags;
+        if (up->uart_dma.tx_dma_channel == OMAP_UART_DMA_CH_FREE) {
+                ret = omap_request_dma(up->uart_dma.uart_dma_tx,
+                                "UART Tx DMA",
+                                (void *)uart_tx_dma_callback, up,
+                                &(up->uart_dma.tx_dma_channel));
 
-        pm_runtime_get_sync(up->dev);
-        spin_lock_irqsave(&up->port.lock, flags);
-        up->ier |= UART_IER_RLSI | UART_IER_RDI;
-        serial_out(up, UART_IER, up->ier);
-        spin_unlock_irqrestore(&up->port.lock, flags);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
+                if (ret < 0) {
+                        serial_omap_enable_ier_thri(up);
+                        return;
+                }
+        }
+        spin_lock(&(up->uart_dma.tx_lock));
+        up->uart_dma.tx_dma_used = true;
+        spin_unlock(&(up->uart_dma.tx_lock));
+
+        start = up->uart_dma.tx_buf_dma_phys +
+                                (xmit->tail & (UART_XMIT_SIZE - 1));
+
+        up->uart_dma.tx_buf_size = uart_circ_chars_pending(xmit);
+        /*
+         * It is a circular buffer. See if the buffer has wounded back.
+         * If yes it will have to be transferred in two separate dma
+         * transfers
+         */
+        if (start + up->uart_dma.tx_buf_size >=
+                        up->uart_dma.tx_buf_dma_phys + UART_XMIT_SIZE)
+                up->uart_dma.tx_buf_size =
+                        (up->uart_dma.tx_buf_dma_phys +
+                        UART_XMIT_SIZE) - start;
+
+        omap_set_dma_dest_params(up->uart_dma.tx_dma_channel, 0,
+                                OMAP_DMA_AMODE_CONSTANT,
+                                up->uart_dma.uart_base, 0, 0);
+        omap_set_dma_src_params(up->uart_dma.tx_dma_channel, 0,
+                                OMAP_DMA_AMODE_POST_INC, start, 0, 0);
+        omap_set_dma_transfer_params(up->uart_dma.tx_dma_channel,
+                                OMAP_DMA_DATA_TYPE_S8,
+                                up->uart_dma.tx_buf_size, 1,
+                                OMAP_DMA_SYNC_ELEMENT,
+                                up->uart_dma.uart_dma_tx, 0);
+        /* FIXME: Cache maintenance needed here? */
+        omap_start_dma(up->uart_dma.tx_dma_channel);
 }
 
 static unsigned int check_modem_status(struct uart_omap_port *up)
@@ -409,164 +343,67 @@ static unsigned int check_modem_status(struct uart_omap_port *up)
         return status;
 }
 
-static void serial_omap_rlsi(struct uart_omap_port *up, unsigned int lsr)
-{
-        unsigned int flag;
-        unsigned char ch = 0;
-
-        if (likely(lsr & UART_LSR_DR))
-                ch = serial_in(up, UART_RX);
-
-        up->port.icount.rx++;
-        flag = TTY_NORMAL;
-
-        if (lsr & UART_LSR_BI) {
-                flag = TTY_BREAK;
-                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))
-                        return;
-
-        }
-
-        if (lsr & UART_LSR_PE) {
-                flag = TTY_PARITY;
-                up->port.icount.parity++;
-        }
-
-        if (lsr & UART_LSR_FE) {
-                flag = TTY_FRAME;
-                up->port.icount.frame++;
-        }
-
-        if (lsr & UART_LSR_OE)
-                up->port.icount.overrun++;
-
-#ifdef CONFIG_SERIAL_OMAP_CONSOLE
-        if (up->port.line == up->port.cons->index) {
-                /* Recover the break flag from console xmit */
-                lsr |= up->lsr_break_flag;
-        }
-#endif
-        uart_insert_char(&up->port, lsr, UART_LSR_OE, 0, flag);
-}
-
-static void serial_omap_rdi(struct uart_omap_port *up, unsigned int lsr)
-{
-        unsigned char ch = 0;
-        unsigned int flag;
-
-        if (!(lsr & UART_LSR_DR))
-                return;
-
-        ch = serial_in(up, UART_RX);
-        flag = TTY_NORMAL;
-        up->port.icount.rx++;
-
-        if (uart_handle_sysrq_char(&up->port, ch))
-                return;
-
-        uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag);
-}
-
 /**
  * serial_omap_irq() - This handles the interrupt from one port
  * @irq: uart port irq number
  * @dev_id: uart port info
  */
-static irqreturn_t serial_omap_irq(int irq, void *dev_id)
+static inline irqreturn_t serial_omap_irq(int irq, void *dev_id)
 {
         struct uart_omap_port *up = dev_id;
-        struct tty_struct *tty = up->port.state->port.tty;
         unsigned int iir, lsr;
-        unsigned int type;
-        irqreturn_t ret = IRQ_NONE;
-        int max_count = 256;
-
-        spin_lock(&up->port.lock);
-        pm_runtime_get_sync(up->dev);
-
-        do {
-                iir = serial_in(up, UART_IIR);
-                if (iir & UART_IIR_NO_INT)
-                        break;
-
-                ret = IRQ_HANDLED;
-                lsr = serial_in(up, UART_LSR);
+        unsigned long flags;
 
-                /* extract IRQ type from IIR register */
-                type = iir & 0x3e;
+        iir = serial_in(up, UART_IIR);
+        if (iir & UART_IIR_NO_INT)
+                return IRQ_NONE;
 
-                switch (type) {
-                case UART_IIR_MSI:
-                        check_modem_status(up);
-                        break;
-                case UART_IIR_THRI:
-                        transmit_chars(up, lsr);
-                        break;
-                case UART_IIR_RX_TIMEOUT:
-                        /* FALLTHROUGH */
-                case UART_IIR_RDI:
-                        serial_omap_rdi(up, lsr);
-                        break;
-                case UART_IIR_RLSI:
-                        serial_omap_rlsi(up, lsr);
-                        break;
-                case UART_IIR_CTS_RTS_DSR:
-                        /* simply try again */
-                        break;
-                case UART_IIR_XOFF:
-                        /* FALLTHROUGH */
-                default:
-                        break;
+        spin_lock_irqsave(&up->port.lock, flags);
+        lsr = serial_in(up, UART_LSR);
+        if (iir & UART_IIR_RLSI) {
+                if (!up->use_dma) {
+                        if (lsr & UART_LSR_DR)
+                                receive_chars(up, &lsr);
+                } else {
+                        up->ier &= ~(UART_IER_RDI | UART_IER_RLSI);
+                        serial_out(up, UART_IER, up->ier);
+                        if ((serial_omap_start_rxdma(up) != 0) &&
+                                        (lsr & UART_LSR_DR))
+                                receive_chars(up, &lsr);
                 }
-        } while (!(iir & UART_IIR_NO_INT) && max_count--);
-
-        spin_unlock(&up->port.lock);
+        }
 
-        tty_flip_buffer_push(tty);
+        check_modem_status(up);
+        if ((lsr & UART_LSR_THRE) && (iir & UART_IIR_THRI))
+                transmit_chars(up);
 
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
+        spin_unlock_irqrestore(&up->port.lock, flags);
         up->port_activity = jiffies;
-
-        return ret;
+        return IRQ_HANDLED;
 }
 
 static unsigned int serial_omap_tx_empty(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned long flags = 0;
         unsigned int ret = 0;
 
-        pm_runtime_get_sync(up->dev);
-        dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->port.line);
+        dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->pdev->id);
         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);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
+
         return ret;
 }
 
 static unsigned int serial_omap_get_mctrl(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
-        unsigned int status;
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
+        unsigned char status;
         unsigned int ret = 0;
 
-        pm_runtime_get_sync(up->dev);
         status = check_modem_status(up);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
-
-        dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);
+        dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->pdev->id);
 
         if (status & UART_MSR_DCD)
                 ret |= TIOCM_CAR;
@@ -581,10 +418,10 @@ static unsigned int serial_omap_get_mctrl(struct uart_port *port)
 
 static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
-        unsigned char mcr = 0, old_mcr;
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
+        unsigned char mcr = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_set_mctrl+%d\n", up->port.line);
+        dev_dbg(up->port.dev, "serial_omap_set_mctrl+%d\n", up->pdev->id);
         if (mctrl & TIOCM_RTS)
                 mcr |= UART_MCR_RTS;
         if (mctrl & TIOCM_DTR)
@@ -596,33 +433,16 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
         if (mctrl & TIOCM_LOOP)
                 mcr |= UART_MCR_LOOP;
 
-        pm_runtime_get_sync(up->dev);
-        old_mcr = serial_in(up, UART_MCR);
-        old_mcr &= ~(UART_MCR_LOOP | UART_MCR_OUT2 | UART_MCR_OUT1 |
-                     UART_MCR_DTR | UART_MCR_RTS);
-        up->mcr = old_mcr | mcr;
-        serial_out(up, UART_MCR, up->mcr);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
-
-        if (gpio_is_valid(up->DTR_gpio) &&
-            !!(mctrl & TIOCM_DTR) != up->DTR_active) {
-                up->DTR_active = !up->DTR_active;
-                if (gpio_cansleep(up->DTR_gpio))
-                        schedule_work(&up->qos_work);
-                else
-                        gpio_set_value(up->DTR_gpio,
-                                       up->DTR_active != up->DTR_inverted);
-        }
+        mcr |= up->mcr;
+        serial_out(up, UART_MCR, mcr);
 }
 
 static void serial_omap_break_ctl(struct uart_port *port, int break_state)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned long flags = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_break_ctl+%d\n", up->port.line);
-        pm_runtime_get_sync(up->dev);
+        dev_dbg(up->port.dev, "serial_omap_break_ctl+%d\n", up->pdev->id);
         spin_lock_irqsave(&up->port.lock, flags);
         if (break_state == -1)
                 up->lcr |= UART_LCR_SBC;
@@ -630,13 +450,11 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
                 up->lcr &= ~UART_LCR_SBC;
         serial_out(up, UART_LCR, up->lcr);
         spin_unlock_irqrestore(&up->port.lock, flags);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
 }
 
 static int serial_omap_startup(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned long flags = 0;
         int retval;
 
@@ -648,9 +466,8 @@ static int serial_omap_startup(struct uart_port *port)
         if (retval)
                 return retval;
 
-        dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->port.line);
+        dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->pdev->id);
 
-        pm_runtime_get_sync(up->dev);
         /*
          * Clear the FIFO buffers and disable them.
          * (they will be reenabled in set_termios())
@@ -681,6 +498,20 @@ static int serial_omap_startup(struct uart_port *port)
         spin_unlock_irqrestore(&up->port.lock, flags);
 
         up->msr_saved_flags = 0;
+        if (up->use_dma) {
+                free_page((unsigned long)up->port.state->xmit.buf);
+                up->port.state->xmit.buf = dma_alloc_coherent(NULL,
+                        UART_XMIT_SIZE,
+                        (dma_addr_t *)&(up->uart_dma.tx_buf_dma_phys),
+                        0);
+                init_timer(&(up->uart_dma.rx_timer));
+                up->uart_dma.rx_timer.function = serial_omap_rx_timeout;
+                up->uart_dma.rx_timer.data = up->pdev->id;
+                /* Currently the buffer size is 4KB. Can increase it */
+                up->uart_dma.rx_buf = dma_alloc_coherent(NULL,
+                        up->uart_dma.rx_buf_size,
+                        (dma_addr_t *)&(up->uart_dma.rx_buf_dma_phys), 0);
+        }
         /*
          * Finally, enable interrupts. Note: Modem status interrupts
          * are set via set_termios(), which will be occurring imminently
@@ -692,20 +523,16 @@ static int serial_omap_startup(struct uart_port *port)
         /* Enable module level wake up */
         serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP);
 
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
         up->port_activity = jiffies;
         return 0;
 }
 
 static void serial_omap_shutdown(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned long flags = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_shutdown+%d\n", up->port.line);
-
-        pm_runtime_get_sync(up->dev);
+        dev_dbg(up->port.dev, "serial_omap_shutdown+%d\n", up->pdev->id);
         /*
          * Disable interrupts from this port
          */
@@ -728,29 +555,89 @@ static void serial_omap_shutdown(struct uart_port *port)
          */
         if (serial_in(up, UART_LSR) & UART_LSR_DR)
                 (void) serial_in(up, UART_RX);
-
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
+        if (up->use_dma) {
+                dma_free_coherent(up->port.dev,
+                        UART_XMIT_SIZE, up->port.state->xmit.buf,
+                        up->uart_dma.tx_buf_dma_phys);
+                up->port.state->xmit.buf = NULL;
+                serial_omap_stop_rx(port);
+                dma_free_coherent(up->port.dev,
+                        up->uart_dma.rx_buf_size, up->uart_dma.rx_buf,
+                        up->uart_dma.rx_buf_dma_phys);
+                up->uart_dma.rx_buf = NULL;
+        }
         free_irq(up->port.irq, up);
 }
 
-static void serial_omap_uart_qos_work(struct work_struct *work)
+static inline void
+serial_omap_configure_xonxoff
+                (struct uart_omap_port *up, struct ktermios *termios)
 {
-        struct uart_omap_port *up = container_of(work, struct uart_omap_port,
-                                                qos_work);
+        unsigned char efr = 0;
+
+        up->lcr = serial_in(up, UART_LCR);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+        up->efr = serial_in(up, UART_EFR);
+        serial_out(up, UART_EFR, up->efr & ~UART_EFR_ECB);
+
+        serial_out(up, UART_XON1, termios->c_cc[VSTART]);
+        serial_out(up, UART_XOFF1, termios->c_cc[VSTOP]);
+
+        /* clear SW control mode bits */
+        efr = up->efr;
+        efr &= OMAP_UART_SW_CLR;
+
+        /*
+         * IXON Flag:
+         * Enable XON/XOFF flow control on output.
+         * Transmit XON1, XOFF1
+         */
+        if (termios->c_iflag & IXON)
+                efr |= OMAP_UART_SW_TX;
+
+        /*
+         * IXOFF Flag:
+         * Enable XON/XOFF flow control on input.
+         * Receiver compares XON1, XOFF1.
+         */
+        if (termios->c_iflag & IXOFF)
+                efr |= OMAP_UART_SW_RX;
+
+        serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
+
+        up->mcr = serial_in(up, UART_MCR);
+
+        /*
+         * IXANY Flag:
+         * Enable any character to restart output.
+         * Operation resumes after receiving any
+         * character after recognition of the XOFF character
+         */
+        if (termios->c_iflag & IXANY)
+                up->mcr |= UART_MCR_XONANY;
+
+        serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+        serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);
+        /* Enable special char function UARTi.EFR_REG[5] and
+         * load the new software flow control mode IXON or IXOFF
+         * and restore the UARTi.EFR_REG[4] ENHANCED_EN value.
+         */
+        serial_out(up, UART_EFR, efr | UART_EFR_SCD);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
 
-        pm_qos_update_request(&up->pm_qos_request, up->latency);
-        if (gpio_is_valid(up->DTR_gpio))
-                gpio_set_value_cansleep(up->DTR_gpio,
-                                        up->DTR_active != up->DTR_inverted);
+        serial_out(up, UART_MCR, up->mcr & ~UART_MCR_TCRTLR);
+        serial_out(up, UART_LCR, up->lcr);
 }
 
 static void
 serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
                         struct ktermios *old)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned char cval = 0;
+        unsigned char efr = 0;
         unsigned long flags = 0;
         unsigned int baud, quot;
 
@@ -784,23 +671,15 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/13);
         quot = serial_omap_get_divisor(port, baud);
 
-        /* calculate wakeup latency constraint */
-        up->calc_latency = (USEC_PER_SEC * up->port.fifosize) / (baud / 8);
-        up->latency = up->calc_latency;
-        schedule_work(&up->qos_work);
-
-        up->dll = quot & 0xff;
-        up->dlh = quot >> 8;
-        up->mdr1 = UART_OMAP_MDR1_DISABLE;
-
         up->fcr = UART_FCR_R_TRIG_01 | UART_FCR_T_TRIG_01 |
                         UART_FCR_ENABLE_FIFO;
+        if (up->use_dma)
+                up->fcr |= UART_FCR_DMA_SELECT;
 
         /*
          * Ok, we're now changing the port state. Do it with
          * interrupts disabled.
          */
-        pm_runtime_get_sync(up->dev);
         spin_lock_irqsave(&up->port.lock, flags);
 
         /*
@@ -844,8 +723,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
                 up->ier |= UART_IER_MSI;
         serial_out(up, UART_IER, up->ier);
         serial_out(up, UART_LCR, cval);         /* reset DLAB */
-        up->lcr = cval;
-        up->scr = OMAP_UART_SCR_TX_EMPTY;
 
         /* FIFOs and DMA Settings */
 
@@ -860,53 +737,40 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
 
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
-        up->efr = serial_in(up, UART_EFR) & ~UART_EFR_ECB;
-        up->efr &= ~UART_EFR_SCD;
+        up->efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        up->mcr = serial_in(up, UART_MCR) & ~UART_MCR_TCRTLR;
+        up->mcr = serial_in(up, UART_MCR);
         serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
         /* FIFO ENABLE, DMA MODE */
-
-        up->scr |= OMAP_UART_SCR_RX_TRIG_GRANU1_MASK;
-
-        /* Set receive FIFO threshold to 16 characters and
-         * transmit FIFO threshold to 16 spaces
-         */
-        up->fcr &= ~OMAP_UART_FCR_RX_FIFO_TRIG_MASK;
-        up->fcr &= ~OMAP_UART_FCR_TX_FIFO_TRIG_MASK;
-        up->fcr |= UART_FCR6_R_TRIGGER_16 | UART_FCR6_T_TRIGGER_24 |
-                UART_FCR_ENABLE_FIFO;
-
         serial_out(up, UART_FCR, up->fcr);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
-        serial_out(up, UART_OMAP_SCR, up->scr);
+        if (up->use_dma) {
+                serial_out(up, UART_TI752_TLR, 0);
+                serial_out(up, UART_OMAP_SCR,
+                        (UART_FCR_TRIGGER_4 | UART_FCR_TRIGGER_8));
+        }
 
-        /* Reset UART_MCR_TCRTLR: this must be done with the EFR_ECB bit set */
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_out(up, UART_MCR, up->mcr);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_EFR, up->efr);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(up, UART_MCR, up->mcr);
 
         /* Protocol, Baud Rate, and Interrupt Settings */
 
-        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
-                serial_omap_mdr1_errataset(up, up->mdr1);
-        else
-                serial_out(up, UART_OMAP_MDR1, up->mdr1);
-
+        serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+
+        up->efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
         serial_out(up, UART_LCR, 0);
         serial_out(up, UART_IER, 0);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
-        serial_out(up, UART_DLL, up->dll);      /* LS of divisor */
-        serial_out(up, UART_DLM, up->dlh);      /* MS of divisor */
+        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, 0);
         serial_out(up, UART_IER, up->ier);
@@ -916,103 +780,46 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         serial_out(up, UART_LCR, cval);
 
         if (baud > 230400 && baud != 3000000)
-                up->mdr1 = UART_OMAP_MDR1_13X_MODE;
+                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_13X_MODE);
         else
-                up->mdr1 = UART_OMAP_MDR1_16X_MODE;
+                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);
 
-        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
-                serial_omap_mdr1_errataset(up, up->mdr1);
-        else
-                serial_out(up, UART_OMAP_MDR1, up->mdr1);
+        /* Hardware Flow Control Configuration */
 
-        /* Configure flow control */
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+        if (termios->c_cflag & CRTSCTS) {
+                efr |= (UART_EFR_CTS | UART_EFR_RTS);
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
 
-        /* XON1/XOFF1 accessible mode B, TCRTLR=0, ECB=0 */
-        serial_out(up, UART_XON1, termios->c_cc[VSTART]);
-        serial_out(up, UART_XOFF1, termios->c_cc[VSTOP]);
-
-        /* Enable access to TCR/TLR */
-        serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
+                up->mcr = serial_in(up, UART_MCR);
+                serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
 
-        serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);
-
-        if (termios->c_cflag & CRTSCTS && up->port.flags & UPF_HARD_FLOW) {
-                /* Enable AUTORTS and AUTOCTS */
-                up->efr |= UART_EFR_CTS | UART_EFR_RTS;
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+                up->efr = serial_in(up, UART_EFR);
+                serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
-                /* Ensure MCR RTS is asserted */
-                up->mcr |= UART_MCR_RTS;
-        } else {
-                /* Disable AUTORTS and AUTOCTS */
-                up->efr &= ~(UART_EFR_CTS | UART_EFR_RTS);
+                serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);
+                serial_out(up, UART_EFR, efr); /* Enable AUTORTS and AUTOCTS */
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
+                serial_out(up, UART_MCR, up->mcr | UART_MCR_RTS);
+                serial_out(up, UART_LCR, cval);
         }
 
-        if (up->port.flags & UPF_SOFT_FLOW) {
-                /* clear SW control mode bits */
-                up->efr &= OMAP_UART_SW_CLR;
-
-                /*
-                 * IXON Flag:
-                 * Enable XON/XOFF flow control on input.
-                 * Receiver compares XON1, XOFF1.
-                 */
-                if (termios->c_iflag & IXON)
-                        up->efr |= OMAP_UART_SW_RX;
-
-                /*
-                 * IXOFF Flag:
-                 * Enable XON/XOFF flow control on output.
-                 * Transmit XON1, XOFF1
-                 */
-                if (termios->c_iflag & IXOFF)
-                        up->efr |= OMAP_UART_SW_TX;
-
-                /*
-                 * IXANY Flag:
-                 * Enable any character to restart output.
-                 * Operation resumes after receiving any
-                 * character after recognition of the XOFF character
-                 */
-                if (termios->c_iflag & IXANY)
-                        up->mcr |= UART_MCR_XONANY;
-                else
-                        up->mcr &= ~UART_MCR_XONANY;
-        }
-        serial_out(up, UART_MCR, up->mcr);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
-        serial_out(up, UART_EFR, up->efr);
-        serial_out(up, UART_LCR, up->lcr);
-
         serial_omap_set_mctrl(&up->port, up->port.mctrl);
+        /* Software Flow Control Configuration */
+        serial_omap_configure_xonxoff(up, termios);
 
         spin_unlock_irqrestore(&up->port.lock, flags);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
-        dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->port.line);
-}
-
-static int serial_omap_set_wake(struct uart_port *port, unsigned int state)
-{
-        struct uart_omap_port *up = to_uart_omap_port(port);
-
-        serial_omap_enable_wakeup(up, state);
-
-        return 0;
+        dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->pdev->id);
 }
 
 static void
 serial_omap_pm(struct uart_port *port, unsigned int state,
                unsigned int oldstate)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned char efr;
 
-        dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->port.line);
-
-        pm_runtime_get_sync(up->dev);
+        dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->pdev->id);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, efr | UART_EFR_ECB);
@@ -1022,16 +829,6 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_EFR, efr);
         serial_out(up, UART_LCR, 0);
-
-        if (!device_may_wakeup(up->dev)) {
-                if (!state)
-                        pm_runtime_forbid(up->dev);
-                else
-                        pm_runtime_allow(up->dev);
-        }
-
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
 }
 
 static void serial_omap_release_port(struct uart_port *port)
@@ -1047,12 +844,11 @@ static int serial_omap_request_port(struct uart_port *port)
 
 static void serial_omap_config_port(struct uart_port *port, int flags)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
 
         dev_dbg(up->port.dev, "serial_omap_config_port+%d\n",
-                                                        up->port.line);
+                                                        up->pdev->id);
         up->port.type = PORT_OMAP;
-        up->port.flags |= UPF_SOFT_FLOW | UPF_HARD_FLOW;
 }
 
 static int
@@ -1066,9 +862,9 @@ serial_omap_verify_port(struct uart_port *port, struct serial_struct *ser)
 static const char *
 serial_omap_type(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
 
-        dev_dbg(up->port.dev, "serial_omap_type+%d\n", up->port.line);
+        dev_dbg(up->port.dev, "serial_omap_type+%d\n", up->pdev->id);
         return up->name;
 }
 
@@ -1109,47 +905,33 @@ static inline void wait_for_xmitr(struct uart_omap_port *up)
 
 static void serial_omap_poll_put_char(struct uart_port *port, unsigned char ch)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
-
-        pm_runtime_get_sync(up->dev);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
         wait_for_xmitr(up);
         serial_out(up, UART_TX, ch);
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
 }
 
 static int serial_omap_poll_get_char(struct uart_port *port)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
-        unsigned int status;
-
-        pm_runtime_get_sync(up->dev);
-        status = serial_in(up, UART_LSR);
-        if (!(status & UART_LSR_DR)) {
-                status = NO_POLL_CHAR;
-                goto out;
-        }
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
+        unsigned int status = serial_in(up, UART_LSR);
 
-        status = serial_in(up, UART_RX);
+        if (!(status & UART_LSR_DR))
+                return NO_POLL_CHAR;
 
-out:
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
-
-        return status;
+        return serial_in(up, UART_RX);
 }
 
 #endif /* CONFIG_CONSOLE_POLL */
 
 #ifdef CONFIG_SERIAL_OMAP_CONSOLE
 
-static struct uart_omap_port *serial_omap_console_ports[OMAP_MAX_HSUART_PORTS];
+static struct uart_omap_port *serial_omap_console_ports[4];
 
 static struct uart_driver serial_omap_reg;
 
 static void serial_omap_console_putchar(struct uart_port *port, int ch)
 {
-        struct uart_omap_port *up = to_uart_omap_port(port);
+        struct uart_omap_port *up = (struct uart_omap_port *)port;
 
         wait_for_xmitr(up);
         serial_out(up, UART_TX, ch);
@@ -1164,8 +946,6 @@ serial_omap_console_write(struct console *co, const char *s,
         unsigned int ier;
         int locked = 1;
 
-        pm_runtime_get_sync(up->dev);
-
         local_irq_save(flags);
         if (up->port.sysrq)
                 locked = 0;
@@ -1198,8 +978,6 @@ serial_omap_console_write(struct console *co, const char *s,
         if (up->msr_saved_flags)
                 check_modem_status(up);
 
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
         if (locked)
                 spin_unlock(&up->port.lock);
         local_irq_restore(flags);
@@ -1236,7 +1014,7 @@ static struct console serial_omap_console = {
 
 static void serial_omap_add_console_port(struct uart_omap_port *up)
 {
-        serial_omap_console_ports[up->port.line] = up;
+        serial_omap_console_ports[up->pdev->id] = up;
 }
 
 #define OMAP_CONSOLE    (&serial_omap_console)
@@ -1256,8 +1034,6 @@ static struct uart_ops serial_omap_pops = {
         .get_mctrl      = serial_omap_get_mctrl,
         .stop_tx        = serial_omap_stop_tx,
         .start_tx       = serial_omap_start_tx,
-        .throttle       = serial_omap_throttle,
-        .unthrottle     = serial_omap_unthrottle,
         .stop_rx        = serial_omap_stop_rx,
         .enable_ms      = serial_omap_enable_ms,
         .break_ctl      = serial_omap_break_ctl,
@@ -1265,7 +1041,6 @@ static struct uart_ops serial_omap_pops = {
         .shutdown       = serial_omap_shutdown,
         .set_termios    = serial_omap_set_termios,
         .pm             = serial_omap_pm,
-        .set_wake       = serial_omap_set_wake,
         .type           = serial_omap_type,
         .release_port   = serial_omap_release_port,
         .request_port   = serial_omap_request_port,
@@ -1285,102 +1060,173 @@ static struct uart_driver serial_omap_reg = {
         .cons           = OMAP_CONSOLE,
 };
 
-#ifdef CONFIG_PM_SLEEP
-static int serial_omap_suspend(struct device *dev)
+static int
+serial_omap_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct uart_omap_port *up = dev_get_drvdata(dev);
-
-        uart_suspend_port(&serial_omap_reg, &up->port);
-        flush_work(&up->qos_work);
+        struct uart_omap_port *up = platform_get_drvdata(pdev);
 
+        if (up)
+                uart_suspend_port(&serial_omap_reg, &up->port);
         return 0;
 }
 
-static int serial_omap_resume(struct device *dev)
+static int serial_omap_resume(struct platform_device *dev)
 {
-        struct uart_omap_port *up = dev_get_drvdata(dev);
-
-        uart_resume_port(&serial_omap_reg, &up->port);
+        struct uart_omap_port *up = platform_get_drvdata(dev);
 
+        if (up)
+                uart_resume_port(&serial_omap_reg, &up->port);
         return 0;
 }
-#endif
 
-static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
+static void serial_omap_rx_timeout(unsigned long uart_no)
 {
-        u32 mvr, scheme;
-        u16 revision, major, minor;
+        struct uart_omap_port *up = ui[uart_no];
+        unsigned int curr_dma_pos, curr_transmitted_size;
+        int ret = 0;
+
+        curr_dma_pos = omap_get_dma_dst_pos(up->uart_dma.rx_dma_channel);
+        if ((curr_dma_pos == up->uart_dma.prev_rx_dma_pos) ||
+                             (curr_dma_pos == 0)) {
+                if (jiffies_to_msecs(jiffies - up->port_activity) <
+                                                        RX_TIMEOUT) {
+                        mod_timer(&up->uart_dma.rx_timer, jiffies +
+                                usecs_to_jiffies(up->uart_dma.rx_timeout));
+                } else {
+                        serial_omap_stop_rxdma(up);
+                        up->ier |= (UART_IER_RDI | UART_IER_RLSI);
+                        serial_out(up, UART_IER, up->ier);
+                }
+                return;
+        }
 
-        mvr = serial_in(up, UART_OMAP_MVER);
+        curr_transmitted_size = curr_dma_pos -
+                                        up->uart_dma.prev_rx_dma_pos;
+        up->port.icount.rx += curr_transmitted_size;
+        tty_insert_flip_string(up->port.state->port.tty,
+                        up->uart_dma.rx_buf +
+                        (up->uart_dma.prev_rx_dma_pos -
+                        up->uart_dma.rx_buf_dma_phys),
+                        curr_transmitted_size);
+        tty_flip_buffer_push(up->port.state->port.tty);
+        up->uart_dma.prev_rx_dma_pos = curr_dma_pos;
+        if (up->uart_dma.rx_buf_size +
+                        up->uart_dma.rx_buf_dma_phys == curr_dma_pos) {
+                ret = serial_omap_start_rxdma(up);
+                if (ret < 0) {
+                        serial_omap_stop_rxdma(up);
+                        up->ier |= (UART_IER_RDI | UART_IER_RLSI);
+                        serial_out(up, UART_IER, up->ier);
+                }
+        } else  {
+                mod_timer(&up->uart_dma.rx_timer, jiffies +
+                        usecs_to_jiffies(up->uart_dma.rx_timeout));
+        }
+        up->port_activity = jiffies;
+}
 
-        /* Check revision register scheme */
-        scheme = mvr >> OMAP_UART_MVR_SCHEME_SHIFT;
+static void uart_rx_dma_callback(int lch, u16 ch_status, void *data)
+{
+        return;
+}
 
-        switch (scheme) {
-        case 0: /* Legacy Scheme: OMAP2/3 */
-                /* MINOR_REV[0:4], MAJOR_REV[4:7] */
-                major = (mvr & OMAP_UART_LEGACY_MVR_MAJ_MASK) >>
-                                        OMAP_UART_LEGACY_MVR_MAJ_SHIFT;
-                minor = (mvr & OMAP_UART_LEGACY_MVR_MIN_MASK);
-                break;
-        case 1:
-                /* New Scheme: OMAP4+ */
-                /* MINOR_REV[0:5], MAJOR_REV[8:10] */
-                major = (mvr & OMAP_UART_MVR_MAJ_MASK) >>
-                                        OMAP_UART_MVR_MAJ_SHIFT;
-                minor = (mvr & OMAP_UART_MVR_MIN_MASK);
-                break;
-        default:
-                dev_warn(up->dev,
-                        "Unknown %s revision, defaulting to highest\n",
-                        up->name);
-                /* highest possible revision */
-                major = 0xff;
-                minor = 0xff;
-        }
+static int serial_omap_start_rxdma(struct uart_omap_port *up)
+{
+        int ret = 0;
 
-        /* normalize revision for the driver */
-        revision = UART_BUILD_REVISION(major, minor);
+        if (up->uart_dma.rx_dma_channel == -1) {
+                ret = omap_request_dma(up->uart_dma.uart_dma_rx,
+                                "UART Rx DMA",
+                                (void *)uart_rx_dma_callback, up,
+                                &(up->uart_dma.rx_dma_channel));
+                if (ret < 0)
+                        return ret;
 
-        switch (revision) {
-        case OMAP_UART_REV_46:
-                up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
-                                UART_ERRATA_i291_DMA_FORCEIDLE);
-                break;
-        case OMAP_UART_REV_52:
-                up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
-                                UART_ERRATA_i291_DMA_FORCEIDLE);
-                break;
-        case OMAP_UART_REV_63:
-                up->errata |= UART_ERRATA_i202_MDR1_ACCESS;
-                break;
-        default:
-                break;
+                omap_set_dma_src_params(up->uart_dma.rx_dma_channel, 0,
+                                OMAP_DMA_AMODE_CONSTANT,
+                                up->uart_dma.uart_base, 0, 0);
+                omap_set_dma_dest_params(up->uart_dma.rx_dma_channel, 0,
+                                OMAP_DMA_AMODE_POST_INC,
+                                up->uart_dma.rx_buf_dma_phys, 0, 0);
+                omap_set_dma_transfer_params(up->uart_dma.rx_dma_channel,
+                                OMAP_DMA_DATA_TYPE_S8,
+                                up->uart_dma.rx_buf_size, 1,
+                                OMAP_DMA_SYNC_ELEMENT,
+                                up->uart_dma.uart_dma_rx, 0);
         }
+        up->uart_dma.prev_rx_dma_pos = up->uart_dma.rx_buf_dma_phys;
+        /* FIXME: Cache maintenance needed here? */
+        omap_start_dma(up->uart_dma.rx_dma_channel);
+        mod_timer(&up->uart_dma.rx_timer, jiffies +
+                                usecs_to_jiffies(up->uart_dma.rx_timeout));
+        up->uart_dma.rx_dma_used = true;
+        return ret;
+}
+
+static void serial_omap_continue_tx(struct uart_omap_port *up)
+{
+        struct circ_buf *xmit = &up->port.state->xmit;
+        unsigned int start = up->uart_dma.tx_buf_dma_phys
+                        + (xmit->tail & (UART_XMIT_SIZE - 1));
+
+        if (uart_circ_empty(xmit))
+                return;
+
+        up->uart_dma.tx_buf_size = uart_circ_chars_pending(xmit);
+        /*
+         * It is a circular buffer. See if the buffer has wounded back.
+         * If yes it will have to be transferred in two separate dma
+         * transfers
+         */
+        if (start + up->uart_dma.tx_buf_size >=
+                        up->uart_dma.tx_buf_dma_phys + UART_XMIT_SIZE)
+                up->uart_dma.tx_buf_size =
+                        (up->uart_dma.tx_buf_dma_phys + UART_XMIT_SIZE) - start;
+        omap_set_dma_dest_params(up->uart_dma.tx_dma_channel, 0,
+                                OMAP_DMA_AMODE_CONSTANT,
+                                up->uart_dma.uart_base, 0, 0);
+        omap_set_dma_src_params(up->uart_dma.tx_dma_channel, 0,
+                                OMAP_DMA_AMODE_POST_INC, start, 0, 0);
+        omap_set_dma_transfer_params(up->uart_dma.tx_dma_channel,
+                                OMAP_DMA_DATA_TYPE_S8,
+                                up->uart_dma.tx_buf_size, 1,
+                                OMAP_DMA_SYNC_ELEMENT,
+                                up->uart_dma.uart_dma_tx, 0);
+        /* FIXME: Cache maintenance needed here? */
+        omap_start_dma(up->uart_dma.tx_dma_channel);
 }
 
-static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
+static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
 {
-        struct omap_uart_port_info *omap_up_info;
+        struct uart_omap_port *up = (struct uart_omap_port *)data;
+        struct circ_buf *xmit = &up->port.state->xmit;
 
-        omap_up_info = devm_kzalloc(dev, sizeof(*omap_up_info), GFP_KERNEL);
-        if (!omap_up_info)
-                return NULL; /* out of memory */
+        xmit->tail = (xmit->tail + up->uart_dma.tx_buf_size) & \
+                        (UART_XMIT_SIZE - 1);
+        up->port.icount.tx += up->uart_dma.tx_buf_size;
 
-        of_property_read_u32(dev->of_node, "clock-frequency",
-                                         &omap_up_info->uartclk);
-        return omap_up_info;
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&up->port);
+
+        if (uart_circ_empty(xmit)) {
+                spin_lock(&(up->uart_dma.tx_lock));
+                serial_omap_stop_tx(&up->port);
+                up->uart_dma.tx_dma_used = false;
+                spin_unlock(&(up->uart_dma.tx_lock));
+        } else {
+                omap_stop_dma(up->uart_dma.tx_dma_channel);
+                serial_omap_continue_tx(up);
+        }
+        up->port_activity = jiffies;
+        return;
 }
 
 static int serial_omap_probe(struct platform_device *pdev)
 {
         struct uart_omap_port   *up;
-        struct resource         *mem, *irq;
+        struct resource         *mem, *irq, *dma_tx, *dma_rx;
         struct omap_uart_port_info *omap_up_info = pdev->dev.platform_data;
-        int ret;
-
-        if (pdev->dev.of_node)
-                omap_up_info = of_get_uart_port_info(&pdev->dev);
+        int ret = -ENOSPC;
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!mem) {
@@ -1394,36 +1240,31 @@ static int serial_omap_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
+        if (!request_mem_region(mem->start, resource_size(mem),
                                 pdev->dev.driver->name)) {
                 dev_err(&pdev->dev, "memory region already claimed\n");
                 return -EBUSY;
         }
 
-        if (gpio_is_valid(omap_up_info->DTR_gpio) &&
-            omap_up_info->DTR_present) {
-                ret = gpio_request(omap_up_info->DTR_gpio, "omap-serial");
-                if (ret < 0)
-                        return ret;
-                ret = gpio_direction_output(omap_up_info->DTR_gpio,
-                                            omap_up_info->DTR_inverted);
-                if (ret < 0)
-                        return ret;
+        dma_rx = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
+        if (!dma_rx) {
+                ret = -EINVAL;
+                goto err;
         }
 
-        up = devm_kzalloc(&pdev->dev, sizeof(*up), GFP_KERNEL);
-        if (!up)
-                return -ENOMEM;
-
-        if (gpio_is_valid(omap_up_info->DTR_gpio) &&
-            omap_up_info->DTR_present) {
-                up->DTR_gpio = omap_up_info->DTR_gpio;
-                up->DTR_inverted = omap_up_info->DTR_inverted;
-        } else
-                up->DTR_gpio = -EINVAL;
-        up->DTR_active = 0;
+        dma_tx = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
+        if (!dma_tx) {
+                ret = -EINVAL;
+                goto err;
+        }
 
-        up->dev = &pdev->dev;
+        up = kzalloc(sizeof(*up), GFP_KERNEL);
+        if (up == NULL) {
+                ret = -ENOMEM;
+                goto do_release_region;
+        }
+        sprintf(up->name, "OMAP UART%d", pdev->id);
+        up->pdev = pdev;
         up->port.dev = &pdev->dev;
         up->port.type = PORT_OMAP;
         up->port.iotype = UPIO_MEM;
@@ -1432,80 +1273,41 @@ static int serial_omap_probe(struct platform_device *pdev)
         up->port.regshift = 2;
         up->port.fifosize = 64;
         up->port.ops = &serial_omap_pops;
+        up->port.line = pdev->id;
 
-        if (pdev->dev.of_node)
-                up->port.line = of_alias_get_id(pdev->dev.of_node, "serial");
-        else
-                up->port.line = pdev->id;
-
-        if (up->port.line < 0) {
-                dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n",
-                                                                up->port.line);
-                ret = -ENODEV;
-                goto err_port_line;
-        }
-
-        up->pins = devm_pinctrl_get_select_default(&pdev->dev);
-        if (IS_ERR(up->pins)) {
-                dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n",
-                         up->port.line, PTR_ERR(up->pins));
-                up->pins = NULL;
-        }
-
-        sprintf(up->name, "OMAP UART%d", up->port.line);
-        up->port.mapbase = mem->start;
-        up->port.membase = devm_ioremap(&pdev->dev, mem->start,
-                                                resource_size(mem));
-        if (!up->port.membase) {
-                dev_err(&pdev->dev, "can't ioremap UART\n");
-                ret = -ENOMEM;
-                goto err_ioremap;
-        }
-
+        up->port.membase = omap_up_info->membase;
+        up->port.mapbase = omap_up_info->mapbase;
         up->port.flags = omap_up_info->flags;
+        up->port.irqflags = omap_up_info->irqflags;
         up->port.uartclk = omap_up_info->uartclk;
-        if (!up->port.uartclk) {
-                up->port.uartclk = DEFAULT_CLK_SPEED;
-                dev_warn(&pdev->dev, "No clock speed specified: using default:"
-                                                "%d\n", DEFAULT_CLK_SPEED);
+        up->uart_dma.uart_base = mem->start;
+
+        if (omap_up_info->dma_enabled) {
+                up->uart_dma.uart_dma_tx = dma_tx->start;
+                up->uart_dma.uart_dma_rx = dma_rx->start;
+                up->use_dma = 1;
+                up->uart_dma.rx_buf_size = 4096;
+                up->uart_dma.rx_timeout = 2;
+                spin_lock_init(&(up->uart_dma.tx_lock));
+                spin_lock_init(&(up->uart_dma.rx_lock));
+                up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
+                up->uart_dma.rx_dma_channel = OMAP_UART_DMA_CH_FREE;
         }
 
-        up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
-        up->calc_latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
-        pm_qos_add_request(&up->pm_qos_request,
-                PM_QOS_CPU_DMA_LATENCY, up->latency);
-        serial_omap_uart_wq = create_singlethread_workqueue(up->name);
-        INIT_WORK(&up->qos_work, serial_omap_uart_qos_work);
-
-        platform_set_drvdata(pdev, up);
-        pm_runtime_enable(&pdev->dev);
-        pm_runtime_use_autosuspend(&pdev->dev);
-        pm_runtime_set_autosuspend_delay(&pdev->dev,
-                        omap_up_info->autosuspend_timeout);
-
-        pm_runtime_irq_safe(&pdev->dev);
-        pm_runtime_get_sync(&pdev->dev);
-
-        omap_serial_fill_features_erratas(up);
-
-        ui[up->port.line] = up;
+        ui[pdev->id] = up;
         serial_omap_add_console_port(up);
 
         ret = uart_add_one_port(&serial_omap_reg, &up->port);
         if (ret != 0)
-                goto err_add_port;
+                goto do_release_region;
 
-        pm_runtime_mark_last_busy(up->dev);
-        pm_runtime_put_autosuspend(up->dev);
+        platform_set_drvdata(pdev, up);
         return 0;
-
-err_add_port:
-        pm_runtime_put(&pdev->dev);
-        pm_runtime_disable(&pdev->dev);
-err_ioremap:
-err_port_line:
+err:
         dev_err(&pdev->dev, "[UART%d]: failure [%s]: %d\n",
                                 pdev->id, __func__, ret);
+do_release_region:
+        release_mem_region(mem->start, resource_size(mem));
         return ret;
 }
 
@@ -1513,152 +1315,22 @@ static int serial_omap_remove(struct platform_device *dev)
 {
         struct uart_omap_port *up = platform_get_drvdata(dev);
 
-        pm_runtime_put_sync(up->dev);
-        pm_runtime_disable(up->dev);
-        uart_remove_one_port(&serial_omap_reg, &up->port);
-        pm_qos_remove_request(&up->pm_qos_request);
-
-        return 0;
-}
-
-/*
- * Work Around for Errata i202 (2430, 3430, 3630, 4430 and 4460)
- * The access to uart register after MDR1 Access
- * causes UART to corrupt data.
- *
- * Need a delay =
- * 5 L4 clock cycles + 5 UART functional clock cycle (@48MHz = ~0.2uS)
- * give 10 times as much
- */
-static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
-{
-        u8 timeout = 255;
-
-        serial_out(up, UART_OMAP_MDR1, mdr1);
-        udelay(2);
-        serial_out(up, UART_FCR, up->fcr | UART_FCR_CLEAR_XMIT |
-                        UART_FCR_CLEAR_RCVR);
-        /*
-         * Wait for FIFO to empty: when empty, RX_FIFO_E bit is 0 and
-         * TX_FIFO_E bit is 1.
-         */
-        while (UART_LSR_THRE != (serial_in(up, UART_LSR) &
-                                (UART_LSR_THRE | UART_LSR_DR))) {
-                timeout--;
-                if (!timeout) {
-                        /* Should *never* happen. we warn and carry on */
-                        dev_crit(up->dev, "Errata i202: timedout %x\n",
-                                                serial_in(up, UART_LSR));
-                        break;
-                }
-                udelay(1);
+        platform_set_drvdata(dev, NULL);
+        if (up) {
+                uart_remove_one_port(&serial_omap_reg, &up->port);
+                kfree(up);
         }
-}
-
-#ifdef CONFIG_PM_RUNTIME
-static void serial_omap_restore_context(struct uart_omap_port *up)
-{
-        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
-                serial_omap_mdr1_errataset(up, UART_OMAP_MDR1_DISABLE);
-        else
-                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
-
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); /* Config B mode */
-        serial_out(up, UART_EFR, UART_EFR_ECB);
-        serial_out(up, UART_LCR, 0x0); /* Operational mode */
-        serial_out(up, UART_IER, 0x0);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); /* Config B mode */
-        serial_out(up, UART_DLL, up->dll);
-        serial_out(up, UART_DLM, up->dlh);
-        serial_out(up, UART_LCR, 0x0); /* Operational mode */
-        serial_out(up, UART_IER, up->ier);
-        serial_out(up, UART_FCR, up->fcr);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_out(up, UART_MCR, up->mcr);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); /* Config B mode */
-        serial_out(up, UART_OMAP_SCR, up->scr);
-        serial_out(up, UART_EFR, up->efr);
-        serial_out(up, UART_LCR, up->lcr);
-        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
-                serial_omap_mdr1_errataset(up, up->mdr1);
-        else
-                serial_out(up, UART_OMAP_MDR1, up->mdr1);
-}
-
-static int serial_omap_runtime_suspend(struct device *dev)
-{
-        struct uart_omap_port *up = dev_get_drvdata(dev);
-        struct omap_uart_port_info *pdata = dev->platform_data;
-
-        if (!up)
-                return -EINVAL;
-
-        if (!pdata)
-                return 0;
-
-        up->context_loss_cnt = serial_omap_get_context_loss_count(up);
-
-        if (device_may_wakeup(dev)) {
-                if (!up->wakeups_enabled) {
-                        serial_omap_enable_wakeup(up, true);
-                        up->wakeups_enabled = true;
-                }
-        } else {
-                if (up->wakeups_enabled) {
-                        serial_omap_enable_wakeup(up, false);
-                        up->wakeups_enabled = false;
-                }
-        }
-
-        up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
-        schedule_work(&up->qos_work);
-
         return 0;
 }
 
-static int serial_omap_runtime_resume(struct device *dev)
-{
-        struct uart_omap_port *up = dev_get_drvdata(dev);
-
-        int loss_cnt = serial_omap_get_context_loss_count(up);
-
-        if (loss_cnt < 0) {
-                dev_err(dev, "serial_omap_get_context_loss_count failed : %d\n",
-                        loss_cnt);
-                serial_omap_restore_context(up);
-        } else if (up->context_loss_cnt != loss_cnt) {
-                serial_omap_restore_context(up);
-        }
-        up->latency = up->calc_latency;
-        schedule_work(&up->qos_work);
-
-        return 0;
-}
-#endif
-
-static const struct dev_pm_ops serial_omap_dev_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(serial_omap_suspend, serial_omap_resume)
-        SET_RUNTIME_PM_OPS(serial_omap_runtime_suspend,
-                                serial_omap_runtime_resume, NULL)
-};
-
-#if defined(CONFIG_OF)
-static const struct of_device_id omap_serial_of_match[] = {
-        { .compatible = "ti,omap2-uart" },
-        { .compatible = "ti,omap3-uart" },
-        { .compatible = "ti,omap4-uart" },
-        {},
-};
-MODULE_DEVICE_TABLE(of, omap_serial_of_match);
-#endif
-
 static struct platform_driver serial_omap_driver = {
         .probe          = serial_omap_probe,
         .remove         = serial_omap_remove,
+
+        .suspend        = serial_omap_suspend,
+        .resume         = serial_omap_resume,
         .driver         = {
                 .name   = DRIVER_NAME,
-                .pm     = &serial_omap_dev_pm_ops,
-                .of_match_table = of_match_ptr(omap_serial_of_match),
         },
 };
 
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 8318925fbf6..f913ed054c1 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1,5 +1,5 @@
 /*
- *Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
+ *Copyright (C) 2010 OKI SEMICONDUCTOR CO., 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
@@ -20,16 +20,10 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/serial_core.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/dmi.h>
-#include <linux/console.h>
-#include <linux/nmi.h>
-#include <linux/delay.h>
 
-#include <linux/debugfs.h>
 #include <linux/dmaengine.h>
 #include <linux/pch_dma.h>
 
@@ -39,7 +33,6 @@ enum {
         PCH_UART_HANDLED_RX_ERR_INT_SHIFT,
         PCH_UART_HANDLED_RX_TRG_INT_SHIFT,
         PCH_UART_HANDLED_MS_INT_SHIFT,
-        PCH_UART_HANDLED_LS_INT_SHIFT,
 };
 
 enum {
@@ -51,8 +44,8 @@ enum {
 
 /* Set the max number of UART port
  * Intel EG20T PCH: 4 port
- * LAPIS Semiconductor ML7213 IOH: 3 port
- * LAPIS Semiconductor ML7223 IOH: 2 port
+ * OKI SEMICONDUCTOR ML7213 IOH: 3 port
+ * OKI SEMICONDUCTOR ML7223 IOH: 2 port
 */
 #define PCH_UART_NR     4
 
@@ -64,8 +57,6 @@ enum {
                                         PCH_UART_HANDLED_RX_TRG_INT_SHIFT)<<1))
 #define PCH_UART_HANDLED_MS_INT (1<<((PCH_UART_HANDLED_MS_INT_SHIFT)<<1))
 
-#define PCH_UART_HANDLED_LS_INT (1<<((PCH_UART_HANDLED_LS_INT_SHIFT)<<1))
-
 #define PCH_UART_RBR            0x00
 #define PCH_UART_THR            0x00
 
@@ -148,8 +139,6 @@ enum {
 #define PCH_UART_DLL            0x00
 #define PCH_UART_DLM            0x01
 
-#define PCH_UART_BRCSR          0x0E
-
 #define PCH_UART_IID_RLS        (PCH_UART_IIR_REI)
 #define PCH_UART_IID_RDR        (PCH_UART_IIR_RRI)
 #define PCH_UART_IID_RDR_TO     (PCH_UART_IIR_RRI | PCH_UART_IIR_TOI)
@@ -207,14 +196,6 @@ enum {
 
 #define PCI_VENDOR_ID_ROHM              0x10DB
 
-#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-
-#define DEFAULT_UARTCLK   1843200 /*   1.8432 MHz */
-#define CMITC_UARTCLK   192000000 /* 192.0000 MHz */
-#define FRI2_64_UARTCLK  64000000 /*  64.0000 MHz */
-#define FRI2_48_UARTCLK  48000000 /*  48.0000 MHz */
-#define NTC1_UARTCLK     64000000 /*  64.0000 MHz */
-
 struct pch_uart_buffer {
         unsigned char *buf;
         int size;
@@ -228,10 +209,11 @@ struct eg20t_port {
         unsigned int iobase;
         struct pci_dev *pdev;
         int fifo_size;
-        int uartclk;
+        int base_baud;
         int start_tx;
         int start_rx;
         int tx_empty;
+        int int_dis_flag;
         int trigger;
         int trigger_level;
         struct pch_uart_buffer rxbuf;
@@ -239,6 +221,7 @@ struct eg20t_port {
         unsigned int fcr;
         unsigned int mcr;
         unsigned int use_dma;
+        unsigned int use_dma_flag;
         struct dma_async_tx_descriptor  *desc_tx;
         struct dma_async_tx_descriptor  *desc_rx;
         struct pch_dma_slave            param_tx;
@@ -251,11 +234,6 @@ struct eg20t_port {
         int                             tx_dma_use;
         void                            *rx_buf_virt;
         dma_addr_t                      rx_buf_dma;
-
-        struct dentry   *debugfs;
-
-        /* protect the eg20t_port private structure and io access to membase */
-        spinlock_t lock;
 };
 
 /**
@@ -296,106 +274,27 @@ static struct pch_uart_driver_data drv_dat[] = {
         [pch_ml7831_uart1] = {PCH_UART_2LINE, 1},
 };
 
-#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
-static struct eg20t_port *pch_uart_ports[PCH_UART_NR];
-#endif
 static unsigned int default_baud = 9600;
-static unsigned int user_uartclk = 0;
 static const int trigger_level_256[4] = { 1, 64, 128, 224 };
 static const int trigger_level_64[4] = { 1, 16, 32, 56 };
 static const int trigger_level_16[4] = { 1, 4, 8, 14 };
 static const int trigger_level_1[4] = { 1, 1, 1, 1 };
 
-#ifdef CONFIG_DEBUG_FS
-
-#define PCH_REGS_BUFSIZE        1024
-
-
-static ssize_t port_show_regs(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos)
+static void pch_uart_hal_request(struct pci_dev *pdev, int fifosize,
+                                 int base_baud)
 {
-        struct eg20t_port *priv = file->private_data;
-        char *buf;
-        u32 len = 0;
-        ssize_t ret;
-        unsigned char lcr;
-
-        buf = kzalloc(PCH_REGS_BUFSIZE, GFP_KERNEL);
-        if (!buf)
-                return 0;
-
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "PCH EG20T port[%d] regs:\n", priv->port.line);
-
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "=================================\n");
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "IER: \t0x%02x\n", ioread8(priv->membase + UART_IER));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "IIR: \t0x%02x\n", ioread8(priv->membase + UART_IIR));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "LCR: \t0x%02x\n", ioread8(priv->membase + UART_LCR));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "MCR: \t0x%02x\n", ioread8(priv->membase + UART_MCR));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "LSR: \t0x%02x\n", ioread8(priv->membase + UART_LSR));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "MSR: \t0x%02x\n", ioread8(priv->membase + UART_MSR));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "BRCSR: \t0x%02x\n",
-                        ioread8(priv->membase + PCH_UART_BRCSR));
-
-        lcr = ioread8(priv->membase + UART_LCR);
-        iowrite8(PCH_UART_LCR_DLAB, priv->membase + UART_LCR);
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "DLL: \t0x%02x\n", ioread8(priv->membase + UART_DLL));
-        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
-                        "DLM: \t0x%02x\n", ioread8(priv->membase + UART_DLM));
-        iowrite8(lcr, priv->membase + UART_LCR);
-
-        if (len > PCH_REGS_BUFSIZE)
-                len = PCH_REGS_BUFSIZE;
+        struct eg20t_port *priv = pci_get_drvdata(pdev);
 
-        ret =  simple_read_from_buffer(user_buf, count, ppos, buf, len);
-        kfree(buf);
-        return ret;
+        priv->trigger_level = 1;
+        priv->fcr = 0;
 }
 
-static const struct file_operations port_regs_ops = {
-        .owner          = THIS_MODULE,
-        .open           = simple_open,
-        .read           = port_show_regs,
-        .llseek         = default_llseek,
-};
-#endif  /* CONFIG_DEBUG_FS */
-
-/* Return UART clock, checking for board specific clocks. */
-static int pch_uart_get_uartclk(void)
+static unsigned int get_msr(struct eg20t_port *priv, void __iomem *base)
 {
-        const char *cmp;
+        unsigned int msr = ioread8(base + UART_MSR);
+        priv->dmsr |= msr & PCH_UART_MSR_DELTA;
 
-        if (user_uartclk)
-                return user_uartclk;
-
-        cmp = dmi_get_system_info(DMI_BOARD_NAME);
-        if (cmp && strstr(cmp, "CM-iTC"))
-                return CMITC_UARTCLK;
-
-        cmp = dmi_get_system_info(DMI_BIOS_VERSION);
-        if (cmp && strnstr(cmp, "FRI2", 4))
-                return FRI2_64_UARTCLK;
-
-        cmp = dmi_get_system_info(DMI_PRODUCT_NAME);
-        if (cmp && strstr(cmp, "Fish River Island II"))
-                return FRI2_48_UARTCLK;
-
-        /* Kontron COMe-mTT10 (nanoETXexpress-TT) */
-        cmp = dmi_get_system_info(DMI_BOARD_NAME);
-        if (cmp && (strstr(cmp, "COMe-mTT") ||
-                    strstr(cmp, "nanoETXexpress-TT")))
-                return NTC1_UARTCLK;
-
-        return DEFAULT_UARTCLK;
+        return msr;
 }
 
 static void pch_uart_hal_enable_interrupt(struct eg20t_port *priv,
@@ -421,7 +320,7 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
         unsigned int dll, dlm, lcr;
         int div;
 
-        div = DIV_ROUND_CLOSEST(priv->uartclk / 16, baud);
+        div = DIV_ROUND_CLOSEST(priv->base_baud / 16, baud);
         if (div < 0 || USHRT_MAX <= div) {
                 dev_err(priv->port.dev, "Invalid Baud(div=0x%x)\n", div);
                 return -EINVAL;
@@ -531,9 +430,8 @@ static int pch_uart_hal_set_fifo(struct eg20t_port *priv,
 
 static u8 pch_uart_hal_get_modem(struct eg20t_port *priv)
 {
-        unsigned int msr = ioread8(priv->membase + UART_MSR);
-        priv->dmsr = msr & PCH_UART_MSR_DELTA;
-        return (u8)msr;
+        priv->dmsr = 0;
+        return get_msr(priv, priv->membase);
 }
 
 static void pch_uart_hal_write(struct eg20t_port *priv,
@@ -564,10 +462,14 @@ static int pch_uart_hal_read(struct eg20t_port *priv, unsigned char *buf,
         return i;
 }
 
-static unsigned char pch_uart_hal_get_iid(struct eg20t_port *priv)
+static unsigned int pch_uart_hal_get_iid(struct eg20t_port *priv)
 {
-        return ioread8(priv->membase + UART_IIR) &\
-                      (PCH_UART_IIR_IID | PCH_UART_IIR_TOI | PCH_UART_IIR_IP);
+        unsigned int iir;
+        int ret;
+
+        iir = ioread8(priv->membase + UART_IIR);
+        ret = (iir & (PCH_UART_IIR_IID | PCH_UART_IIR_TOI | PCH_UART_IIR_IP));
+        return ret;
 }
 
 static u8 pch_uart_hal_get_line_status(struct eg20t_port *priv)
@@ -610,7 +512,7 @@ static int push_rx(struct eg20t_port *priv, const unsigned char *buf,
 
 static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
 {
-        int ret = 0;
+        int ret;
         struct uart_port *port = &priv->port;
 
         if (port->x_char) {
@@ -619,6 +521,8 @@ static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
                 buf[0] = port->x_char;
                 port->x_char = 0;
                 ret = 1;
+        } else {
+                ret = 0;
         }
 
         return ret;
@@ -666,13 +570,10 @@ static void pch_free_dma(struct uart_port *port)
                 dma_release_channel(priv->chan_rx);
                 priv->chan_rx = NULL;
         }
-
-        if (priv->rx_buf_dma) {
-                dma_free_coherent(port->dev, port->fifosize, priv->rx_buf_virt,
-                                  priv->rx_buf_dma);
-                priv->rx_buf_virt = NULL;
-                priv->rx_buf_dma = 0;
-        }
+        if (sg_dma_address(&priv->sg_rx))
+                dma_free_coherent(port->dev, port->fifosize,
+                                  sg_virt(&priv->sg_rx),
+                                  sg_dma_address(&priv->sg_rx));
 
         return;
 }
@@ -757,8 +658,7 @@ static void pch_dma_rx_complete(void *arg)
                 tty_flip_buffer_push(tty);
         tty_kref_put(tty);
         async_tx_ack(priv->desc_rx);
-        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT |
-                                            PCH_UART_HAL_RX_ERR_INT);
+        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT);
 }
 
 static void pch_dma_tx_complete(void *arg)
@@ -813,8 +713,7 @@ static int handle_rx_to(struct eg20t_port *priv)
         int rx_size;
         int ret;
         if (!priv->start_rx) {
-                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT |
-                                                     PCH_UART_HAL_RX_ERR_INT);
+                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT);
                 return 0;
         }
         buf = &priv->rxbuf;
@@ -852,8 +751,8 @@ static int dma_handle_rx(struct eg20t_port *priv)
 
         sg_dma_address(sg) = priv->rx_buf_dma;
 
-        desc = dmaengine_prep_slave_sg(priv->chan_rx,
-                        sg, 1, DMA_DEV_TO_MEM,
+        desc = priv->chan_rx->device->device_prep_slave_sg(priv->chan_rx,
+                        sg, 1, DMA_FROM_DEVICE,
                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
         if (!desc)
@@ -979,10 +878,6 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
         priv->tx_dma_use = 1;
 
         priv->sg_tx_p = kzalloc(sizeof(struct scatterlist)*num, GFP_ATOMIC);
-        if (!priv->sg_tx_p) {
-                dev_err(priv->port.dev, "%s:kzalloc Failed\n", __func__);
-                return 0;
-        }
 
         sg_init_table(priv->sg_tx_p, num); /* Initialize SG table */
         sg = priv->sg_tx_p;
@@ -1015,8 +910,8 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
                         sg_dma_len(sg) = size;
         }
 
-        desc = dmaengine_prep_slave_sg(priv->chan_tx,
-                                        priv->sg_tx_p, nent, DMA_MEM_TO_DEV,
+        desc = priv->chan_tx->device->device_prep_slave_sg(priv->chan_tx,
+                                        priv->sg_tx_p, nent, DMA_TO_DEVICE,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 dev_err(priv->port.dev, "%s:device_prep_slave_sg Failed\n",
@@ -1062,17 +957,12 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
         unsigned int handled;
         u8 lsr;
         int ret = 0;
-        unsigned char iid;
+        unsigned int iid;
         unsigned long flags;
-        int next = 1;
-        u8 msr;
 
-        spin_lock_irqsave(&priv->lock, flags);
+        spin_lock_irqsave(&priv->port.lock, flags);
         handled = 0;
-        while (next) {
-                iid = pch_uart_hal_get_iid(priv);
-                if (iid & PCH_UART_IIR_IP) /* No Interrupt */
-                        break;
+        while ((iid = pch_uart_hal_get_iid(priv)) > 1) {
                 switch (iid) {
                 case PCH_UART_IID_RLS:  /* Receiver Line Status */
                         lsr = pch_uart_hal_get_line_status(priv);
@@ -1080,20 +970,16 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
                                                 UART_LSR_PE | UART_LSR_OE)) {
                                 pch_uart_err_ir(priv, lsr);
                                 ret = PCH_UART_HANDLED_RX_ERR_INT;
-                        } else {
-                                ret = PCH_UART_HANDLED_LS_INT;
                         }
                         break;
                 case PCH_UART_IID_RDR:  /* Received Data Ready */
                         if (priv->use_dma) {
                                 pch_uart_hal_disable_interrupt(priv,
-                                                PCH_UART_HAL_RX_INT |
-                                                PCH_UART_HAL_RX_ERR_INT);
+                                                        PCH_UART_HAL_RX_INT);
                                 ret = dma_handle_rx(priv);
                                 if (!ret)
                                         pch_uart_hal_enable_interrupt(priv,
-                                                PCH_UART_HAL_RX_INT |
-                                                PCH_UART_HAL_RX_ERR_INT);
+                                                        PCH_UART_HAL_RX_INT);
                         } else {
                                 ret = handle_rx(priv);
                         }
@@ -1110,24 +996,22 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
                                 ret = handle_tx(priv);
                         break;
                 case PCH_UART_IID_MS:   /* Modem Status */
-                        msr = pch_uart_hal_get_modem(priv);
-                        next = 0; /* MS ir prioirty is the lowest. So, MS ir
-                                     means final interrupt */
-                        if ((msr & UART_MSR_ANY_DELTA) == 0)
-                                break;
-                        ret |= PCH_UART_HANDLED_MS_INT;
+                        ret = PCH_UART_HANDLED_MS_INT;
                         break;
                 default:        /* Never junp to this label */
-                        dev_err(priv->port.dev, "%s:iid=%02x (%lu)\n", __func__,
+                        dev_err(priv->port.dev, "%s:iid=%d (%lu)\n", __func__,
                                 iid, jiffies);
                         ret = -1;
-                        next = 0;
                         break;
                 }
                 handled |= (unsigned int)ret;
         }
+        if (handled == 0 && iid <= 1) {
+                if (priv->int_dis_flag)
+                        priv->int_dis_flag = 0;
+        }
 
-        spin_unlock_irqrestore(&priv->lock, flags);
+        spin_unlock_irqrestore(&priv->port.lock, flags);
         return IRQ_RETVAL(handled);
 }
 
@@ -1136,12 +1020,14 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
 static unsigned int pch_uart_tx_empty(struct uart_port *port)
 {
         struct eg20t_port *priv;
-
+        int ret;
         priv = container_of(port, struct eg20t_port, port);
         if (priv->tx_empty)
-                return TIOCSER_TEMT;
+                ret = TIOCSER_TEMT;
         else
-                return 0;
+                ret = 0;
+
+        return ret;
 }
 
 /* Returns the current state of modem control inputs. */
@@ -1219,8 +1105,8 @@ static void pch_uart_stop_rx(struct uart_port *port)
         struct eg20t_port *priv;
         priv = container_of(port, struct eg20t_port, port);
         priv->start_rx = 0;
-        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT |
-                                             PCH_UART_HAL_RX_ERR_INT);
+        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_RX_INT);
+        priv->int_dis_flag = 1;
 }
 
 /* Enable the modem status interrupts. */
@@ -1238,9 +1124,9 @@ static void pch_uart_break_ctl(struct uart_port *port, int ctl)
         unsigned long flags;
 
         priv = container_of(port, struct eg20t_port, port);
-        spin_lock_irqsave(&priv->lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
         pch_uart_hal_set_break(priv, ctl);
-        spin_unlock_irqrestore(&priv->lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 
 /* Grab any interrupt resources and initialise any low level driver state. */
@@ -1255,9 +1141,9 @@ static int pch_uart_startup(struct uart_port *port)
         priv->tx_empty = 1;
 
         if (port->uartclk)
-                priv->uartclk = port->uartclk;
+                priv->base_baud = port->uartclk;
         else
-                port->uartclk = priv->uartclk;
+                port->uartclk = priv->base_baud;
 
         pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_ALL_INT);
         ret = pch_uart_hal_set_line(priv, default_baud,
@@ -1275,7 +1161,6 @@ static int pch_uart_startup(struct uart_port *port)
                 break;
         case 16:
                 fifo_size = PCH_UART_HAL_FIFO16;
-                break;
         case 1:
         default:
                 fifo_size = PCH_UART_HAL_FIFO_DIS;
@@ -1313,8 +1198,7 @@ static int pch_uart_startup(struct uart_port *port)
                 pch_request_dma(port);
 
         priv->start_rx = 1;
-        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT |
-                                            PCH_UART_HAL_RX_ERR_INT);
+        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT);
         uart_update_timeout(port, CS8, default_baud);
 
         return 0;
@@ -1372,13 +1256,14 @@ static void pch_uart_set_termios(struct uart_port *port,
                 stb = PCH_UART_HAL_STB1;
 
         if (termios->c_cflag & PARENB) {
-                if (termios->c_cflag & PARODD)
+                if (!(termios->c_cflag & PARODD))
                         parity = PCH_UART_HAL_PARITY_ODD;
                 else
                         parity = PCH_UART_HAL_PARITY_EVEN;
 
-        } else
+        } else {
                 parity = PCH_UART_HAL_PARITY_NONE;
+        }
 
         /* Only UART0 has auto hardware flow function */
         if ((termios->c_cflag & CRTSCTS) && (priv->fifo_size == 256))
@@ -1390,8 +1275,7 @@ static void pch_uart_set_termios(struct uart_port *port,
 
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
 
-        spin_lock_irqsave(&priv->lock, flags);
-        spin_lock(&port->lock);
+        spin_lock_irqsave(&port->lock, flags);
 
         uart_update_timeout(port, termios->c_cflag, baud);
         rtn = pch_uart_hal_set_line(priv, baud, parity, bits, stb);
@@ -1404,8 +1288,7 @@ static void pch_uart_set_termios(struct uart_port *port,
                 tty_termios_encode_baud_rate(termios, baud, baud);
 
 out:
-        spin_unlock(&port->lock);
-        spin_unlock_irqrestore(&priv->lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static const char *pch_uart_type(struct uart_port *port)
@@ -1471,10 +1354,9 @@ static int pch_uart_verify_port(struct uart_port *port,
                         __func__);
                 return -EOPNOTSUPP;
 #endif
-                dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
-                if (!priv->use_dma)
-                        pch_request_dma(port);
                 priv->use_dma = 1;
+                priv->use_dma_flag = 1;
+                dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
         }
 
         return 0;
@@ -1501,148 +1383,6 @@ static struct uart_ops pch_uart_ops = {
         .verify_port = pch_uart_verify_port
 };
 
-#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
-
-/*
- *      Wait for transmitter & holding register to empty
- */
-static void wait_for_xmitr(struct eg20t_port *up, int bits)
-{
-        unsigned int status, tmout = 10000;
-
-        /* Wait up to 10ms for the character(s) to be sent. */
-        for (;;) {
-                status = ioread8(up->membase + UART_LSR);
-
-                if ((status & bits) == bits)
-                        break;
-                if (--tmout == 0)
-                        break;
-                udelay(1);
-        }
-
-        /* Wait up to 1s for flow control if necessary */
-        if (up->port.flags & UPF_CONS_FLOW) {
-                unsigned int tmout;
-                for (tmout = 1000000; tmout; tmout--) {
-                        unsigned int msr = ioread8(up->membase + UART_MSR);
-                        if (msr & UART_MSR_CTS)
-                                break;
-                        udelay(1);
-                        touch_nmi_watchdog();
-                }
-        }
-}
-
-static void pch_console_putchar(struct uart_port *port, int ch)
-{
-        struct eg20t_port *priv =
-                container_of(port, struct eg20t_port, port);
-
-        wait_for_xmitr(priv, UART_LSR_THRE);
-        iowrite8(ch, priv->membase + PCH_UART_THR);
-}
-
-/*
- *      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
-pch_console_write(struct console *co, const char *s, unsigned int count)
-{
-        struct eg20t_port *priv;
-        unsigned long flags;
-        int priv_locked = 1;
-        int port_locked = 1;
-        u8 ier;
-
-        priv = pch_uart_ports[co->index];
-
-        touch_nmi_watchdog();
-
-        local_irq_save(flags);
-        if (priv->port.sysrq) {
-                spin_lock(&priv->lock);
-                /* serial8250_handle_port() already took the port lock */
-                port_locked = 0;
-        } else if (oops_in_progress) {
-                priv_locked = spin_trylock(&priv->lock);
-                port_locked = spin_trylock(&priv->port.lock);
-        } else {
-                spin_lock(&priv->lock);
-                spin_lock(&priv->port.lock);
-        }
-
-        /*
-         *      First save the IER then disable the interrupts
-         */
-        ier = ioread8(priv->membase + UART_IER);
-
-        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_ALL_INT);
-
-        uart_console_write(&priv->port, s, count, pch_console_putchar);
-
-        /*
-         *      Finally, wait for transmitter to become empty
-         *      and restore the IER
-         */
-        wait_for_xmitr(priv, BOTH_EMPTY);
-        iowrite8(ier, priv->membase + UART_IER);
-
-        if (port_locked)
-                spin_unlock(&priv->port.lock);
-        if (priv_locked)
-                spin_unlock(&priv->lock);
-        local_irq_restore(flags);
-}
-
-static int __init pch_console_setup(struct console *co, char *options)
-{
-        struct uart_port *port;
-        int baud = default_baud;
-        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 >= PCH_UART_NR)
-                co->index = 0;
-        port = &pch_uart_ports[co->index]->port;
-
-        if (!port || (!port->iobase && !port->membase))
-                return -ENODEV;
-
-        port->uartclk = pch_uart_get_uartclk();
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-static struct uart_driver pch_uart_driver;
-
-static struct console pch_console = {
-        .name           = PCH_UART_DRIVER_DEVICE,
-        .write          = pch_console_write,
-        .device         = uart_console_device,
-        .setup          = pch_console_setup,
-        .flags          = CON_PRINTBUFFER | CON_ANYTIME,
-        .index          = -1,
-        .data           = &pch_uart_driver,
-};
-
-#define PCH_CONSOLE     (&pch_console)
-#else
-#define PCH_CONSOLE     NULL
-#endif
-
 static struct uart_driver pch_uart_driver = {
         .owner = THIS_MODULE,
         .driver_name = KBUILD_MODNAME,
@@ -1650,7 +1390,6 @@ static struct uart_driver pch_uart_driver = {
         .major = 0,
         .minor = 0,
         .nr = PCH_UART_NR,
-        .cons = PCH_CONSOLE,
 };
 
 static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
@@ -1661,10 +1400,10 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         unsigned int iobase;
         unsigned int mapbase;
         unsigned char *rxbuf;
-        int fifosize;
+        int fifosize, base_baud;
         int port_type;
         struct pch_uart_driver_data *board;
-        char name[32];  /* for debugfs file name */
+        const char *board_name;
 
         board = &drv_dat[id->driver_data];
         port_type = board->port_type;
@@ -1677,6 +1416,13 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         if (!rxbuf)
                 goto init_port_free_txbuf;
 
+        base_baud = 1843200; /* 1.8432MHz */
+
+        /* quirk for CM-iTC board */
+        board_name = dmi_get_system_info(DMI_BOARD_NAME);
+        if (board_name && strstr(board_name, "CM-iTC"))
+                base_baud = 192000000; /* 192.0MHz */
+
         switch (port_type) {
         case PORT_UNKNOWN:
                 fifosize = 256; /* EG20T/ML7213: UART0 */
@@ -1690,9 +1436,6 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         }
 
         pci_enable_msi(pdev);
-        pci_set_master(pdev);
-
-        spin_lock_init(&priv->lock);
 
         iobase = pci_resource_start(pdev, 0);
         mapbase = pci_resource_start(pdev, 1);
@@ -1704,7 +1447,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         priv->rxbuf.size = PAGE_SIZE;
 
         priv->fifo_size = fifosize;
-        priv->uartclk = pch_uart_get_uartclk();
+        priv->base_baud = base_baud;
         priv->port_type = PORT_MAX_8250 + port_type + 1;
         priv->port.dev = &pdev->dev;
         priv->port.iobase = iobase;
@@ -1721,28 +1464,15 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         spin_lock_init(&priv->port.lock);
 
         pci_set_drvdata(pdev, priv);
-        priv->trigger_level = 1;
-        priv->fcr = 0;
+        pch_uart_hal_request(pdev, fifosize, base_baud);
 
-#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
-        pch_uart_ports[board->line_no] = priv;
-#endif
         ret = uart_add_one_port(&pch_uart_driver, &priv->port);
         if (ret < 0)
                 goto init_port_hal_free;
 
-#ifdef CONFIG_DEBUG_FS
-        snprintf(name, sizeof(name), "uart%d_regs", board->line_no);
-        priv->debugfs = debugfs_create_file(name, S_IFREG | S_IRUGO,
-                                NULL, priv, &port_regs_ops);
-#endif
-
         return priv;
 
 init_port_hal_free:
-#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
-        pch_uart_ports[board->line_no] = NULL;
-#endif
         free_page((unsigned long)rxbuf);
 init_port_free_txbuf:
         kfree(priv);
@@ -1753,11 +1483,6 @@ init_port_alloc_err:
 
 static void pch_uart_exit_port(struct eg20t_port *priv)
 {
-
-#ifdef CONFIG_DEBUG_FS
-        if (priv->debugfs)
-                debugfs_remove(priv->debugfs);
-#endif
         uart_remove_one_port(&pch_uart_driver, &priv->port);
         pci_set_drvdata(priv->pdev, NULL);
         free_page((unsigned long)priv->rxbuf.buf);
@@ -1765,13 +1490,11 @@ static void pch_uart_exit_port(struct eg20t_port *priv)
 
 static void pch_uart_pci_remove(struct pci_dev *pdev)
 {
-        struct eg20t_port *priv = pci_get_drvdata(pdev);
+        struct eg20t_port *priv;
 
-        pci_disable_msi(pdev);
+        priv = (struct eg20t_port *)pci_get_drvdata(pdev);
 
-#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
-        pch_uart_ports[priv->port.line] = NULL;
-#endif
+        pci_disable_msi(pdev);
         pch_uart_exit_port(priv);
         pci_disable_device(pdev);
         kfree(priv);
@@ -1839,7 +1562,7 @@ static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = {
         {0,},
 };
 
-static int pch_uart_pci_probe(struct pci_dev *pdev,
+static int __devinit pch_uart_pci_probe(struct pci_dev *pdev,
                                         const struct pci_device_id *id)
 {
         int ret;
@@ -1869,7 +1592,7 @@ static struct pci_driver pch_uart_pci_driver = {
         .name = "pch_uart",
         .id_table = pch_uart_pci_id,
         .probe = pch_uart_pci_probe,
-        .remove = pch_uart_pci_remove,
+        .remove = __devexit_p(pch_uart_pci_remove),
         .suspend = pch_uart_pci_suspend,
         .resume = pch_uart_pci_resume,
 };
@@ -1902,8 +1625,3 @@ module_exit(pch_uart_module_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Intel EG20T PCH UART PCI Driver");
 module_param(default_baud, uint, S_IRUGO);
-MODULE_PARM_DESC(default_baud,
-                 "Default BAUD for initial driver state and console (default 9600)");
-module_param(user_uartclk, uint, S_IRUGO);
-MODULE_PARM_DESC(user_uartclk,
-                 "Override UART default or board specific UART clock");
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 333c8d012b0..5acd24a27d0 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -99,9 +99,6 @@ MODULE_LICENSE("GPL");
 #define PMACZILOG_NAME          "ttyPZ"
 #endif
 
-#define pmz_debug(fmt, arg...)  pr_debug("ttyPZ%d: " fmt, uap->port.line, ## arg)
-#define pmz_error(fmt, arg...)  pr_err("ttyPZ%d: " fmt, uap->port.line, ## arg)
-#define pmz_info(fmt, arg...)   pr_info("ttyPZ%d: " fmt, uap->port.line, ## arg)
 
 /*
  * For the sake of early serial console, we can do a pre-probe
@@ -109,6 +106,7 @@ MODULE_LICENSE("GPL");
  */
 static struct uart_pmac_port    pmz_ports[MAX_ZS_PORTS];
 static int                      pmz_ports_count;
+static DEFINE_MUTEX(pmz_irq_mutex);
 
 static struct uart_driver pmz_uart_reg = {
         .owner          =       THIS_MODULE,
@@ -128,6 +126,9 @@ 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);
@@ -215,24 +216,32 @@ static void pmz_maybe_update_regs(struct uart_pmac_port *uap)
         }
 }
 
-static void pmz_interrupt_control(struct uart_pmac_port *uap, int enable)
-{
-        if (enable) {
-                uap->curregs[1] |= INT_ALL_Rx | TxINT_ENAB;
-                if (!ZS_IS_EXTCLK(uap))
-                        uap->curregs[1] |= EXT_INT_ENAB;
-        } else {
-                uap->curregs[1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
-        }
-        write_zsreg(uap, R1, uap->curregs[1]);
-}
-
 static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 {
         struct tty_struct *tty = NULL;
         unsigned char ch, r1, drop, error, flag;
         int loops = 0;
 
+        /* 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.state == NULL || uap->port.state->port.tty == NULL) {
                 WARN_ON(1);
@@ -330,7 +339,9 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 
         return tty;
  flood:
-        pmz_interrupt_control(uap, 0);
+        uap->curregs[R1] &= ~(EXT_INT_ENAB | TxINT_ENAB | RxINT_MASK);
+        write_zsreg(uap, R1, uap->curregs[R1]);
+        zssync(uap);
         pmz_error("pmz: rx irq flood !\n");
         return tty;
 }
@@ -372,6 +383,8 @@ 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);
 
@@ -468,10 +481,6 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
         /* Channel A */
         tty = NULL;
         if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
-                if (!ZS_IS_OPEN(uap_a)) {
-                        pmz_debug("ChanA interrupt while not open !\n");
-                        goto skip_a;
-                }
                 write_zsreg(uap_a, R0, RES_H_IUS);
                 zssync(uap_a);          
                 if (r3 & CHAEXT)
@@ -482,21 +491,16 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
                         pmz_transmit_chars(uap_a);
                 rc = IRQ_HANDLED;
         }
- skip_a:
         spin_unlock(&uap_a->port.lock);
         if (tty != NULL)
                 tty_flip_buffer_push(tty);
 
-        if (!uap_b)
+        if (uap_b->node == NULL)
                 goto out;
 
         spin_lock(&uap_b->port.lock);
         tty = NULL;
         if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) {
-                if (!ZS_IS_OPEN(uap_b)) {
-                        pmz_debug("ChanB interrupt while not open !\n");
-                        goto skip_b;
-                }
                 write_zsreg(uap_b, R0, RES_H_IUS);
                 zssync(uap_b);
                 if (r3 & CHBEXT)
@@ -507,12 +511,14 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
                         pmz_transmit_chars(uap_b);
                 rc = IRQ_HANDLED;
         }
- skip_b:
         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;
 }
 
@@ -537,8 +543,12 @@ static inline u8 pmz_peek_status(struct uart_pmac_port *uap)
  */
 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;
@@ -560,7 +570,8 @@ static void pmz_set_mctrl(struct uart_port *port, unsigned int mctrl)
         if (ZS_IS_IRDA(uap))
                 return;
         /* We get called during boot with a port not up yet */
-        if (!(ZS_IS_OPEN(uap) || ZS_IS_CONS(uap)))
+        if (ZS_IS_ASLEEP(uap) ||
+            !(ZS_IS_OPEN(uap) || ZS_IS_CONS(uap)))
                 return;
 
         set_bits = clear_bits = 0;
@@ -579,7 +590,8 @@ static void pmz_set_mctrl(struct uart_port *port, unsigned int mctrl)
         /* 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]);
@@ -597,6 +609,9 @@ static unsigned int pmz_get_mctrl(struct uart_port *port)
         unsigned char status;
         unsigned int ret;
 
+        if (ZS_IS_ASLEEP(uap) || uap->node == NULL)
+                return 0;
+
         status = read_zsreg(uap, R0);
 
         ret = 0;
@@ -634,6 +649,9 @@ static void pmz_start_tx(struct uart_port *port)
         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.  */
@@ -672,6 +690,9 @@ 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.  */
@@ -690,12 +711,14 @@ 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))
+        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]);
         }
@@ -711,6 +734,8 @@ static void pmz_break_ctl(struct uart_port *port, int break_state)
         unsigned char set_bits, clear_bits, new_reg;
         unsigned long flags;
 
+        if (uap->node == NULL)
+                return;
         set_bits = clear_bits = 0;
 
         if (break_state)
@@ -723,6 +748,12 @@ static void pmz_break_ctl(struct uart_port *port, int break_state)
         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)) {
+                        spin_unlock_irqrestore(&port->lock, flags);
+                        return;
+                }
                 write_zsreg(uap, R5, uap->curregs[R5]);
         }
 
@@ -896,21 +927,14 @@ static int __pmz_startup(struct uart_pmac_port *uap)
 
 static void pmz_irda_reset(struct uart_pmac_port *uap)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&uap->port.lock, flags);
         uap->curregs[R5] |= DTR;
         write_zsreg(uap, R5, uap->curregs[R5]);
         zssync(uap);
-        spin_unlock_irqrestore(&uap->port.lock, flags);
-        msleep(110);
-
-        spin_lock_irqsave(&uap->port.lock, flags);
+        mdelay(110);
         uap->curregs[R5] &= ~DTR;
         write_zsreg(uap, R5, uap->curregs[R5]);
         zssync(uap);
-        spin_unlock_irqrestore(&uap->port.lock, flags);
-        msleep(10);
+        mdelay(10);
 }
 
 /*
@@ -925,6 +949,13 @@ static int pmz_startup(struct uart_port *port)
 
         pmz_debug("pmz: startup()\n");
 
+        if (ZS_IS_ASLEEP(uap))
+                return -EAGAIN;
+        if (uap->node == NULL)
+                return -ENODEV;
+
+        mutex_lock(&pmz_irq_mutex);
+
         uap->flags |= PMACZILOG_FLAG_IS_OPEN;
 
         /* A console is never powered down. Else, power up and
@@ -935,14 +966,18 @@ static int pmz_startup(struct uart_port *port)
                 pwr_delay = __pmz_startup(uap);
                 spin_unlock_irqrestore(&port->lock, flags);
         }       
-        sprintf(uap->irq_name, PMACZILOG_NAME"%d", uap->port.line);
+
+        pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON;
         if (request_irq(uap->port.irq, pmz_interrupt, IRQF_SHARED,
-                        uap->irq_name, uap)) {
+                        "SCC", uap)) {
                 pmz_error("Unable to register zs interrupt handler.\n");
                 pmz_set_scc_power(uap, 0);
+                mutex_unlock(&pmz_irq_mutex);
                 return -ENXIO;
         }
 
+        mutex_unlock(&pmz_irq_mutex);
+
         /* Right now, we deal with delay by blocking here, I'll be
          * smarter later on
          */
@@ -955,9 +990,12 @@ static int pmz_startup(struct uart_port *port)
         if (ZS_IS_IRDA(uap))
                 pmz_irda_reset(uap);
 
-        /* Enable interrupt requests for the channel */
+        /* Enable interrupts emission from the chip */
         spin_lock_irqsave(&port->lock, flags);
-        pmz_interrupt_control(uap, 1);
+        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");
@@ -972,22 +1010,10 @@ static void pmz_shutdown(struct uart_port *port)
 
         pmz_debug("pmz: shutdown()\n");
 
-        spin_lock_irqsave(&port->lock, flags);
-
-        /* Disable interrupt requests for the channel */
-        pmz_interrupt_control(uap, 0);
-
-        if (!ZS_IS_CONS(uap)) {
-                /* Disable receiver and transmitter */
-                uap->curregs[R3] &= ~RxENABLE;
-                uap->curregs[R5] &= ~TxENABLE;
-
-                /* Disable break assertion */
-                uap->curregs[R5] &= ~SND_BRK;
-                pmz_maybe_update_regs(uap);
-        }
+        if (uap->node == NULL)
+                return;
 
-        spin_unlock_irqrestore(&port->lock, flags);
+        mutex_lock(&pmz_irq_mutex);
 
         /* Release interrupt handler */
         free_irq(uap->port.irq, uap);
@@ -996,11 +1022,37 @@ static void pmz_shutdown(struct uart_port *port)
 
         uap->flags &= ~PMACZILOG_FLAG_IS_OPEN;
 
-        if (!ZS_IS_CONS(uap))
-                pmz_set_scc_power(uap, 0);      /* Shut the chip down */
+        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);
+                mutex_unlock(&pmz_irq_mutex);
+                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);
 
+        mutex_unlock(&pmz_irq_mutex);
+
         pmz_debug("pmz: shutdown() done.\n");
 }
 
@@ -1248,6 +1300,9 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios,
 
         pmz_debug("pmz: set_termios()\n");
 
+        if (ZS_IS_ASLEEP(uap))
+                return;
+
         memcpy(&uap->termios_cache, termios, sizeof(struct ktermios));
 
         /* XXX Check which revs of machines actually allow 1 and 4Mb speeds
@@ -1297,15 +1352,19 @@ static void pmz_set_termios(struct uart_port *port, struct ktermios *termios,
         spin_lock_irqsave(&port->lock, flags);  
 
         /* Disable IRQs on the port */
-        pmz_interrupt_control(uap, 0);
+        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))
-                pmz_interrupt_control(uap, 1);
-
+        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);
 }
 
@@ -1348,16 +1407,10 @@ static int pmz_verify_port(struct uart_port *port, struct serial_struct *ser)
 static int pmz_poll_get_char(struct uart_port *port)
 {
         struct uart_pmac_port *uap = (struct uart_pmac_port *)port;
-        int tries = 2;
 
-        while (tries) {
-                if ((read_zsreg(uap, R0) & Rx_CH_AV) != 0)
-                        return read_zsdata(uap);
-                if (tries--)
-                        udelay(5);
-        }
-
-        return NO_POLL_CHAR;
+        while ((read_zsreg(uap, R0) & Rx_CH_AV) == 0)
+                udelay(5);
+        return read_zsdata(uap);
 }
 
 static void pmz_poll_put_char(struct uart_port *port, unsigned char c)
@@ -1512,7 +1565,7 @@ no_dma:
          * fixed up interrupt info, but we use the device-tree directly
          * here due to early probing so we need the fixup too.
          */
-        if (uap->port.irq == 0 &&
+        if (uap->port.irq == NO_IRQ &&
             np->parent && np->parent->parent &&
             of_device_is_compatible(np->parent->parent, "gatwick")) {
                 /* IRQs on gatwick are offset by 64 */
@@ -1551,34 +1604,25 @@ static void pmz_dispose_port(struct uart_pmac_port *uap)
  */
 static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match)
 {
-        struct uart_pmac_port *uap;
         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.dev.of_node)
-                        break;
-        if (i >= MAX_ZS_PORTS)
-                return -ENODEV;
-
-
-        uap = &pmz_ports[i];
-        uap->dev = mdev;
-        uap->port.dev = &mdev->ofdev.dev;
-        dev_set_drvdata(&mdev->ofdev.dev, uap);
-
-        /* We still activate the port even when failing to request resources
-         * to work around bugs in ancient Apple device-trees
-         */
-        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 uart_add_one_port(&pmz_uart_reg, &uap->port);
+                if (pmz_ports[i].node == mdev->ofdev.dev.of_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;
 }
 
 /*
@@ -1592,15 +1636,12 @@ static int pmz_detach(struct macio_dev *mdev)
         if (!uap)
                 return -ENODEV;
 
-        uart_remove_one_port(&pmz_uart_reg, &uap->port);
-
         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;
-        uap->port.dev = NULL;
         
         return 0;
 }
@@ -1609,13 +1650,59 @@ static int pmz_detach(struct macio_dev *mdev)
 static int pmz_suspend(struct macio_dev *mdev, pm_message_t 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;
         }
 
-        uart_suspend_port(&pmz_uart_reg, &uap->port);
+        if (pm_state.event == mdev->ofdev.dev.power.power_state.event)
+                return 0;
+
+        pmz_debug("suspend, switching to state %d\n", pm_state.event);
+
+        state = pmz_uart_reg.state + uap->port.line;
+
+        mutex_lock(&pmz_irq_mutex);
+        mutex_lock(&state->port.mutex);
+
+        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);
+
+        mutex_unlock(&state->port.mutex);
+        mutex_unlock(&pmz_irq_mutex);
+
+        pmz_debug("suspend, switching complete\n");
+
+        mdev->ofdev.dev.power.power_state = pm_state;
 
         return 0;
 }
@@ -1624,20 +1711,76 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
 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;
 
-        uart_resume_port(&pmz_uart_reg, &uap->port);
+        if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON)
+                return 0;
+        
+        pmz_debug("resume, switching to state 0\n");
+
+        state = pmz_uart_reg.state + uap->port.line;
+
+        mutex_lock(&pmz_irq_mutex);
+        mutex_lock(&state->port.mutex);
+
+        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:
+        mutex_unlock(&state->port.mutex);
+        mutex_unlock(&pmz_irq_mutex);
+
+        /* 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.event = PM_EVENT_ON;
 
         return 0;
 }
 
 /*
  * Probe all ports in the system and build the ports array, we register
- * with the serial layer later, so we get a proper struct device which
- * allows the tty to attach properly. This is later than it used to be
- * but the tty layer really wants it that way.
+ * 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)
 {
@@ -1673,10 +1816,8 @@ static int __init pmz_probe(void)
                 /*
                  * Fill basic fields in the port structures
                  */
-                if (node_b != NULL) {
-                        pmz_ports[count].mate           = &pmz_ports[count+1];
-                        pmz_ports[count+1].mate         = &pmz_ports[count];
-                }
+                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;
@@ -1714,8 +1855,8 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
         struct resource *r_ports;
         int irq;
 
-        r_ports = platform_get_resource(uap->pdev, IORESOURCE_MEM, 0);
-        irq = platform_get_irq(uap->pdev, 0);
+        r_ports = platform_get_resource(uap->node, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(uap->node, 0);
         if (!r_ports || !irq)
                 return -ENODEV;
 
@@ -1744,19 +1885,19 @@ static int __init pmz_probe(void)
 
         pmz_ports_count = 0;
 
+        pmz_ports[0].mate      = &pmz_ports[1];
         pmz_ports[0].port.line = 0;
         pmz_ports[0].flags     = PMACZILOG_FLAG_IS_CHANNEL_A;
-        pmz_ports[0].pdev      = &scc_a_pdev;
+        pmz_ports[0].node      = &scc_a_pdev;
         err = pmz_init_port(&pmz_ports[0]);
         if (err)
                 return err;
         pmz_ports_count++;
 
-        pmz_ports[0].mate      = &pmz_ports[1];
         pmz_ports[1].mate      = &pmz_ports[0];
         pmz_ports[1].port.line = 1;
         pmz_ports[1].flags     = 0;
-        pmz_ports[1].pdev      = &scc_b_pdev;
+        pmz_ports[1].node      = &scc_b_pdev;
         err = pmz_init_port(&pmz_ports[1]);
         if (err)
                 return err;
@@ -1772,35 +1913,16 @@ static void pmz_dispose_port(struct uart_pmac_port *uap)
 
 static int __init pmz_attach(struct platform_device *pdev)
 {
-        struct uart_pmac_port *uap;
         int i;
 
-        /* Iterate the pmz_ports array to find a matching entry */
         for (i = 0; i < pmz_ports_count; i++)
-                if (pmz_ports[i].pdev == pdev)
-                        break;
-        if (i >= pmz_ports_count)
-                return -ENODEV;
-
-        uap = &pmz_ports[i];
-        uap->port.dev = &pdev->dev;
-        platform_set_drvdata(pdev, uap);
-
-        return uart_add_one_port(&pmz_uart_reg, &uap->port);
+                if (pmz_ports[i].node == pdev)
+                        return 0;
+        return -ENODEV;
 }
 
 static int __exit pmz_detach(struct platform_device *pdev)
 {
-        struct uart_pmac_port *uap = platform_get_drvdata(pdev);
-
-        if (!uap)
-                return -ENODEV;
-
-        uart_remove_one_port(&pmz_uart_reg, &uap->port);
-
-        platform_set_drvdata(pdev, NULL);
-        uap->port.dev = NULL;
-
         return 0;
 }
 
@@ -1832,13 +1954,38 @@ static struct console pmz_console = {
  */
 static int __init pmz_register(void)
 {
+        int i, rc;
+        
         pmz_uart_reg.nr = pmz_ports_count;
         pmz_uart_reg.cons = PMACZILOG_CONSOLE;
 
         /*
          * Register this driver with the serial core
          */
-        return uart_register_driver(&pmz_uart_reg);
+        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;
 }
 
 #ifdef CONFIG_PPC_PMAC
@@ -1937,13 +2084,10 @@ static void __exit exit_pmz(void)
 
         for (i = 0; i < pmz_ports_count; i++) {
                 struct uart_pmac_port *uport = &pmz_ports[i];
-#ifdef CONFIG_PPC_PMAC
-                if (uport->node != NULL)
-                        pmz_dispose_port(uport);
-#else
-                if (uport->pdev != NULL)
+                if (uport->node != NULL) {
+                        uart_remove_one_port(&pmz_uart_reg, &uport->port);
                         pmz_dispose_port(uport);
-#endif
+                }
         }
         /* Unregister UART driver */
         uart_unregister_driver(&pmz_uart_reg);
@@ -1970,6 +2114,8 @@ static void pmz_console_write(struct console *con, const char *s, unsigned int c
         struct uart_pmac_port *uap = &pmz_ports[con->index];
         unsigned long flags;
 
+        if (ZS_IS_ASLEEP(uap))
+                return;
         spin_lock_irqsave(&uap->port.lock, flags);
 
         /* Turn of interrupts and enable the transmitter. */
@@ -2014,13 +2160,8 @@ static int __init pmz_console_setup(struct console *co, char *options)
         if (co->index >= pmz_ports_count)
                 co->index = 0;
         uap = &pmz_ports[co->index];
-#ifdef CONFIG_PPC_PMAC
         if (uap->node == NULL)
                 return -ENODEV;
-#else
-        if (uap->pdev == NULL)
-                return -ENODEV;
-#endif
         port = &uap->port;
 
         /*
diff --git a/drivers/tty/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h
index 3483242ee3e..cbc34fbb1b2 100644
--- a/drivers/tty/serial/pmac_zilog.h
+++ b/drivers/tty/serial/pmac_zilog.h
@@ -1,6 +1,16 @@
 #ifndef __PMAC_ZILOG_H__
 #define __PMAC_ZILOG_H__
 
+#ifdef CONFIG_PPC_PMAC
+#define pmz_debug(fmt, arg...)  dev_dbg(&uap->dev->ofdev.dev, fmt, ## arg)
+#define pmz_error(fmt, arg...)  dev_err(&uap->dev->ofdev.dev, fmt, ## arg)
+#define pmz_info(fmt, arg...)   dev_info(&uap->dev->ofdev.dev, fmt, ## arg)
+#else
+#define pmz_debug(fmt, arg...)  dev_dbg(&uap->node->dev, fmt, ## arg)
+#define pmz_error(fmt, arg...)  dev_err(&uap->node->dev, fmt, ## arg)
+#define pmz_info(fmt, arg...)   dev_info(&uap->node->dev, fmt, ## arg)
+#endif
+
 /*
  * At most 2 ESCCs with 2 ports each
  */
@@ -25,7 +35,7 @@ struct uart_pmac_port {
          */
         struct device_node              *node;
 #else
-        struct platform_device          *pdev;
+        struct platform_device          *node;
 #endif
 
         /* Port type as obtained from device tree (IRDA, modem, ...) */
@@ -40,11 +50,14 @@ struct uart_pmac_port {
 #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
 
@@ -61,8 +74,6 @@ struct uart_pmac_port {
         volatile struct dbdma_regs      __iomem *rx_dma_regs;
 #endif
 
-        unsigned char                   irq_name[8];
-
         struct ktermios                 termios_cache;
 };
 
@@ -377,7 +388,9 @@ static inline void zssync(struct uart_pmac_port *port)
 #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/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 2764828251f..5c8e3bba6c8 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -36,7 +36,6 @@
 #include <linux/circ_buf.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -45,8 +44,6 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#define PXA_NAME_LEN            8
-
 struct uart_pxa_port {
         struct uart_port        port;
         unsigned char           ier;
@@ -54,7 +51,7 @@ struct uart_pxa_port {
         unsigned char           mcr;
         unsigned int            lsr_break_flag;
         struct clk              *clk;
-        char                    name[PXA_NAME_LEN];
+        char                    *name;
 };
 
 static inline unsigned int serial_in(struct uart_pxa_port *up, int offset)
@@ -582,9 +579,9 @@ serial_pxa_pm(struct uart_port *port, unsigned int state,
         struct uart_pxa_port *up = (struct uart_pxa_port *)port;
 
         if (!state)
-                clk_prepare_enable(up->clk);
+                clk_enable(up->clk);
         else
-                clk_disable_unprepare(up->clk);
+                clk_disable(up->clk);
 }
 
 static void serial_pxa_release_port(struct uart_port *port)
@@ -670,18 +667,8 @@ 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;
-        unsigned long flags;
-        int locked = 1;
 
-        clk_prepare_enable(up->clk);
-
-        local_irq_save(flags);
-        if (up->port.sysrq)
-                locked = 0;
-        else if (oops_in_progress)
-                locked = spin_trylock(&up->port.lock);
-        else
-                spin_lock(&up->port.lock);
+        clk_enable(up->clk);
 
         /*
          *      First save the IER then disable the interrupts
@@ -698,64 +685,9 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
         wait_for_xmitr(up);
         serial_out(up, UART_IER, ier);
 
-        if (locked)
-                spin_unlock(&up->port.lock);
-        local_irq_restore(flags);
-
-        clk_disable_unprepare(up->clk);
-}
-
-#ifdef CONFIG_CONSOLE_POLL
-/*
- * Console polling routines for writing and reading from the uart while
- * in an interrupt or debug context.
- */
-
-static int serial_pxa_get_poll_char(struct uart_port *port)
-{
-        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
-        unsigned char lsr = serial_in(up, UART_LSR);
-
-        while (!(lsr & UART_LSR_DR))
-                lsr = serial_in(up, UART_LSR);
-
-        return serial_in(up, UART_RX);
+        clk_disable(up->clk);
 }
 
-
-static void serial_pxa_put_poll_char(struct uart_port *port,
-                         unsigned char c)
-{
-        unsigned int ier;
-        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
-
-        /*
-         *      First save the IER then disable the interrupts
-         */
-        ier = serial_in(up, UART_IER);
-        serial_out(up, UART_IER, UART_IER_UUE);
-
-        wait_for_xmitr(up);
-        /*
-         *      Send the character out.
-         *      If a LF, also do CR...
-         */
-        serial_out(up, UART_TX, c);
-        if (c == 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);
-}
-
-#endif /* CONFIG_CONSOLE_POLL */
-
 static int __init
 serial_pxa_console_setup(struct console *co, char *options)
 {
@@ -810,10 +742,6 @@ struct uart_ops serial_pxa_pops = {
         .request_port   = serial_pxa_request_port,
         .config_port    = serial_pxa_config_port,
         .verify_port    = serial_pxa_verify_port,
-#ifdef CONFIG_CONSOLE_POLL
-        .poll_get_char = serial_pxa_get_poll_char,
-        .poll_put_char = serial_pxa_put_poll_char,
-#endif
 };
 
 static struct uart_driver serial_pxa_reg = {
@@ -853,31 +781,6 @@ static const struct dev_pm_ops serial_pxa_pm_ops = {
 };
 #endif
 
-static struct of_device_id serial_pxa_dt_ids[] = {
-        { .compatible = "mrvl,pxa-uart", },
-        { .compatible = "mrvl,mmp-uart", },
-        {}
-};
-MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids);
-
-static int serial_pxa_probe_dt(struct platform_device *pdev,
-                               struct uart_pxa_port *sport)
-{
-        struct device_node *np = pdev->dev.of_node;
-        int ret;
-
-        if (!np)
-                return 1;
-
-        ret = of_alias_get_id(np, "serial");
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
-                return ret;
-        }
-        sport->port.line = ret;
-        return 0;
-}
-
 static int serial_pxa_probe(struct platform_device *dev)
 {
         struct uart_pxa_port *sport;
@@ -905,16 +808,20 @@ static int serial_pxa_probe(struct platform_device *dev)
         sport->port.irq = irqres->start;
         sport->port.fifosize = 64;
         sport->port.ops = &serial_pxa_pops;
+        sport->port.line = dev->id;
         sport->port.dev = &dev->dev;
         sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
         sport->port.uartclk = clk_get_rate(sport->clk);
 
-        ret = serial_pxa_probe_dt(dev, sport);
-        if (ret > 0)
-                sport->port.line = dev->id;
-        else if (ret < 0)
-                goto err_clk;
-        snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1);
+        switch (dev->id) {
+        case 0: sport->name = "FFUART"; break;
+        case 1: sport->name = "BTUART"; break;
+        case 2: sport->name = "STUART"; break;
+        case 3: sport->name = "HWUART"; break;
+        default:
+                sport->name = "???";
+                break;
+        }
 
         sport->port.membase = ioremap(mmres->start, resource_size(mmres));
         if (!sport->port.membase) {
@@ -922,7 +829,7 @@ static int serial_pxa_probe(struct platform_device *dev)
                 goto err_clk;
         }
 
-        serial_pxa_ports[sport->port.line] = sport;
+        serial_pxa_ports[dev->id] = sport;
 
         uart_add_one_port(&serial_pxa_reg, &sport->port);
         platform_set_drvdata(dev, sport);
@@ -959,7 +866,6 @@ static struct platform_driver serial_pxa_driver = {
 #ifdef CONFIG_PM
                 .pm     = &serial_pxa_pm_ops,
 #endif
-                .of_match_table = serial_pxa_dt_ids,
         },
 };
 
diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index 5d4b9b449b4..ef7a21a6a01 100644
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -29,7 +29,6 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/sysrq.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -39,7 +38,7 @@
 
 #include <asm/irq.h>
 #include <mach/hardware.h>
-#include <mach/irqs.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
@@ -637,7 +636,7 @@ static void __init sa1100_init_ports(void)
         PPSR |= PPC_TXD1 | PPC_TXD3;
 }
 
-void sa1100_register_uart_fns(struct sa1100_port_fns *fns)
+void __devinit sa1100_register_uart_fns(struct sa1100_port_fns *fns)
 {
         if (fns->get_mctrl)
                 sa1100_pops.get_mctrl = fns->get_mctrl;
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 12e5249d053..6edafb5ace1 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -42,7 +42,6 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/cpufreq.h>
-#include <linux/of.h>
 
 #include <asm/irq.h>
 
@@ -50,7 +49,6 @@
 #include <mach/map.h>
 
 #include <plat/regs-serial.h>
-#include <plat/clock.h>
 
 #include "samsung.h"
 
@@ -82,17 +80,7 @@ static inline const char *s3c24xx_serial_portname(struct uart_port *port)
 
 static int s3c24xx_serial_txempty_nofifo(struct uart_port *port)
 {
-        return rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE;
-}
-
-/*
- * s3c64xx and later SoC's include the interrupt mask and status registers in
- * the controller itself, unlike the s3c24xx SoC's which have these registers
- * in the interrupt controller. Check if the port type is s3c64xx or higher.
- */
-static int s3c24xx_serial_has_interrupt_mask(struct uart_port *port)
-{
-        return to_ourport(port)->info->type == PORT_S3C6400;
+        return (rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE);
 }
 
 static void s3c24xx_serial_rx_enable(struct uart_port *port)
@@ -138,11 +126,7 @@ static void s3c24xx_serial_stop_tx(struct uart_port *port)
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (tx_enabled(port)) {
-                if (s3c24xx_serial_has_interrupt_mask(port))
-                        __set_bit(S3C64XX_UINTM_TXD,
-                                portaddrl(port, S3C64XX_UINTM));
-                else
-                        disable_irq_nosync(ourport->tx_irq);
+                disable_irq_nosync(ourport->tx_irq);
                 tx_enabled(port) = 0;
                 if (port->flags & UPF_CONS_FLOW)
                         s3c24xx_serial_rx_enable(port);
@@ -157,26 +141,19 @@ static void s3c24xx_serial_start_tx(struct uart_port *port)
                 if (port->flags & UPF_CONS_FLOW)
                         s3c24xx_serial_rx_disable(port);
 
-                if (s3c24xx_serial_has_interrupt_mask(port))
-                        __clear_bit(S3C64XX_UINTM_TXD,
-                                portaddrl(port, S3C64XX_UINTM));
-                else
-                        enable_irq(ourport->tx_irq);
+                enable_irq(ourport->tx_irq);
                 tx_enabled(port) = 1;
         }
 }
 
+
 static void s3c24xx_serial_stop_rx(struct uart_port *port)
 {
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (rx_enabled(port)) {
                 dbg("s3c24xx_serial_stop_rx: port=%p\n", port);
-                if (s3c24xx_serial_has_interrupt_mask(port))
-                        __set_bit(S3C64XX_UINTM_RXD,
-                                portaddrl(port, S3C64XX_UINTM));
-                else
-                        disable_irq_nosync(ourport->rx_irq);
+                disable_irq_nosync(ourport->rx_irq);
                 rx_enabled(port) = 0;
         }
 }
@@ -192,13 +169,10 @@ static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *p
 
 static inline struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port)
 {
-        struct s3c24xx_uart_port *ourport;
-
         if (port->dev == NULL)
                 return NULL;
 
-        ourport = container_of(port, struct s3c24xx_uart_port, port);
-        return ourport->cfg;
+        return (struct s3c2410_uartcfg *)port->dev->platform_data;
 }
 
 static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
@@ -207,7 +181,7 @@ static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
         struct s3c24xx_uart_info *info = ourport->info;
 
         if (ufstat & info->rx_fifofull)
-                return ourport->port.fifosize;
+                return info->fifosize;
 
         return (ufstat & info->rx_fifomask) >> info->rx_fifoshift;
 }
@@ -223,11 +197,8 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
         struct uart_port *port = &ourport->port;
         struct tty_struct *tty = port->state->port.tty;
         unsigned int ufcon, ch, flag, ufstat, uerstat;
-        unsigned long flags;
         int max_count = 64;
 
-        spin_lock_irqsave(&port->lock, flags);
-
         while (max_count-- > 0) {
                 ufcon = rd_regl(port, S3C2410_UFCON);
                 ufstat = rd_regl(port, S3C2410_UFSTAT);
@@ -271,7 +242,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
                                 dbg("break!\n");
                                 port->icount.brk++;
                                 if (uart_handle_break(port))
-                                        goto ignore_char;
+                                    goto ignore_char;
                         }
 
                         if (uerstat & S3C2410_UERSTAT_FRAME)
@@ -302,7 +273,6 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
         tty_flip_buffer_push(tty);
 
  out:
-        spin_unlock_irqrestore(&port->lock, flags);
         return IRQ_HANDLED;
 }
 
@@ -311,11 +281,8 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
         struct s3c24xx_uart_port *ourport = id;
         struct uart_port *port = &ourport->port;
         struct circ_buf *xmit = &port->state->xmit;
-        unsigned long flags;
         int count = 256;
 
-        spin_lock_irqsave(&port->lock, flags);
-
         if (port->x_char) {
                 wr_regb(port, S3C2410_UTXH, port->x_char);
                 port->icount.tx++;
@@ -343,39 +310,16 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
                 port->icount.tx++;
         }
 
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {
-                spin_unlock(&port->lock);
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(port);
-                spin_lock(&port->lock);
-        }
 
         if (uart_circ_empty(xmit))
                 s3c24xx_serial_stop_tx(port);
 
  out:
-        spin_unlock_irqrestore(&port->lock, flags);
         return IRQ_HANDLED;
 }
 
-/* interrupt handler for s3c64xx and later SoC's.*/
-static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id)
-{
-        struct s3c24xx_uart_port *ourport = id;
-        struct uart_port *port = &ourport->port;
-        unsigned int pend = rd_regl(port, S3C64XX_UINTP);
-        irqreturn_t ret = IRQ_HANDLED;
-
-        if (pend & S3C64XX_UINTM_RXD_MSK) {
-                ret = s3c24xx_serial_rx_chars(irq, id);
-                wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK);
-        }
-        if (pend & S3C64XX_UINTM_TXD_MSK) {
-                ret = s3c24xx_serial_tx_chars(irq, id);
-                wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK);
-        }
-        return ret;
-}
-
 static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port)
 {
         struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
@@ -433,26 +377,19 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (ourport->tx_claimed) {
-                if (!s3c24xx_serial_has_interrupt_mask(port))
-                        free_irq(ourport->tx_irq, ourport);
+                free_irq(ourport->tx_irq, ourport);
                 tx_enabled(port) = 0;
                 ourport->tx_claimed = 0;
         }
 
         if (ourport->rx_claimed) {
-                if (!s3c24xx_serial_has_interrupt_mask(port))
-                        free_irq(ourport->rx_irq, ourport);
+                free_irq(ourport->rx_irq, ourport);
                 ourport->rx_claimed = 0;
                 rx_enabled(port) = 0;
         }
-
-        /* Clear pending interrupts and mask all interrupts */
-        if (s3c24xx_serial_has_interrupt_mask(port)) {
-                wr_regl(port, S3C64XX_UINTP, 0xf);
-                wr_regl(port, S3C64XX_UINTM, 0xf);
-        }
 }
 
+
 static int s3c24xx_serial_startup(struct uart_port *port)
 {
         struct s3c24xx_uart_port *ourport = to_ourport(port);
@@ -467,7 +404,7 @@ static int s3c24xx_serial_startup(struct uart_port *port)
                           s3c24xx_serial_portname(port), ourport);
 
         if (ret != 0) {
-                dev_err(port->dev, "cannot get irq %d\n", ourport->rx_irq);
+                printk(KERN_ERR "cannot get irq %d\n", ourport->rx_irq);
                 return ret;
         }
 
@@ -481,7 +418,7 @@ static int s3c24xx_serial_startup(struct uart_port *port)
                           s3c24xx_serial_portname(port), ourport);
 
         if (ret) {
-                dev_err(port->dev, "cannot get irq %d\n", ourport->tx_irq);
+                printk(KERN_ERR "cannot get irq %d\n", ourport->tx_irq);
                 goto err;
         }
 
@@ -499,33 +436,6 @@ static int s3c24xx_serial_startup(struct uart_port *port)
         return ret;
 }
 
-static int s3c64xx_serial_startup(struct uart_port *port)
-{
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-        int ret;
-
-        dbg("s3c64xx_serial_startup: port=%p (%08lx,%p)\n",
-            port->mapbase, port->membase);
-
-        ret = request_irq(port->irq, s3c64xx_serial_handle_irq, IRQF_SHARED,
-                          s3c24xx_serial_portname(port), ourport);
-        if (ret) {
-                dev_err(port->dev, "cannot get irq %d\n", port->irq);
-                return ret;
-        }
-
-        /* For compatibility with s3c24xx Soc's */
-        rx_enabled(port) = 1;
-        ourport->rx_claimed = 1;
-        tx_enabled(port) = 0;
-        ourport->tx_claimed = 1;
-
-        /* Enable Rx Interrupt */
-        __clear_bit(S3C64XX_UINTM_RXD, portaddrl(port, S3C64XX_UINTM));
-        dbg("s3c64xx_serial_startup ok\n");
-        return ret;
-}
-
 /* power power management control */
 
 static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
@@ -537,21 +447,21 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
 
         switch (level) {
         case 3:
-                if (!IS_ERR(ourport->baudclk))
-                        clk_disable_unprepare(ourport->baudclk);
+                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
+                        clk_disable(ourport->baudclk);
 
-                clk_disable_unprepare(ourport->clk);
+                clk_disable(ourport->clk);
                 break;
 
         case 0:
-                clk_prepare_enable(ourport->clk);
+                clk_enable(ourport->clk);
 
-                if (!IS_ERR(ourport->baudclk))
-                        clk_prepare_enable(ourport->baudclk);
+                if (!IS_ERR(ourport->baudclk) && ourport->baudclk != NULL)
+                        clk_enable(ourport->baudclk);
 
                 break;
         default:
-                dev_err(port->dev, "s3c24xx_serial: unknown pm %d\n", level);
+                printk(KERN_ERR "s3c24xx_serial: unknown pm %d\n", level);
         }
 }
 
@@ -568,97 +478,154 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
  *
 */
 
-#define MAX_CLK_NAME_LENGTH 15
 
-static inline int s3c24xx_serial_getsource(struct uart_port *port)
+#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);
-        unsigned int ucon;
-
-        if (info->num_clks == 1)
-                return 0;
 
-        ucon = rd_regl(port, S3C2410_UCON);
-        ucon &= info->clksel_mask;
-        return ucon >> info->clksel_shift;
+        return (info->get_clksrc)(port, c);
 }
 
-static void s3c24xx_serial_setsource(struct uart_port *port,
-                        unsigned int clk_sel)
+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);
-        unsigned int ucon;
 
-        if (info->num_clks == 1)
-                return;
+        return (info->set_clksrc)(port, c);
+}
 
-        ucon = rd_regl(port, S3C2410_UCON);
-        if ((ucon & info->clksel_mask) >> info->clksel_shift == clk_sel)
-                return;
+struct baud_calc {
+        struct s3c24xx_uart_clksrc      *clksrc;
+        unsigned int                     calc;
+        unsigned int                     divslot;
+        unsigned int                     quot;
+        struct clk                      *src;
+};
 
-        ucon &= ~info->clksel_mask;
-        ucon |= clk_sel << info->clksel_shift;
-        wr_regl(port, S3C2410_UCON, ucon);
+static int s3c24xx_serial_calcbaud(struct baud_calc *calc,
+                                   struct uart_port *port,
+                                   struct s3c24xx_uart_clksrc *clksrc,
+                                   unsigned int baud)
+{
+        struct s3c24xx_uart_port *ourport = to_ourport(port);
+        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;
+
+        if (ourport->info->has_divslot) {
+                unsigned long div = rate / baud;
+
+                /* The UDIVSLOT register on the newer UARTs allows us to
+                 * get a divisor adjustment of 1/16th on the baud clock.
+                 *
+                 * We don't keep the UDIVSLOT value (the 16ths we calculated
+                 * by not multiplying the baud by 16) as it is easy enough
+                 * to recalculate.
+                 */
+
+                calc->quot = div / 16;
+                calc->calc = rate / div;
+        } else {
+                calc->quot = (rate + (8 * baud)) / (16 * baud);
+                calc->calc = (rate / (calc->quot * 16));
+        }
+
+        calc->quot--;
+        return 1;
 }
 
-static unsigned int s3c24xx_serial_getclk(struct s3c24xx_uart_port *ourport,
-                        unsigned int req_baud, struct clk **best_clk,
-                        unsigned int *clk_num)
+static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
+                                          struct s3c24xx_uart_clksrc **clksrc,
+                                          struct clk **clk,
+                                          unsigned int baud)
 {
-        struct s3c24xx_uart_info *info = ourport->info;
-        struct clk *clk;
-        unsigned long rate;
-        unsigned int cnt, baud, quot, clk_sel, best_quot = 0;
-        char clkname[MAX_CLK_NAME_LENGTH];
-        int calc_deviation, deviation = (1 << 30) - 1;
-
-        clk_sel = (ourport->cfg->clk_sel) ? ourport->cfg->clk_sel :
-                        ourport->info->def_clk_sel;
-        for (cnt = 0; cnt < info->num_clks; cnt++) {
-                if (!(clk_sel & (1 << cnt)))
-                        continue;
-
-                sprintf(clkname, "clk_uart_baud%d", cnt);
-                clk = clk_get(ourport->port.dev, clkname);
-                if (IS_ERR(clk))
-                        continue;
-
-                rate = clk_get_rate(clk);
-                if (!rate)
-                        continue;
-
-                if (ourport->info->has_divslot) {
-                        unsigned long div = rate / req_baud;
-
-                        /* The UDIVSLOT register on the newer UARTs allows us to
-                         * get a divisor adjustment of 1/16th on the baud clock.
-                         *
-                         * We don't keep the UDIVSLOT value (the 16ths we
-                         * calculated by not multiplying the baud by 16) as it
-                         * is easy enough to recalculate.
+        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
                          */
 
-                        quot = div / 16;
-                        baud = rate / div;
-                } else {
-                        quot = (rate + (8 * req_baud)) / (16 * req_baud);
-                        baud = rate / (quot * 16);
+                        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++;
                 }
-                quot--;
+        }
+
+        /* ok, we now need to select the best clock we found */
 
-                calc_deviation = req_baud - baud;
-                if (calc_deviation < 0)
-                        calc_deviation = -calc_deviation;
+        if (!best) {
+                unsigned int deviation = (1<<30)|((1<<30)-1);
+                int calc_deviation;
 
-                if (calc_deviation < deviation) {
-                        *best_clk = clk;
-                        best_quot = quot;
-                        *clk_num = cnt;
-                        deviation = calc_deviation;
+                for (sptr = res; sptr < resptr; sptr++) {
+                        calc_deviation = baud - sptr->calc;
+                        if (calc_deviation < 0)
+                                calc_deviation = -calc_deviation;
+
+                        if (calc_deviation < deviation) {
+                                best = sptr;
+                                deviation = calc_deviation;
+                        }
                 }
         }
 
-        return best_quot;
+        /* store results to pass back */
+
+        *clksrc = best->clksrc;
+        *clk    = best->src;
+
+        return best->quot;
 }
 
 /* udivslot_table[]
@@ -691,9 +658,10 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
 {
         struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
-        struct clk *clk = ERR_PTR(-EINVAL);
+        struct s3c24xx_uart_clksrc *clksrc = NULL;
+        struct clk *clk = NULL;
         unsigned long flags;
-        unsigned int baud, quot, clk_sel = 0;
+        unsigned int baud, quot;
         unsigned int ulcon;
         unsigned int umcon;
         unsigned int udivslot = 0;
@@ -709,24 +677,26 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
          */
 
         baud = uart_get_baud_rate(port, termios, old, 0, 115200*8);
-        quot = s3c24xx_serial_getclk(ourport, baud, &clk, &clk_sel);
+
         if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
                 quot = port->custom_divisor;
-        if (IS_ERR(clk))
-                return;
+        else
+                quot = s3c24xx_serial_getclk(port, &clksrc, &clk, baud);
 
         /* check to see if we need  to change clock source */
 
-        if (ourport->baudclk != clk) {
-                s3c24xx_serial_setsource(port, clk_sel);
+        if (ourport->clksrc != clksrc || ourport->baudclk != clk) {
+                dbg("selecting clock %p\n", clk);
+                s3c24xx_serial_setsource(port, clksrc);
 
-                if (!IS_ERR(ourport->baudclk)) {
-                        clk_disable_unprepare(ourport->baudclk);
-                        ourport->baudclk = ERR_PTR(-EINVAL);
+                if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
+                        clk_disable(ourport->baudclk);
+                        ourport->baudclk  = NULL;
                 }
 
-                clk_prepare_enable(clk);
+                clk_enable(clk);
 
+                ourport->clksrc = clksrc;
                 ourport->baudclk = clk;
                 ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0;
         }
@@ -884,24 +854,11 @@ s3c24xx_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
 
 static struct console s3c24xx_serial_console;
 
-static int __init s3c24xx_serial_console_init(void)
-{
-        register_console(&s3c24xx_serial_console);
-        return 0;
-}
-console_initcall(s3c24xx_serial_console_init);
-
 #define S3C24XX_SERIAL_CONSOLE &s3c24xx_serial_console
 #else
 #define S3C24XX_SERIAL_CONSOLE NULL
 #endif
 
-#ifdef CONFIG_CONSOLE_POLL
-static int s3c24xx_serial_get_poll_char(struct uart_port *port);
-static void s3c24xx_serial_put_poll_char(struct uart_port *port,
-                         unsigned char c);
-#endif
-
 static struct uart_ops s3c24xx_serial_ops = {
         .pm             = s3c24xx_serial_pm,
         .tx_empty       = s3c24xx_serial_tx_empty,
@@ -920,12 +877,9 @@ static struct uart_ops s3c24xx_serial_ops = {
         .request_port   = s3c24xx_serial_request_port,
         .config_port    = s3c24xx_serial_config_port,
         .verify_port    = s3c24xx_serial_verify_port,
-#ifdef CONFIG_CONSOLE_POLL
-        .poll_get_char = s3c24xx_serial_get_poll_char,
-        .poll_put_char = s3c24xx_serial_put_poll_char,
-#endif
 };
 
+
 static struct uart_driver s3c24xx_uart_drv = {
         .owner          = THIS_MODULE,
         .driver_name    = "s3c2410_serial",
@@ -941,6 +895,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
                 .port = {
                         .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[0].port.lock),
                         .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX0,
                         .uartclk        = 0,
                         .fifosize       = 16,
                         .ops            = &s3c24xx_serial_ops,
@@ -952,6 +907,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
                 .port = {
                         .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[1].port.lock),
                         .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX1,
                         .uartclk        = 0,
                         .fifosize       = 16,
                         .ops            = &s3c24xx_serial_ops,
@@ -965,6 +921,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
                 .port = {
                         .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[2].port.lock),
                         .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX2,
                         .uartclk        = 0,
                         .fifosize       = 16,
                         .ops            = &s3c24xx_serial_ops,
@@ -978,6 +935,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
                 .port = {
                         .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[3].port.lock),
                         .iotype         = UPIO_MEM,
+                        .irq            = IRQ_S3CUART_RX3,
                         .uartclk        = 0,
                         .fifosize       = 16,
                         .ops            = &s3c24xx_serial_ops,
@@ -990,30 +948,16 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
 
 /* s3c24xx_serial_resetport
  *
- * reset the fifos and other the settings.
+ * wrapper to call the specific reset for this port (reset the fifos
+ * and the settings)
 */
 
-static void s3c24xx_serial_resetport(struct uart_port *port,
-                                   struct s3c2410_uartcfg *cfg)
+static inline int s3c24xx_serial_resetport(struct uart_port *port,
+                                           struct s3c2410_uartcfg *cfg)
 {
         struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-        unsigned int ucon_mask;
-
-        ucon_mask = info->clksel_mask;
-        if (info->type == PORT_S3C2440)
-                ucon_mask |= S3C2440_UCON0_DIVMASK;
 
-        ucon &= ucon_mask;
-        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);
-
-        /* some delay is required after fifo reset */
-        udelay(1);
+        return (info->reset_port)(port, cfg);
 }
 
 
@@ -1038,10 +982,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb,
          * a disturbance in the clock-rate over the change.
          */
 
-        if (IS_ERR(port->baudclk))
+        if (IS_ERR(port->clk))
                 goto exit;
 
-        if (port->baudclk_rate == clk_get_rate(port->baudclk))
+        if (port->baudclk_rate == clk_get_rate(port->clk))
                 goto exit;
 
         if (val == CPUFREQ_PRECHANGE) {
@@ -1060,10 +1004,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb,
                 if (tty == NULL)
                         goto exit;
 
-                termios = &tty->termios;
+                termios = tty->termios;
 
                 if (termios == NULL) {
-                        dev_warn(uport->dev, "%s: no termios?\n", __func__);
+                        printk(KERN_WARNING "%s: no termios?\n", __func__);
                         goto exit;
                 }
 
@@ -1105,10 +1049,11 @@ static inline void s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart_port *p
  */
 
 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 = ourport->cfg;
+        struct s3c2410_uartcfg *cfg;
         struct resource *res;
         int ret;
 
@@ -1117,15 +1062,25 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         if (platdev == NULL)
                 return -ENODEV;
 
+        cfg = s3c24xx_dev_to_cfg(&platdev->dev);
+
         if (port->mapbase != 0)
                 return 0;
 
+        if (cfg->hwport > CONFIG_SERIAL_SAMSUNG_UARTS) {
+                printk(KERN_ERR "%s: port %d bigger than %d\n", __func__,
+                       cfg->hwport, CONFIG_SERIAL_SAMSUNG_UARTS);
+                return -ERANGE;
+        }
+
         /* setup info for port */
         port->dev       = &platdev->dev;
+        ourport->info   = info;
+
+        /* copy the info in from provided structure */
+        ourport->port.fifosize = info->fifosize;
 
-        /* Startup sequence is different for s3c64xx and higher SoC's */
-        if (s3c24xx_serial_has_interrupt_mask(port))
-                s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
+        dbg("s3c24xx_serial_init_port: %p (hw %d)...\n", port, cfg->hwport);
 
         port->uartclk = 1;
 
@@ -1138,7 +1093,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
         res = platform_get_resource(platdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
-                dev_err(port->dev, "failed to find memory resource for uart\n");
+                printk(KERN_ERR "failed to find memory resource for uart\n");
                 return -EINVAL;
         }
 
@@ -1154,20 +1109,13 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
                 ourport->rx_irq = ret;
                 ourport->tx_irq = ret + 1;
         }
-
+        
         ret = platform_get_irq(platdev, 1);
         if (ret > 0)
                 ourport->tx_irq = ret;
 
         ourport->clk    = clk_get(&platdev->dev, "uart");
 
-        /* Keep all interrupts masked and cleared */
-        if (s3c24xx_serial_has_interrupt_mask(port)) {
-                wr_regl(port, S3C64XX_UINTM, 0xf);
-                wr_regl(port, S3C64XX_UINTP, 0xf);
-                wr_regl(port, S3C64XX_UINTSP, 0xf);
-        }
-
         dbg("port: map=%08x, mem=%08x, irq=%d (%d,%d), clock=%ld\n",
             port->mapbase, port->membase, port->irq,
             ourport->rx_irq, ourport->tx_irq, port->uartclk);
@@ -1184,79 +1132,43 @@ static ssize_t s3c24xx_serial_show_clksrc(struct device *dev,
         struct uart_port *port = s3c24xx_dev_to_port(dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
-        if (IS_ERR(ourport->baudclk))
-                return -EINVAL;
-
-        return snprintf(buf, PAGE_SIZE, "* %s\n",
-                        ourport->baudclk->name ?: "(null)");
+        return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->clksrc->name);
 }
 
 static DEVICE_ATTR(clock_source, S_IRUGO, s3c24xx_serial_show_clksrc, NULL);
 
-
 /* Device driver serial port probe */
 
-static const struct of_device_id s3c24xx_uart_dt_match[];
 static int probe_index;
 
-static inline struct s3c24xx_serial_drv_data *s3c24xx_get_driver_data(
-                        struct platform_device *pdev)
-{
-#ifdef CONFIG_OF
-        if (pdev->dev.of_node) {
-                const struct of_device_id *match;
-                match = of_match_node(s3c24xx_uart_dt_match, pdev->dev.of_node);
-                return (struct s3c24xx_serial_drv_data *)match->data;
-        }
-#endif
-        return (struct s3c24xx_serial_drv_data *)
-                        platform_get_device_id(pdev)->driver_data;
-}
-
-static int s3c24xx_serial_probe(struct platform_device *pdev)
+int s3c24xx_serial_probe(struct platform_device *dev,
+                         struct s3c24xx_uart_info *info)
 {
         struct s3c24xx_uart_port *ourport;
         int ret;
 
-        dbg("s3c24xx_serial_probe(%p) %d\n", pdev, probe_index);
+        dbg("s3c24xx_serial_probe(%p, %p) %d\n", dev, info, probe_index);
 
         ourport = &s3c24xx_serial_ports[probe_index];
-
-        ourport->drv_data = s3c24xx_get_driver_data(pdev);
-        if (!ourport->drv_data) {
-                dev_err(&pdev->dev, "could not find driver data\n");
-                return -ENODEV;
-        }
-
-        ourport->baudclk = ERR_PTR(-EINVAL);
-        ourport->info = ourport->drv_data->info;
-        ourport->cfg = (pdev->dev.platform_data) ?
-                        (struct s3c2410_uartcfg *)pdev->dev.platform_data :
-                        ourport->drv_data->def_cfg;
-
-        ourport->port.fifosize = (ourport->info->fifosize) ?
-                ourport->info->fifosize :
-                ourport->drv_data->fifosize[probe_index];
-
         probe_index++;
 
         dbg("%s: initialising port %p...\n", __func__, ourport);
 
-        ret = s3c24xx_serial_init_port(ourport, pdev);
+        ret = s3c24xx_serial_init_port(ourport, info, dev);
         if (ret < 0)
                 goto probe_err;
 
         dbg("%s: adding port\n", __func__);
         uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
-        platform_set_drvdata(pdev, &ourport->port);
+        platform_set_drvdata(dev, &ourport->port);
 
-        ret = device_create_file(&pdev->dev, &dev_attr_clock_source);
+        ret = device_create_file(&dev->dev, &dev_attr_clock_source);
         if (ret < 0)
-                dev_err(&pdev->dev, "failed to add clock source attr.\n");
+                printk(KERN_ERR "%s: failed to add clksrc attr.\n", __func__);
 
         ret = s3c24xx_serial_cpufreq_register(ourport);
         if (ret < 0)
-                dev_err(&pdev->dev, "failed to add cpufreq notifier\n");
+                dev_err(&dev->dev, "failed to add cpufreq notifier\n");
 
         return 0;
 
@@ -1264,7 +1176,9 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int s3c24xx_serial_remove(struct platform_device *dev)
+EXPORT_SYMBOL_GPL(s3c24xx_serial_probe);
+
+int __devexit s3c24xx_serial_remove(struct platform_device *dev)
 {
         struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
 
@@ -1277,6 +1191,8 @@ static int s3c24xx_serial_remove(struct platform_device *dev)
         return 0;
 }
 
+EXPORT_SYMBOL_GPL(s3c24xx_serial_remove);
+
 /* UART power management code */
 #ifdef CONFIG_PM_SLEEP
 static int s3c24xx_serial_suspend(struct device *dev)
@@ -1295,9 +1211,9 @@ static int s3c24xx_serial_resume(struct device *dev)
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (port) {
-                clk_prepare_enable(ourport->clk);
+                clk_enable(ourport->clk);
                 s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
-                clk_disable_unprepare(ourport->clk);
+                clk_disable(ourport->clk);
 
                 uart_resume_port(&s3c24xx_uart_drv, port);
         }
@@ -1316,6 +1232,41 @@ static const struct dev_pm_ops s3c24xx_serial_pm_ops = {
 #define SERIAL_SAMSUNG_PM_OPS   NULL
 #endif /* CONFIG_PM_SLEEP */
 
+int s3c24xx_serial_init(struct platform_driver *drv,
+                        struct s3c24xx_uart_info *info)
+{
+        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
+
+        drv->driver.pm = SERIAL_SAMSUNG_PM_OPS;
+
+        return platform_driver_register(drv);
+}
+
+EXPORT_SYMBOL_GPL(s3c24xx_serial_init);
+
+/* 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;
+        }
+
+        return 0;
+}
+
+static void __exit s3c24xx_serial_modexit(void)
+{
+        uart_unregister_driver(&s3c24xx_uart_drv);
+}
+
+module_init(s3c24xx_serial_modinit);
+module_exit(s3c24xx_serial_modexit);
+
 /* Console code */
 
 #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
@@ -1341,36 +1292,6 @@ s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
         return (utrstat & S3C2410_UTRSTAT_TXE) ? 1 : 0;
 }
 
-#ifdef CONFIG_CONSOLE_POLL
-/*
- * Console polling routines for writing and reading from the uart while
- * in an interrupt or debug context.
- */
-
-static int s3c24xx_serial_get_poll_char(struct uart_port *port)
-{
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-        unsigned int ufstat;
-
-        ufstat = rd_regl(port, S3C2410_UFSTAT);
-        if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0)
-                return NO_POLL_CHAR;
-
-        return rd_regb(port, S3C2410_URXH);
-}
-
-static void s3c24xx_serial_put_poll_char(struct uart_port *port,
-                unsigned char c)
-{
-        unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-
-        while (!s3c24xx_serial_console_txrdy(port, ufcon))
-                cpu_relax();
-        wr_regb(cons_uart, S3C2410_UTXH, c);
-}
-
-#endif /* CONFIG_CONSOLE_POLL */
-
 static void
 s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
 {
@@ -1391,13 +1312,12 @@ 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;
-        unsigned int clk_sel;
-        char clk_name[MAX_CLK_NAME_LENGTH];
 
         ulcon  = rd_regl(port, S3C2410_ULCON);
         ucon   = rd_regl(port, S3C2410_UCON);
@@ -1442,21 +1362,44 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud,
 
                 /* now calculate the baud rate */
 
-                clk_sel = s3c24xx_serial_getsource(port);
-                sprintf(clk_name, "clk_uart_baud%d", clk_sel);
+                s3c24xx_serial_getsource(port, &clksrc);
 
-                clk = clk_get(port->dev, clk_name);
-                if (!IS_ERR(clk))
-                        rate = clk_get_rate(clk);
+                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 < CONFIG_SERIAL_SAMSUNG_UARTS; i++, ptr++, platdev_ptr++) {
+                s3c24xx_serial_init_port(ptr, info[i], *platdev_ptr);
+        }
+
+        return 0;
+}
+
 static int __init
 s3c24xx_serial_console_setup(struct console *co, char *options)
 {
@@ -1500,6 +1443,11 @@ s3c24xx_serial_console_setup(struct console *co, char *options)
         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,
@@ -1509,262 +1457,34 @@ static struct console s3c24xx_serial_console = {
         .setup          = s3c24xx_serial_console_setup,
         .data           = &s3c24xx_uart_drv,
 };
-#endif /* CONFIG_SERIAL_SAMSUNG_CONSOLE */
-
-#ifdef CONFIG_CPU_S3C2410
-static struct s3c24xx_serial_drv_data s3c2410_serial_drv_data = {
-        .info = &(struct s3c24xx_uart_info) {
-                .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,
-                .def_clk_sel    = S3C2410_UCON_CLKSEL0,
-                .num_clks       = 2,
-                .clksel_mask    = S3C2410_UCON_CLKMASK,
-                .clksel_shift   = S3C2410_UCON_CLKSHIFT,
-        },
-        .def_cfg = &(struct s3c2410_uartcfg) {
-                .ucon           = S3C2410_UCON_DEFAULT,
-                .ufcon          = S3C2410_UFCON_DEFAULT,
-        },
-};
-#define S3C2410_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2410_serial_drv_data)
-#else
-#define S3C2410_SERIAL_DRV_DATA (kernel_ulong_t)NULL
-#endif
-
-#ifdef CONFIG_CPU_S3C2412
-static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data = {
-        .info = &(struct s3c24xx_uart_info) {
-                .name           = "Samsung S3C2412 UART",
-                .type           = PORT_S3C2412,
-                .fifosize       = 64,
-                .has_divslot    = 1,
-                .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,
-                .def_clk_sel    = S3C2410_UCON_CLKSEL2,
-                .num_clks       = 4,
-                .clksel_mask    = S3C2412_UCON_CLKMASK,
-                .clksel_shift   = S3C2412_UCON_CLKSHIFT,
-        },
-        .def_cfg = &(struct s3c2410_uartcfg) {
-                .ucon           = S3C2410_UCON_DEFAULT,
-                .ufcon          = S3C2410_UFCON_DEFAULT,
-        },
-};
-#define S3C2412_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2412_serial_drv_data)
-#else
-#define S3C2412_SERIAL_DRV_DATA (kernel_ulong_t)NULL
-#endif
-
-#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \
-        defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2442)
-static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data = {
-        .info = &(struct s3c24xx_uart_info) {
-                .name           = "Samsung S3C2440 UART",
-                .type           = PORT_S3C2440,
-                .fifosize       = 64,
-                .has_divslot    = 1,
-                .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,
-                .def_clk_sel    = S3C2410_UCON_CLKSEL2,
-                .num_clks       = 4,
-                .clksel_mask    = S3C2412_UCON_CLKMASK,
-                .clksel_shift   = S3C2412_UCON_CLKSHIFT,
-        },
-        .def_cfg = &(struct s3c2410_uartcfg) {
-                .ucon           = S3C2410_UCON_DEFAULT,
-                .ufcon          = S3C2410_UFCON_DEFAULT,
-        },
-};
-#define S3C2440_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2440_serial_drv_data)
-#else
-#define S3C2440_SERIAL_DRV_DATA (kernel_ulong_t)NULL
-#endif
-
-#if defined(CONFIG_CPU_S3C6400) || defined(CONFIG_CPU_S3C6410) || \
-        defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450) || \
-        defined(CONFIG_CPU_S5PC100)
-static struct s3c24xx_serial_drv_data s3c6400_serial_drv_data = {
-        .info = &(struct s3c24xx_uart_info) {
-                .name           = "Samsung S3C6400 UART",
-                .type           = PORT_S3C6400,
-                .fifosize       = 64,
-                .has_divslot    = 1,
-                .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,
-                .def_clk_sel    = S3C2410_UCON_CLKSEL2,
-                .num_clks       = 4,
-                .clksel_mask    = S3C6400_UCON_CLKMASK,
-                .clksel_shift   = S3C6400_UCON_CLKSHIFT,
-        },
-        .def_cfg = &(struct s3c2410_uartcfg) {
-                .ucon           = S3C2410_UCON_DEFAULT,
-                .ufcon          = S3C2410_UFCON_DEFAULT,
-        },
-};
-#define S3C6400_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c6400_serial_drv_data)
-#else
-#define S3C6400_SERIAL_DRV_DATA (kernel_ulong_t)NULL
-#endif
-
-#ifdef CONFIG_CPU_S5PV210
-static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = {
-        .info = &(struct s3c24xx_uart_info) {
-                .name           = "Samsung S5PV210 UART",
-                .type           = PORT_S3C6400,
-                .has_divslot    = 1,
-                .rx_fifomask    = S5PV210_UFSTAT_RXMASK,
-                .rx_fifoshift   = S5PV210_UFSTAT_RXSHIFT,
-                .rx_fifofull    = S5PV210_UFSTAT_RXFULL,
-                .tx_fifofull    = S5PV210_UFSTAT_TXFULL,
-                .tx_fifomask    = S5PV210_UFSTAT_TXMASK,
-                .tx_fifoshift   = S5PV210_UFSTAT_TXSHIFT,
-                .def_clk_sel    = S3C2410_UCON_CLKSEL0,
-                .num_clks       = 2,
-                .clksel_mask    = S5PV210_UCON_CLKMASK,
-                .clksel_shift   = S5PV210_UCON_CLKSHIFT,
-        },
-        .def_cfg = &(struct s3c2410_uartcfg) {
-                .ucon           = S5PV210_UCON_DEFAULT,
-                .ufcon          = S5PV210_UFCON_DEFAULT,
-        },
-        .fifosize = { 256, 64, 16, 16 },
-};
-#define S5PV210_SERIAL_DRV_DATA ((kernel_ulong_t)&s5pv210_serial_drv_data)
-#else
-#define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL
-#endif
-
-#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) || \
-        defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) || \
-        defined(CONFIG_SOC_EXYNOS5440)
-static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = {
-        .info = &(struct s3c24xx_uart_info) {
-                .name           = "Samsung Exynos4 UART",
-                .type           = PORT_S3C6400,
-                .has_divslot    = 1,
-                .rx_fifomask    = S5PV210_UFSTAT_RXMASK,
-                .rx_fifoshift   = S5PV210_UFSTAT_RXSHIFT,
-                .rx_fifofull    = S5PV210_UFSTAT_RXFULL,
-                .tx_fifofull    = S5PV210_UFSTAT_TXFULL,
-                .tx_fifomask    = S5PV210_UFSTAT_TXMASK,
-                .tx_fifoshift   = S5PV210_UFSTAT_TXSHIFT,
-                .def_clk_sel    = S3C2410_UCON_CLKSEL0,
-                .num_clks       = 1,
-                .clksel_mask    = 0,
-                .clksel_shift   = 0,
-        },
-        .def_cfg = &(struct s3c2410_uartcfg) {
-                .ucon           = S5PV210_UCON_DEFAULT,
-                .ufcon          = S5PV210_UFCON_DEFAULT,
-                .has_fracval    = 1,
-        },
-        .fifosize = { 256, 64, 16, 16 },
-};
-#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos4210_serial_drv_data)
-#else
-#define EXYNOS4210_SERIAL_DRV_DATA (kernel_ulong_t)NULL
-#endif
 
-static struct platform_device_id s3c24xx_serial_driver_ids[] = {
-        {
-                .name           = "s3c2410-uart",
-                .driver_data    = S3C2410_SERIAL_DRV_DATA,
-        }, {
-                .name           = "s3c2412-uart",
-                .driver_data    = S3C2412_SERIAL_DRV_DATA,
-        }, {
-                .name           = "s3c2440-uart",
-                .driver_data    = S3C2440_SERIAL_DRV_DATA,
-        }, {
-                .name           = "s3c6400-uart",
-                .driver_data    = S3C6400_SERIAL_DRV_DATA,
-        }, {
-                .name           = "s5pv210-uart",
-                .driver_data    = S5PV210_SERIAL_DRV_DATA,
-        }, {
-                .name           = "exynos4210-uart",
-                .driver_data    = EXYNOS4210_SERIAL_DRV_DATA,
-        },
-        { },
-};
-MODULE_DEVICE_TABLE(platform, s3c24xx_serial_driver_ids);
-
-#ifdef CONFIG_OF
-static const struct of_device_id s3c24xx_uart_dt_match[] = {
-        { .compatible = "samsung,s3c2410-uart",
-                .data = (void *)S3C2410_SERIAL_DRV_DATA },
-        { .compatible = "samsung,s3c2412-uart",
-                .data = (void *)S3C2412_SERIAL_DRV_DATA },
-        { .compatible = "samsung,s3c2440-uart",
-                .data = (void *)S3C2440_SERIAL_DRV_DATA },
-        { .compatible = "samsung,s3c6400-uart",
-                .data = (void *)S3C6400_SERIAL_DRV_DATA },
-        { .compatible = "samsung,s5pv210-uart",
-                .data = (void *)S5PV210_SERIAL_DRV_DATA },
-        { .compatible = "samsung,exynos4210-uart",
-                .data = (void *)EXYNOS4210_SERIAL_DRV_DATA },
-        {},
-};
-MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
-#else
-#define s3c24xx_uart_dt_match NULL
-#endif
+int s3c24xx_serial_initconsole(struct platform_driver *drv,
+                               struct s3c24xx_uart_info **info)
 
-static struct platform_driver samsung_serial_driver = {
-        .probe          = s3c24xx_serial_probe,
-        .remove         = s3c24xx_serial_remove,
-        .id_table       = s3c24xx_serial_driver_ids,
-        .driver         = {
-                .name   = "samsung-uart",
-                .owner  = THIS_MODULE,
-                .pm     = SERIAL_SAMSUNG_PM_OPS,
-                .of_match_table = s3c24xx_uart_dt_match,
-        },
-};
+{
+        struct platform_device *dev = s3c24xx_uart_devs[0];
 
-/* module initialisation code */
+        dbg("s3c24xx_serial_initconsole\n");
 
-static int __init s3c24xx_serial_modinit(void)
-{
-        int ret;
+        /* select driver based on the cpu */
 
-        ret = uart_register_driver(&s3c24xx_uart_drv);
-        if (ret < 0) {
-                pr_err("Failed to register Samsung UART driver\n");
-                return ret;
+        if (dev == NULL) {
+                printk(KERN_ERR "s3c24xx: no devices for console init\n");
+                return 0;
         }
 
-        return platform_driver_register(&samsung_serial_driver);
-}
+        if (strcmp(dev->name, drv->driver.name) != 0)
+                return 0;
 
-static void __exit s3c24xx_serial_modexit(void)
-{
-        uart_unregister_driver(&s3c24xx_uart_drv);
+        s3c24xx_serial_console.data = &s3c24xx_uart_drv;
+        s3c24xx_serial_init_ports(info);
+
+        register_console(&s3c24xx_serial_console);
+        return 0;
 }
 
-module_init(s3c24xx_serial_modinit);
-module_exit(s3c24xx_serial_modexit);
+#endif /* CONFIG_SERIAL_SAMSUNG_CONSOLE */
 
-MODULE_ALIAS("platform:samsung-uart");
 MODULE_DESCRIPTION("Samsung SoC Serial port driver");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/samsung.h b/drivers/tty/serial/samsung.h
index 1a4bca3e417..a69d9a54be9 100644
--- a/drivers/tty/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
@@ -19,25 +19,20 @@ struct s3c24xx_uart_info {
         unsigned long           tx_fifomask;
         unsigned long           tx_fifoshift;
         unsigned long           tx_fifofull;
-        unsigned int            def_clk_sel;
-        unsigned long           num_clks;
-        unsigned long           clksel_mask;
-        unsigned long           clksel_shift;
 
         /* uart port features */
 
         unsigned int            has_divslot:1;
 
+        /* 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_serial_drv_data {
-        struct s3c24xx_uart_info        *info;
-        struct s3c2410_uartcfg          *def_cfg;
-        unsigned int                    fifosize[CONFIG_SERIAL_SAMSUNG_UARTS];
-};
-
 struct s3c24xx_uart_port {
         unsigned char                   rx_claimed;
         unsigned char                   tx_claimed;
@@ -48,13 +43,10 @@ struct s3c24xx_uart_port {
         unsigned int                    tx_irq;
 
         struct s3c24xx_uart_info        *info;
+        struct s3c24xx_uart_clksrc      *clksrc;
         struct clk                      *clk;
         struct clk                      *baudclk;
         struct uart_port                port;
-        struct s3c24xx_serial_drv_data  *drv_data;
-
-        /* reference to platform data */
-        struct s3c2410_uartcfg          *cfg;
 
 #ifdef CONFIG_CPU_FREQ
         struct notifier_block           freq_transition;
@@ -64,11 +56,11 @@ struct s3c24xx_uart_port {
 /* 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)
 
 /* register access controls */
 
 #define portaddr(port, reg) ((port)->membase + (reg))
-#define portaddrl(port, reg) ((unsigned long *)((port)->membase + (reg)))
 
 #define rd_regb(port, reg) (__raw_readb(portaddr(port, reg)))
 #define rd_regl(port, reg) (__raw_readl(portaddr(port, reg)))
@@ -76,6 +68,17 @@ struct s3c24xx_uart_port {
 #define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg))
 #define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg))
 
+extern int s3c24xx_serial_probe(struct platform_device *dev,
+                                struct s3c24xx_uart_info *uart);
+
+extern int __devexit s3c24xx_serial_remove(struct platform_device *dev);
+
+extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
+                                      struct s3c24xx_uart_info **uart);
+
+extern int s3c24xx_serial_init(struct platform_driver *drv,
+                               struct s3c24xx_uart_info *info);
+
 #ifdef CONFIG_SERIAL_SAMSUNG_DEBUG
 
 extern void printascii(const char *);
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index f76b1688c5c..6bc2e3f876f 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -31,14 +31,12 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/major.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/spinlock.h>
 #include <linux/sysrq.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/types.h>
 
 #include <linux/atomic.h>
diff --git a/drivers/tty/serial/sc26xx.c b/drivers/tty/serial/sc26xx.c
index aced1dd923d..75038ad2b24 100644
--- a/drivers/tty/serial/sc26xx.c
+++ b/drivers/tty/serial/sc26xx.c
@@ -20,10 +20,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
-#include <linux/io.h>
-
-#warning "Please try migrate to use new driver SCCNXP and report the status" \
-         "in the linux-serial mailing list."
 
 #if defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -621,7 +617,7 @@ static u8 sc26xx_flags2mask(unsigned int flags, unsigned int bitpos)
         return bit ? (1 << (bit - 1)) : 0;
 }
 
-static void sc26xx_init_masks(struct uart_sc26xx_port *up,
+static void __devinit sc26xx_init_masks(struct uart_sc26xx_port *up,
                                         int line, unsigned int data)
 {
         up->dtr_mask[line] = sc26xx_flags2mask(data,  0);
@@ -632,7 +628,7 @@ static void sc26xx_init_masks(struct uart_sc26xx_port *up,
         up->ri_mask[line]  = sc26xx_flags2mask(data, 20);
 }
 
-static int sc26xx_probe(struct platform_device *dev)
+static int __devinit sc26xx_probe(struct platform_device *dev)
 {
         struct resource *res;
         struct uart_sc26xx_port *up;
@@ -733,14 +729,26 @@ static int __exit sc26xx_driver_remove(struct platform_device *dev)
 
 static struct platform_driver sc26xx_driver = {
         .probe  = sc26xx_probe,
-        .remove = sc26xx_driver_remove,
+        .remove = __devexit_p(sc26xx_driver_remove),
         .driver = {
                 .name   = "SC26xx",
                 .owner  = THIS_MODULE,
         },
 };
 
-module_platform_driver(sc26xx_driver);
+static int __init sc26xx_init(void)
+{
+        return platform_driver_register(&sc26xx_driver);
+}
+
+static void __exit sc26xx_exit(void)
+{
+        platform_driver_unregister(&sc26xx_driver);
+}
+
+module_init(sc26xx_init);
+module_exit(sc26xx_exit);
+
 
 MODULE_AUTHOR("Thomas Bogendörfer");
 MODULE_DESCRIPTION("SC681/SC2692 serial driver");
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
deleted file mode 100644
index 418b495e323..00000000000
--- a/drivers/tty/serial/sccnxp.c
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
- *  NXP (Philips) SCC+++(SCN+++) serial driver
- *
- *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
- *
- *  Based on sc26xx.c, by Thomas Bogendörfer (tsbogend@alpha.franken.de)
- *
- * 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.
- */
-
-#if defined(CONFIG_SERIAL_SCCNXP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/console.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/io.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/sccnxp.h>
-
-#define SCCNXP_NAME                     "uart-sccnxp"
-#define SCCNXP_MAJOR                    204
-#define SCCNXP_MINOR                    205
-
-#define SCCNXP_MR_REG                   (0x00)
-#       define MR0_BAUD_NORMAL          (0 << 0)
-#       define MR0_BAUD_EXT1            (1 << 0)
-#       define MR0_BAUD_EXT2            (5 << 0)
-#       define MR0_FIFO                 (1 << 3)
-#       define MR0_TXLVL                (1 << 4)
-#       define MR1_BITS_5               (0 << 0)
-#       define MR1_BITS_6               (1 << 0)
-#       define MR1_BITS_7               (2 << 0)
-#       define MR1_BITS_8               (3 << 0)
-#       define MR1_PAR_EVN              (0 << 2)
-#       define MR1_PAR_ODD              (1 << 2)
-#       define MR1_PAR_NO               (4 << 2)
-#       define MR2_STOP1                (7 << 0)
-#       define MR2_STOP2                (0xf << 0)
-#define SCCNXP_SR_REG                   (0x01)
-#define SCCNXP_CSR_REG                  SCCNXP_SR_REG
-#       define SR_RXRDY                 (1 << 0)
-#       define SR_FULL                  (1 << 1)
-#       define SR_TXRDY                 (1 << 2)
-#       define SR_TXEMT                 (1 << 3)
-#       define SR_OVR                   (1 << 4)
-#       define SR_PE                    (1 << 5)
-#       define SR_FE                    (1 << 6)
-#       define SR_BRK                   (1 << 7)
-#define SCCNXP_CR_REG                   (0x02)
-#       define CR_RX_ENABLE             (1 << 0)
-#       define CR_RX_DISABLE            (1 << 1)
-#       define CR_TX_ENABLE             (1 << 2)
-#       define CR_TX_DISABLE            (1 << 3)
-#       define CR_CMD_MRPTR1            (0x01 << 4)
-#       define CR_CMD_RX_RESET          (0x02 << 4)
-#       define CR_CMD_TX_RESET          (0x03 << 4)
-#       define CR_CMD_STATUS_RESET      (0x04 << 4)
-#       define CR_CMD_BREAK_RESET       (0x05 << 4)
-#       define CR_CMD_START_BREAK       (0x06 << 4)
-#       define CR_CMD_STOP_BREAK        (0x07 << 4)
-#       define CR_CMD_MRPTR0            (0x0b << 4)
-#define SCCNXP_RHR_REG                  (0x03)
-#define SCCNXP_THR_REG                  SCCNXP_RHR_REG
-#define SCCNXP_IPCR_REG                 (0x04)
-#define SCCNXP_ACR_REG                  SCCNXP_IPCR_REG
-#       define ACR_BAUD0                (0 << 7)
-#       define ACR_BAUD1                (1 << 7)
-#       define ACR_TIMER_MODE           (6 << 4)
-#define SCCNXP_ISR_REG                  (0x05)
-#define SCCNXP_IMR_REG                  SCCNXP_ISR_REG
-#       define IMR_TXRDY                (1 << 0)
-#       define IMR_RXRDY                (1 << 1)
-#       define ISR_TXRDY(x)             (1 << ((x * 4) + 0))
-#       define ISR_RXRDY(x)             (1 << ((x * 4) + 1))
-#define SCCNXP_IPR_REG                  (0x0d)
-#define SCCNXP_OPCR_REG                 SCCNXP_IPR_REG
-#define SCCNXP_SOP_REG                  (0x0e)
-#define SCCNXP_ROP_REG                  (0x0f)
-
-/* Route helpers */
-#define MCTRL_MASK(sig)                 (0xf << (sig))
-#define MCTRL_IBIT(cfg, sig)            ((((cfg) >> (sig)) & 0xf) - LINE_IP0)
-#define MCTRL_OBIT(cfg, sig)            ((((cfg) >> (sig)) & 0xf) - LINE_OP0)
-
-/* Supported chip types */
-enum {
-        SCCNXP_TYPE_SC2681      = 2681,
-        SCCNXP_TYPE_SC2691      = 2691,
-        SCCNXP_TYPE_SC2692      = 2692,
-        SCCNXP_TYPE_SC2891      = 2891,
-        SCCNXP_TYPE_SC2892      = 2892,
-        SCCNXP_TYPE_SC28202     = 28202,
-        SCCNXP_TYPE_SC68681     = 68681,
-        SCCNXP_TYPE_SC68692     = 68692,
-};
-
-struct sccnxp_port {
-        struct uart_driver      uart;
-        struct uart_port        port[SCCNXP_MAX_UARTS];
-
-        const char              *name;
-        int                     irq;
-
-        u8                      imr;
-        u8                      addr_mask;
-        int                     freq_std;
-
-        int                     flags;
-#define SCCNXP_HAVE_IO          0x00000001
-#define SCCNXP_HAVE_MR0         0x00000002
-
-#ifdef CONFIG_SERIAL_SCCNXP_CONSOLE
-        struct console          console;
-#endif
-
-        struct mutex            sccnxp_mutex;
-
-        struct sccnxp_pdata     pdata;
-};
-
-static inline u8 sccnxp_raw_read(void __iomem *base, u8 reg, u8 shift)
-{
-        return readb(base + (reg << shift));
-}
-
-static inline void sccnxp_raw_write(void __iomem *base, u8 reg, u8 shift, u8 v)
-{
-        writeb(v, base + (reg << shift));
-}
-
-static inline u8 sccnxp_read(struct uart_port *port, u8 reg)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        return sccnxp_raw_read(port->membase, reg & s->addr_mask,
-                               port->regshift);
-}
-
-static inline void sccnxp_write(struct uart_port *port, u8 reg, u8 v)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        sccnxp_raw_write(port->membase, reg & s->addr_mask, port->regshift, v);
-}
-
-static inline u8 sccnxp_port_read(struct uart_port *port, u8 reg)
-{
-        return sccnxp_read(port, (port->line << 3) + reg);
-}
-
-static inline void sccnxp_port_write(struct uart_port *port, u8 reg, u8 v)
-{
-        sccnxp_write(port, (port->line << 3) + reg, v);
-}
-
-static int sccnxp_update_best_err(int a, int b, int *besterr)
-{
-        int err = abs(a - b);
-
-        if ((*besterr < 0) || (*besterr > err)) {
-                *besterr = err;
-                return 0;
-        }
-
-        return 1;
-}
-
-struct baud_table {
-        u8      csr;
-        u8      acr;
-        u8      mr0;
-        int     baud;
-};
-
-const struct baud_table baud_std[] = {
-        { 0,    ACR_BAUD0,      MR0_BAUD_NORMAL,        50, },
-        { 0,    ACR_BAUD1,      MR0_BAUD_NORMAL,        75, },
-        { 1,    ACR_BAUD0,      MR0_BAUD_NORMAL,        110, },
-        { 2,    ACR_BAUD0,      MR0_BAUD_NORMAL,        134, },
-        { 3,    ACR_BAUD1,      MR0_BAUD_NORMAL,        150, },
-        { 3,    ACR_BAUD0,      MR0_BAUD_NORMAL,        200, },
-        { 4,    ACR_BAUD0,      MR0_BAUD_NORMAL,        300, },
-        { 0,    ACR_BAUD1,      MR0_BAUD_EXT1,          450, },
-        { 1,    ACR_BAUD0,      MR0_BAUD_EXT2,          880, },
-        { 3,    ACR_BAUD1,      MR0_BAUD_EXT1,          900, },
-        { 5,    ACR_BAUD0,      MR0_BAUD_NORMAL,        600, },
-        { 7,    ACR_BAUD0,      MR0_BAUD_NORMAL,        1050, },
-        { 2,    ACR_BAUD0,      MR0_BAUD_EXT2,          1076, },
-        { 6,    ACR_BAUD0,      MR0_BAUD_NORMAL,        1200, },
-        { 10,   ACR_BAUD1,      MR0_BAUD_NORMAL,        1800, },
-        { 7,    ACR_BAUD1,      MR0_BAUD_NORMAL,        2000, },
-        { 8,    ACR_BAUD0,      MR0_BAUD_NORMAL,        2400, },
-        { 5,    ACR_BAUD1,      MR0_BAUD_EXT1,          3600, },
-        { 9,    ACR_BAUD0,      MR0_BAUD_NORMAL,        4800, },
-        { 10,   ACR_BAUD0,      MR0_BAUD_NORMAL,        7200, },
-        { 11,   ACR_BAUD0,      MR0_BAUD_NORMAL,        9600, },
-        { 8,    ACR_BAUD0,      MR0_BAUD_EXT1,          14400, },
-        { 12,   ACR_BAUD1,      MR0_BAUD_NORMAL,        19200, },
-        { 9,    ACR_BAUD0,      MR0_BAUD_EXT1,          28800, },
-        { 12,   ACR_BAUD0,      MR0_BAUD_NORMAL,        38400, },
-        { 11,   ACR_BAUD0,      MR0_BAUD_EXT1,          57600, },
-        { 12,   ACR_BAUD1,      MR0_BAUD_EXT1,          115200, },
-        { 12,   ACR_BAUD0,      MR0_BAUD_EXT1,          230400, },
-        { 0, 0, 0, 0 }
-};
-
-static int sccnxp_set_baud(struct uart_port *port, int baud)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-        int div_std, tmp_baud, bestbaud = baud, besterr = -1;
-        u8 i, acr = 0, csr = 0, mr0 = 0;
-
-        /* Find best baud from table */
-        for (i = 0; baud_std[i].baud && besterr; i++) {
-                if (baud_std[i].mr0 && !(s->flags & SCCNXP_HAVE_MR0))
-                        continue;
-                div_std = DIV_ROUND_CLOSEST(s->freq_std, baud_std[i].baud);
-                tmp_baud = DIV_ROUND_CLOSEST(port->uartclk, div_std);
-                if (!sccnxp_update_best_err(baud, tmp_baud, &besterr)) {
-                        acr = baud_std[i].acr;
-                        csr = baud_std[i].csr;
-                        mr0 = baud_std[i].mr0;
-                        bestbaud = tmp_baud;
-                }
-        }
-
-        if (s->flags & SCCNXP_HAVE_MR0) {
-                /* Enable FIFO, set half level for TX */
-                mr0 |= MR0_FIFO | MR0_TXLVL;
-                /* Update MR0 */
-                sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_MRPTR0);
-                sccnxp_port_write(port, SCCNXP_MR_REG, mr0);
-        }
-
-        sccnxp_port_write(port, SCCNXP_ACR_REG, acr | ACR_TIMER_MODE);
-        sccnxp_port_write(port, SCCNXP_CSR_REG, (csr << 4) | csr);
-
-        if (baud != bestbaud)
-                dev_dbg(port->dev, "Baudrate desired: %i, calculated: %i\n",
-                        baud, bestbaud);
-
-        return bestbaud;
-}
-
-static void sccnxp_enable_irq(struct uart_port *port, int mask)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        s->imr |= mask << (port->line * 4);
-        sccnxp_write(port, SCCNXP_IMR_REG, s->imr);
-}
-
-static void sccnxp_disable_irq(struct uart_port *port, int mask)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        s->imr &= ~(mask << (port->line * 4));
-        sccnxp_write(port, SCCNXP_IMR_REG, s->imr);
-}
-
-static void sccnxp_set_bit(struct uart_port *port, int sig, int state)
-{
-        u8 bitmask;
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        if (s->pdata.mctrl_cfg[port->line] & MCTRL_MASK(sig)) {
-                bitmask = 1 << MCTRL_OBIT(s->pdata.mctrl_cfg[port->line], sig);
-                if (state)
-                        sccnxp_write(port, SCCNXP_SOP_REG, bitmask);
-                else
-                        sccnxp_write(port, SCCNXP_ROP_REG, bitmask);
-        }
-}
-
-static void sccnxp_handle_rx(struct uart_port *port)
-{
-        u8 sr;
-        unsigned int ch, flag;
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
-
-        if (!tty)
-                return;
-
-        for (;;) {
-                sr = sccnxp_port_read(port, SCCNXP_SR_REG);
-                if (!(sr & SR_RXRDY))
-                        break;
-                sr &= SR_PE | SR_FE | SR_OVR | SR_BRK;
-
-                ch = sccnxp_port_read(port, SCCNXP_RHR_REG);
-
-                port->icount.rx++;
-                flag = TTY_NORMAL;
-
-                if (unlikely(sr)) {
-                        if (sr & SR_BRK) {
-                                port->icount.brk++;
-                                if (uart_handle_break(port))
-                                        continue;
-                        } else if (sr & SR_PE)
-                                port->icount.parity++;
-                        else if (sr & SR_FE)
-                                port->icount.frame++;
-                        else if (sr & SR_OVR)
-                                port->icount.overrun++;
-
-                        sr &= port->read_status_mask;
-                        if (sr & SR_BRK)
-                                flag = TTY_BREAK;
-                        else if (sr & SR_PE)
-                                flag = TTY_PARITY;
-                        else if (sr & SR_FE)
-                                flag = TTY_FRAME;
-                        else if (sr & SR_OVR)
-                                flag = TTY_OVERRUN;
-                }
-
-                if (uart_handle_sysrq_char(port, ch))
-                        continue;
-
-                if (sr & port->ignore_status_mask)
-                        continue;
-
-                uart_insert_char(port, sr, SR_OVR, ch, flag);
-        }
-
-        tty_flip_buffer_push(tty);
-
-        tty_kref_put(tty);
-}
-
-static void sccnxp_handle_tx(struct uart_port *port)
-{
-        u8 sr;
-        struct circ_buf *xmit = &port->state->xmit;
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        if (unlikely(port->x_char)) {
-                sccnxp_port_write(port, SCCNXP_THR_REG, port->x_char);
-                port->icount.tx++;
-                port->x_char = 0;
-                return;
-        }
-
-        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                /* Disable TX if FIFO is empty */
-                if (sccnxp_port_read(port, SCCNXP_SR_REG) & SR_TXEMT) {
-                        sccnxp_disable_irq(port, IMR_TXRDY);
-
-                        /* Set direction to input */
-                        if (s->flags & SCCNXP_HAVE_IO)
-                                sccnxp_set_bit(port, DIR_OP, 0);
-                }
-                return;
-        }
-
-        while (!uart_circ_empty(xmit)) {
-                sr = sccnxp_port_read(port, SCCNXP_SR_REG);
-                if (!(sr & SR_TXRDY))
-                        break;
-
-                sccnxp_port_write(port, SCCNXP_THR_REG, 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);
-}
-
-static irqreturn_t sccnxp_ist(int irq, void *dev_id)
-{
-        int i;
-        u8 isr;
-        struct sccnxp_port *s = (struct sccnxp_port *)dev_id;
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        for (;;) {
-                isr = sccnxp_read(&s->port[0], SCCNXP_ISR_REG);
-                isr &= s->imr;
-                if (!isr)
-                        break;
-
-                dev_dbg(s->port[0].dev, "IRQ status: 0x%02x\n", isr);
-
-                for (i = 0; i < s->uart.nr; i++) {
-                        if (isr & ISR_RXRDY(i))
-                                sccnxp_handle_rx(&s->port[i]);
-                        if (isr & ISR_TXRDY(i))
-                                sccnxp_handle_tx(&s->port[i]);
-                }
-        }
-
-        mutex_unlock(&s->sccnxp_mutex);
-
-        return IRQ_HANDLED;
-}
-
-static void sccnxp_start_tx(struct uart_port *port)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        /* Set direction to output */
-        if (s->flags & SCCNXP_HAVE_IO)
-                sccnxp_set_bit(port, DIR_OP, 1);
-
-        sccnxp_enable_irq(port, IMR_TXRDY);
-
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static void sccnxp_stop_tx(struct uart_port *port)
-{
-        /* Do nothing */
-}
-
-static void sccnxp_stop_rx(struct uart_port *port)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        mutex_lock(&s->sccnxp_mutex);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_RX_DISABLE);
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static unsigned int sccnxp_tx_empty(struct uart_port *port)
-{
-        u8 val;
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        mutex_lock(&s->sccnxp_mutex);
-        val = sccnxp_port_read(port, SCCNXP_SR_REG);
-        mutex_unlock(&s->sccnxp_mutex);
-
-        return (val & SR_TXEMT) ? TIOCSER_TEMT : 0;
-}
-
-static void sccnxp_enable_ms(struct uart_port *port)
-{
-        /* Do nothing */
-}
-
-static void sccnxp_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        if (!(s->flags & SCCNXP_HAVE_IO))
-                return;
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        sccnxp_set_bit(port, DTR_OP, mctrl & TIOCM_DTR);
-        sccnxp_set_bit(port, RTS_OP, mctrl & TIOCM_RTS);
-
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static unsigned int sccnxp_get_mctrl(struct uart_port *port)
-{
-        u8 bitmask, ipr;
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-        unsigned int mctrl = TIOCM_DSR | TIOCM_CTS | TIOCM_CAR;
-
-        if (!(s->flags & SCCNXP_HAVE_IO))
-                return mctrl;
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        ipr = ~sccnxp_read(port, SCCNXP_IPCR_REG);
-
-        if (s->pdata.mctrl_cfg[port->line] & MCTRL_MASK(DSR_IP)) {
-                bitmask = 1 << MCTRL_IBIT(s->pdata.mctrl_cfg[port->line],
-                                          DSR_IP);
-                mctrl &= ~TIOCM_DSR;
-                mctrl |= (ipr & bitmask) ? TIOCM_DSR : 0;
-        }
-        if (s->pdata.mctrl_cfg[port->line] & MCTRL_MASK(CTS_IP)) {
-                bitmask = 1 << MCTRL_IBIT(s->pdata.mctrl_cfg[port->line],
-                                          CTS_IP);
-                mctrl &= ~TIOCM_CTS;
-                mctrl |= (ipr & bitmask) ? TIOCM_CTS : 0;
-        }
-        if (s->pdata.mctrl_cfg[port->line] & MCTRL_MASK(DCD_IP)) {
-                bitmask = 1 << MCTRL_IBIT(s->pdata.mctrl_cfg[port->line],
-                                          DCD_IP);
-                mctrl &= ~TIOCM_CAR;
-                mctrl |= (ipr & bitmask) ? TIOCM_CAR : 0;
-        }
-        if (s->pdata.mctrl_cfg[port->line] & MCTRL_MASK(RNG_IP)) {
-                bitmask = 1 << MCTRL_IBIT(s->pdata.mctrl_cfg[port->line],
-                                          RNG_IP);
-                mctrl &= ~TIOCM_RNG;
-                mctrl |= (ipr & bitmask) ? TIOCM_RNG : 0;
-        }
-
-        mutex_unlock(&s->sccnxp_mutex);
-
-        return mctrl;
-}
-
-static void sccnxp_break_ctl(struct uart_port *port, int break_state)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        mutex_lock(&s->sccnxp_mutex);
-        sccnxp_port_write(port, SCCNXP_CR_REG, break_state ?
-                          CR_CMD_START_BREAK : CR_CMD_STOP_BREAK);
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static void sccnxp_set_termios(struct uart_port *port,
-                               struct ktermios *termios, struct ktermios *old)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-        u8 mr1, mr2;
-        int baud;
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        /* Mask termios capabilities we don't support */
-        termios->c_cflag &= ~CMSPAR;
-
-        /* Disable RX & TX, reset break condition, status and FIFOs */
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_RX_RESET |
-                                               CR_RX_DISABLE | CR_TX_DISABLE);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_TX_RESET);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_STATUS_RESET);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_BREAK_RESET);
-
-        /* Word size */
-        switch (termios->c_cflag & CSIZE) {
-        case CS5:
-                mr1 = MR1_BITS_5;
-                break;
-        case CS6:
-                mr1 = MR1_BITS_6;
-                break;
-        case CS7:
-                mr1 = MR1_BITS_7;
-                break;
-        case CS8:
-        default:
-                mr1 = MR1_BITS_8;
-                break;
-        }
-
-        /* Parity */
-        if (termios->c_cflag & PARENB) {
-                if (termios->c_cflag & PARODD)
-                        mr1 |= MR1_PAR_ODD;
-        } else
-                mr1 |= MR1_PAR_NO;
-
-        /* Stop bits */
-        mr2 = (termios->c_cflag & CSTOPB) ? MR2_STOP2 : MR2_STOP1;
-
-        /* Update desired format */
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_MRPTR1);
-        sccnxp_port_write(port, SCCNXP_MR_REG, mr1);
-        sccnxp_port_write(port, SCCNXP_MR_REG, mr2);
-
-        /* Set read status mask */
-        port->read_status_mask = SR_OVR;
-        if (termios->c_iflag & INPCK)
-                port->read_status_mask |= SR_PE | SR_FE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= SR_BRK;
-
-        /* Set status ignore mask */
-        port->ignore_status_mask = 0;
-        if (termios->c_iflag & IGNBRK)
-                port->ignore_status_mask |= SR_BRK;
-        if (!(termios->c_cflag & CREAD))
-                port->ignore_status_mask |= SR_PE | SR_OVR | SR_FE | SR_BRK;
-
-        /* Setup baudrate */
-        baud = uart_get_baud_rate(port, termios, old, 50,
-                                  (s->flags & SCCNXP_HAVE_MR0) ?
-                                  230400 : 38400);
-        baud = sccnxp_set_baud(port, baud);
-
-        /* Update timeout according to new baud rate */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
-        if (tty_termios_baud_rate(termios))
-                tty_termios_encode_baud_rate(termios, baud, baud);
-
-        /* Enable RX & TX */
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_RX_ENABLE | CR_TX_ENABLE);
-
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static int sccnxp_startup(struct uart_port *port)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        if (s->flags & SCCNXP_HAVE_IO) {
-                /* Outputs are controlled manually */
-                sccnxp_write(port, SCCNXP_OPCR_REG, 0);
-        }
-
-        /* Reset break condition, status and FIFOs */
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_RX_RESET);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_TX_RESET);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_STATUS_RESET);
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_CMD_BREAK_RESET);
-
-        /* Enable RX & TX */
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_RX_ENABLE | CR_TX_ENABLE);
-
-        /* Enable RX interrupt */
-        sccnxp_enable_irq(port, IMR_RXRDY);
-
-        mutex_unlock(&s->sccnxp_mutex);
-
-        return 0;
-}
-
-static void sccnxp_shutdown(struct uart_port *port)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        mutex_lock(&s->sccnxp_mutex);
-
-        /* Disable interrupts */
-        sccnxp_disable_irq(port, IMR_TXRDY | IMR_RXRDY);
-
-        /* Disable TX & RX */
-        sccnxp_port_write(port, SCCNXP_CR_REG, CR_RX_DISABLE | CR_TX_DISABLE);
-
-        /* Leave direction to input */
-        if (s->flags & SCCNXP_HAVE_IO)
-                sccnxp_set_bit(port, DIR_OP, 0);
-
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static const char *sccnxp_type(struct uart_port *port)
-{
-        struct sccnxp_port *s = dev_get_drvdata(port->dev);
-
-        return (port->type == PORT_SC26XX) ? s->name : NULL;
-}
-
-static void sccnxp_release_port(struct uart_port *port)
-{
-        /* Do nothing */
-}
-
-static int sccnxp_request_port(struct uart_port *port)
-{
-        /* Do nothing */
-        return 0;
-}
-
-static void sccnxp_config_port(struct uart_port *port, int flags)
-{
-        if (flags & UART_CONFIG_TYPE)
-                port->type = PORT_SC26XX;
-}
-
-static int sccnxp_verify_port(struct uart_port *port, struct serial_struct *s)
-{
-        if ((s->type == PORT_UNKNOWN) || (s->type == PORT_SC26XX))
-                return 0;
-        if (s->irq == port->irq)
-                return 0;
-
-        return -EINVAL;
-}
-
-static const struct uart_ops sccnxp_ops = {
-        .tx_empty       = sccnxp_tx_empty,
-        .set_mctrl      = sccnxp_set_mctrl,
-        .get_mctrl      = sccnxp_get_mctrl,
-        .stop_tx        = sccnxp_stop_tx,
-        .start_tx       = sccnxp_start_tx,
-        .stop_rx        = sccnxp_stop_rx,
-        .enable_ms      = sccnxp_enable_ms,
-        .break_ctl      = sccnxp_break_ctl,
-        .startup        = sccnxp_startup,
-        .shutdown       = sccnxp_shutdown,
-        .set_termios    = sccnxp_set_termios,
-        .type           = sccnxp_type,
-        .release_port   = sccnxp_release_port,
-        .request_port   = sccnxp_request_port,
-        .config_port    = sccnxp_config_port,
-        .verify_port    = sccnxp_verify_port,
-};
-
-#ifdef CONFIG_SERIAL_SCCNXP_CONSOLE
-static void sccnxp_console_putchar(struct uart_port *port, int c)
-{
-        int tryes = 100000;
-
-        while (tryes--) {
-                if (sccnxp_port_read(port, SCCNXP_SR_REG) & SR_TXRDY) {
-                        sccnxp_port_write(port, SCCNXP_THR_REG, c);
-                        break;
-                }
-                barrier();
-        }
-}
-
-static void sccnxp_console_write(struct console *co, const char *c, unsigned n)
-{
-        struct sccnxp_port *s = (struct sccnxp_port *)co->data;
-        struct uart_port *port = &s->port[co->index];
-
-        mutex_lock(&s->sccnxp_mutex);
-        uart_console_write(port, c, n, sccnxp_console_putchar);
-        mutex_unlock(&s->sccnxp_mutex);
-}
-
-static int sccnxp_console_setup(struct console *co, char *options)
-{
-        struct sccnxp_port *s = (struct sccnxp_port *)co->data;
-        struct uart_port *port = &s->port[(co->index > 0) ? co->index : 0];
-        int baud = 9600, bits = 8, parity = 'n', flow = 'n';
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-#endif
-
-static int sccnxp_probe(struct platform_device *pdev)
-{
-        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        int chiptype = pdev->id_entry->driver_data;
-        struct sccnxp_pdata *pdata = dev_get_platdata(&pdev->dev);
-        int i, ret, fifosize, freq_min, freq_max;
-        struct sccnxp_port *s;
-        void __iomem *membase;
-
-        if (!res) {
-                dev_err(&pdev->dev, "Missing memory resource data\n");
-                return -EADDRNOTAVAIL;
-        }
-
-        dev_set_name(&pdev->dev, SCCNXP_NAME);
-
-        s = devm_kzalloc(&pdev->dev, sizeof(struct sccnxp_port), GFP_KERNEL);
-        if (!s) {
-                dev_err(&pdev->dev, "Error allocating port structure\n");
-                return -ENOMEM;
-        }
-        platform_set_drvdata(pdev, s);
-
-        mutex_init(&s->sccnxp_mutex);
-
-        /* Individual chip settings */
-        switch (chiptype) {
-        case SCCNXP_TYPE_SC2681:
-                s->name         = "SC2681";
-                s->uart.nr      = 2;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x0f;
-                s->flags        = SCCNXP_HAVE_IO;
-                fifosize        = 3;
-                freq_min        = 1000000;
-                freq_max        = 4000000;
-                break;
-        case SCCNXP_TYPE_SC2691:
-                s->name         = "SC2691";
-                s->uart.nr      = 1;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x07;
-                s->flags        = 0;
-                fifosize        = 3;
-                freq_min        = 1000000;
-                freq_max        = 4000000;
-                break;
-        case SCCNXP_TYPE_SC2692:
-                s->name         = "SC2692";
-                s->uart.nr      = 2;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x0f;
-                s->flags        = SCCNXP_HAVE_IO;
-                fifosize        = 3;
-                freq_min        = 1000000;
-                freq_max        = 4000000;
-                break;
-        case SCCNXP_TYPE_SC2891:
-                s->name         = "SC2891";
-                s->uart.nr      = 1;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x0f;
-                s->flags        = SCCNXP_HAVE_IO | SCCNXP_HAVE_MR0;
-                fifosize        = 16;
-                freq_min        = 100000;
-                freq_max        = 8000000;
-                break;
-        case SCCNXP_TYPE_SC2892:
-                s->name         = "SC2892";
-                s->uart.nr      = 2;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x0f;
-                s->flags        = SCCNXP_HAVE_IO | SCCNXP_HAVE_MR0;
-                fifosize        = 16;
-                freq_min        = 100000;
-                freq_max        = 8000000;
-                break;
-        case SCCNXP_TYPE_SC28202:
-                s->name         = "SC28202";
-                s->uart.nr      = 2;
-                s->freq_std     = 14745600;
-                s->addr_mask    = 0x7f;
-                s->flags        = SCCNXP_HAVE_IO | SCCNXP_HAVE_MR0;
-                fifosize        = 256;
-                freq_min        = 1000000;
-                freq_max        = 50000000;
-                break;
-        case SCCNXP_TYPE_SC68681:
-                s->name         = "SC68681";
-                s->uart.nr      = 2;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x0f;
-                s->flags        = SCCNXP_HAVE_IO;
-                fifosize        = 3;
-                freq_min        = 1000000;
-                freq_max        = 4000000;
-                break;
-        case SCCNXP_TYPE_SC68692:
-                s->name         = "SC68692";
-                s->uart.nr      = 2;
-                s->freq_std     = 3686400;
-                s->addr_mask    = 0x0f;
-                s->flags        = SCCNXP_HAVE_IO;
-                fifosize        = 3;
-                freq_min        = 1000000;
-                freq_max        = 4000000;
-                break;
-        default:
-                dev_err(&pdev->dev, "Unsupported chip type %i\n", chiptype);
-                ret = -ENOTSUPP;
-                goto err_out;
-        }
-
-        if (!pdata) {
-                dev_warn(&pdev->dev,
-                         "No platform data supplied, using defaults\n");
-                s->pdata.frequency = s->freq_std;
-        } else
-                memcpy(&s->pdata, pdata, sizeof(struct sccnxp_pdata));
-
-        s->irq = platform_get_irq(pdev, 0);
-        if (s->irq <= 0) {
-                dev_err(&pdev->dev, "Missing irq resource data\n");
-                ret = -ENXIO;
-                goto err_out;
-        }
-
-        /* Check input frequency */
-        if ((s->pdata.frequency < freq_min) ||
-            (s->pdata.frequency > freq_max)) {
-                dev_err(&pdev->dev, "Frequency out of bounds\n");
-                ret = -EINVAL;
-                goto err_out;
-        }
-
-        membase = devm_request_and_ioremap(&pdev->dev, res);
-        if (!membase) {
-                dev_err(&pdev->dev, "Failed to ioremap\n");
-                ret = -EIO;
-                goto err_out;
-        }
-
-        s->uart.owner           = THIS_MODULE;
-        s->uart.dev_name        = "ttySC";
-        s->uart.major           = SCCNXP_MAJOR;
-        s->uart.minor           = SCCNXP_MINOR;
-#ifdef CONFIG_SERIAL_SCCNXP_CONSOLE
-        s->uart.cons            = &s->console;
-        s->uart.cons->device    = uart_console_device;
-        s->uart.cons->write     = sccnxp_console_write;
-        s->uart.cons->setup     = sccnxp_console_setup;
-        s->uart.cons->flags     = CON_PRINTBUFFER;
-        s->uart.cons->index     = -1;
-        s->uart.cons->data      = s;
-        strcpy(s->uart.cons->name, "ttySC");
-#endif
-        ret = uart_register_driver(&s->uart);
-        if (ret) {
-                dev_err(&pdev->dev, "Registering UART driver failed\n");
-                goto err_out;
-        }
-
-        for (i = 0; i < s->uart.nr; i++) {
-                s->port[i].line         = i;
-                s->port[i].dev          = &pdev->dev;
-                s->port[i].irq          = s->irq;
-                s->port[i].type         = PORT_SC26XX;
-                s->port[i].fifosize     = fifosize;
-                s->port[i].flags        = UPF_SKIP_TEST | UPF_FIXED_TYPE;
-                s->port[i].iotype       = UPIO_MEM;
-                s->port[i].mapbase      = res->start;
-                s->port[i].membase      = membase;
-                s->port[i].regshift     = s->pdata.reg_shift;
-                s->port[i].uartclk      = s->pdata.frequency;
-                s->port[i].ops          = &sccnxp_ops;
-                uart_add_one_port(&s->uart, &s->port[i]);
-                /* Set direction to input */
-                if (s->flags & SCCNXP_HAVE_IO)
-                        sccnxp_set_bit(&s->port[i], DIR_OP, 0);
-        }
-
-        /* Disable interrupts */
-        s->imr = 0;
-        sccnxp_write(&s->port[0], SCCNXP_IMR_REG, 0);
-
-        /* Board specific configure */
-        if (s->pdata.init)
-                s->pdata.init();
-
-        ret = devm_request_threaded_irq(&pdev->dev, s->irq, NULL, sccnxp_ist,
-                                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                        dev_name(&pdev->dev), s);
-        if (!ret)
-                return 0;
-
-        dev_err(&pdev->dev, "Unable to reguest IRQ %i\n", s->irq);
-
-err_out:
-        platform_set_drvdata(pdev, NULL);
-
-        return ret;
-}
-
-static int sccnxp_remove(struct platform_device *pdev)
-{
-        int i;
-        struct sccnxp_port *s = platform_get_drvdata(pdev);
-
-        devm_free_irq(&pdev->dev, s->irq, s);
-
-        for (i = 0; i < s->uart.nr; i++)
-                uart_remove_one_port(&s->uart, &s->port[i]);
-
-        uart_unregister_driver(&s->uart);
-        platform_set_drvdata(pdev, NULL);
-
-        if (s->pdata.exit)
-                s->pdata.exit();
-
-        return 0;
-}
-
-static const struct platform_device_id sccnxp_id_table[] = {
-        { "sc2681",     SCCNXP_TYPE_SC2681 },
-        { "sc2691",     SCCNXP_TYPE_SC2691 },
-        { "sc2692",     SCCNXP_TYPE_SC2692 },
-        { "sc2891",     SCCNXP_TYPE_SC2891 },
-        { "sc2892",     SCCNXP_TYPE_SC2892 },
-        { "sc28202",    SCCNXP_TYPE_SC28202 },
-        { "sc68681",    SCCNXP_TYPE_SC68681 },
-        { "sc68692",    SCCNXP_TYPE_SC68692 },
-        { },
-};
-MODULE_DEVICE_TABLE(platform, sccnxp_id_table);
-
-static struct platform_driver sccnxp_uart_driver = {
-        .driver = {
-                .name   = SCCNXP_NAME,
-                .owner  = THIS_MODULE,
-        },
-        .probe          = sccnxp_probe,
-        .remove         = sccnxp_remove,
-        .id_table       = sccnxp_id_table,
-};
-module_platform_driver(sccnxp_uart_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Alexander Shiyan <shc_work@mail.ru>");
-MODULE_DESCRIPTION("SCCNXP serial driver");
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 2c7230aaefd..681955ac328 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -22,7 +22,6 @@
  */
 #include <linux/module.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/console.h>
@@ -58,11 +57,9 @@ static struct lock_class_key port_lock_key;
 
 static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
                                         struct ktermios *old_termios);
-static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
+static void __uart_wait_until_sent(struct uart_port *port, int timeout);
 static void uart_change_pm(struct uart_state *state, int pm_state);
 
-static void uart_port_shutdown(struct tty_port *port);
-
 /*
  * This routine is used by the interrupt handler to schedule processing in
  * the software interrupt portion of the driver.
@@ -75,7 +72,7 @@ void uart_write_wakeup(struct uart_port *port)
          * closed.  No cookie for you.
          */
         BUG_ON(!state);
-        tty_wakeup(state->port.tty);
+        tasklet_schedule(&state->tlet);
 }
 
 static void uart_stop(struct tty_struct *tty)
@@ -94,6 +91,9 @@ static void __uart_start(struct tty_struct *tty)
         struct uart_state *state = tty->driver_data;
         struct uart_port *port = state->uart_port;
 
+        if (port->ops->wake_peer)
+                port->ops->wake_peer(port);
+
         if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
             !tty->stopped && !tty->hw_stopped)
                 port->ops->start_tx(port);
@@ -110,6 +110,12 @@ static void uart_start(struct tty_struct *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->port.tty);
+}
+
 static inline void
 uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
 {
@@ -131,16 +137,25 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
  * Startup the port.  This will be called once per open.  All calls
  * will be serialised by the per-port mutex.
  */
-static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
-                int init_hw)
+static int uart_startup(struct tty_struct *tty, struct uart_state *state, int init_hw)
 {
         struct uart_port *uport = state->uart_port;
         struct tty_port *port = &state->port;
         unsigned long page;
         int retval = 0;
 
+        if (port->flags & ASYNC_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
+         */
+        set_bit(TTY_IO_ERROR, &tty->flags);
+
         if (uport->type == PORT_UNKNOWN)
-                return 1;
+                return 0;
 
         /*
          * Initialise and allocate the transmit and temporary
@@ -159,7 +174,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
         retval = uport->ops->startup(uport);
         if (retval == 0) {
                 if (uart_console(uport) && uport->cons->cflag) {
-                        tty->termios.c_cflag = uport->cons->cflag;
+                        tty->termios->c_cflag = uport->cons->cflag;
                         uport->cons->cflag = 0;
                 }
                 /*
@@ -172,16 +187,20 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
                          * Setup the RTS and DTR signals once the
                          * port is open and ready to respond.
                          */
-                        if (tty->termios.c_cflag & CBAUD)
+                        if (tty->termios->c_cflag & CBAUD)
                                 uart_set_mctrl(uport, TIOCM_RTS | TIOCM_DTR);
                 }
 
-                if (tty_port_cts_enabled(port)) {
+                if (port->flags & ASYNC_CTS_FLOW) {
                         spin_lock_irq(&uport->lock);
                         if (!(uport->ops->get_mctrl(uport) & TIOCM_CTS))
                                 tty->hw_stopped = 1;
                         spin_unlock_irq(&uport->lock);
                 }
+
+                set_bit(ASYNCB_INITIALIZED, &port->flags);
+
+                clear_bit(TTY_IO_ERROR, &tty->flags);
         }
 
         /*
@@ -190,31 +209,6 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
          * now.
          */
         if (retval && capable(CAP_SYS_ADMIN))
-                return 1;
-
-        return retval;
-}
-
-static int uart_startup(struct tty_struct *tty, struct uart_state *state,
-                int init_hw)
-{
-        struct tty_port *port = &state->port;
-        int retval;
-
-        if (port->flags & ASYNC_INITIALIZED)
-                return 0;
-
-        /*
-         * Set the TTY IO error marker - we will only clear this
-         * once we have successfully opened the port.
-         */
-        set_bit(TTY_IO_ERROR, &tty->flags);
-
-        retval = uart_port_startup(tty, state, init_hw);
-        if (!retval) {
-                set_bit(ASYNCB_INITIALIZED, &port->flags);
-                clear_bit(TTY_IO_ERROR, &tty->flags);
-        } else if (retval > 0)
                 retval = 0;
 
         return retval;
@@ -240,18 +234,33 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
                 /*
                  * Turn off DTR and RTS early.
                  */
-                if (!tty || (tty->termios.c_cflag & HUPCL))
+                if (!tty || (tty->termios->c_cflag & HUPCL))
                         uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
 
-                uart_port_shutdown(port);
+                /*
+                 * 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(&port->delta_msr_wait);
+
+                /*
+                 * Free the IRQ and disable the port.
+                 */
+                uport->ops->shutdown(uport);
+
+                /*
+                 * Ensure that the IRQ handler isn't running on another CPU.
+                 */
+                synchronize_irq(uport->irq);
         }
 
         /*
-         * It's possible for shutdown to be called after suspend if we get
-         * a DCD drop (hangup) at just the right time.  Clear suspended bit so
-         * we don't try to resume a port that has been shutdown.
+         * kill off our tasklet
          */
-        clear_bit(ASYNCB_SUSPENDED, &port->flags);
+        tasklet_kill(&state->tlet);
 
         /*
          * Free the transmit buffer page.
@@ -421,7 +430,7 @@ uart_get_divisor(struct uart_port *port, unsigned int baud)
         if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
                 quot = port->custom_divisor;
         else
-                quot = DIV_ROUND_CLOSEST(port->uartclk, 16 * baud);
+                quot = (port->uartclk + (8 * baud)) / (16 * baud);
 
         return quot;
 }
@@ -440,10 +449,10 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
          * If we have no tty, termios, or the port does not exist,
          * then we can't set the parameters for this port.
          */
-        if (!tty || uport->type == PORT_UNKNOWN)
+        if (!tty || !tty->termios || uport->type == PORT_UNKNOWN)
                 return;
 
-        termios = &tty->termios;
+        termios = tty->termios;
 
         /*
          * Set flags based on termios cflag
@@ -610,126 +619,104 @@ static void uart_send_xchar(struct tty_struct *tty, char ch)
 static void uart_throttle(struct tty_struct *tty)
 {
         struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->uart_port;
-        uint32_t mask = 0;
 
         if (I_IXOFF(tty))
-                mask |= UPF_SOFT_FLOW;
-        if (tty->termios.c_cflag & CRTSCTS)
-                mask |= UPF_HARD_FLOW;
-
-        if (port->flags & mask) {
-                port->ops->throttle(port);
-                mask &= ~port->flags;
-        }
-
-        if (mask & UPF_SOFT_FLOW)
                 uart_send_xchar(tty, STOP_CHAR(tty));
 
-        if (mask & UPF_HARD_FLOW)
-                uart_clear_mctrl(port, TIOCM_RTS);
+        if (tty->termios->c_cflag & CRTSCTS)
+                uart_clear_mctrl(state->uart_port, TIOCM_RTS);
 }
 
 static void uart_unthrottle(struct tty_struct *tty)
 {
         struct uart_state *state = tty->driver_data;
         struct uart_port *port = state->uart_port;
-        uint32_t mask = 0;
-
-        if (I_IXOFF(tty))
-                mask |= UPF_SOFT_FLOW;
-        if (tty->termios.c_cflag & CRTSCTS)
-                mask |= UPF_HARD_FLOW;
-
-        if (port->flags & mask) {
-                port->ops->unthrottle(port);
-                mask &= ~port->flags;
-        }
 
-        if (mask & UPF_SOFT_FLOW) {
+        if (I_IXOFF(tty)) {
                 if (port->x_char)
                         port->x_char = 0;
                 else
                         uart_send_xchar(tty, START_CHAR(tty));
         }
 
-        if (mask & UPF_HARD_FLOW)
+        if (tty->termios->c_cflag & CRTSCTS)
                 uart_set_mctrl(port, TIOCM_RTS);
 }
 
-static void do_uart_get_info(struct tty_port *port,
-                        struct serial_struct *retinfo)
+static int uart_get_info(struct uart_state *state,
+                         struct serial_struct __user *retinfo)
 {
-        struct uart_state *state = container_of(port, struct uart_state, port);
         struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
+        struct serial_struct tmp;
 
-        memset(retinfo, 0, sizeof(*retinfo));
-
-        retinfo->type       = uport->type;
-        retinfo->line       = uport->line;
-        retinfo->port       = uport->iobase;
-        if (HIGH_BITS_OFFSET)
-                retinfo->port_high = (long) uport->iobase >> HIGH_BITS_OFFSET;
-        retinfo->irq                = uport->irq;
-        retinfo->flags      = uport->flags;
-        retinfo->xmit_fifo_size  = uport->fifosize;
-        retinfo->baud_base          = uport->uartclk / 16;
-        retinfo->close_delay        = jiffies_to_msecs(port->close_delay) / 10;
-        retinfo->closing_wait    = port->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
-                                ASYNC_CLOSING_WAIT_NONE :
-                                jiffies_to_msecs(port->closing_wait) / 10;
-        retinfo->custom_divisor  = uport->custom_divisor;
-        retinfo->hub6       = uport->hub6;
-        retinfo->io_type         = uport->iotype;
-        retinfo->iomem_reg_shift = uport->regshift;
-        retinfo->iomem_base      = (void *)(unsigned long)uport->mapbase;
-}
+        memset(&tmp, 0, sizeof(tmp));
 
-static void uart_get_info(struct tty_port *port,
-                        struct serial_struct *retinfo)
-{
         /* Ensure the state we copy is consistent and no hardware changes
            occur as we go */
         mutex_lock(&port->mutex);
-        do_uart_get_info(port, retinfo);
-        mutex_unlock(&port->mutex);
-}
 
-static int uart_get_info_user(struct tty_port *port,
-                         struct serial_struct __user *retinfo)
-{
-        struct serial_struct tmp;
-        uart_get_info(port, &tmp);
+        tmp.type            = uport->type;
+        tmp.line            = uport->line;
+        tmp.port            = uport->iobase;
+        if (HIGH_BITS_OFFSET)
+                tmp.port_high = (long) uport->iobase >> HIGH_BITS_OFFSET;
+        tmp.irq             = uport->irq;
+        tmp.flags           = uport->flags;
+        tmp.xmit_fifo_size  = uport->fifosize;
+        tmp.baud_base       = uport->uartclk / 16;
+        tmp.close_delay     = port->close_delay / 10;
+        tmp.closing_wait    = port->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
+                                ASYNC_CLOSING_WAIT_NONE :
+                                port->closing_wait / 10;
+        tmp.custom_divisor  = uport->custom_divisor;
+        tmp.hub6            = uport->hub6;
+        tmp.io_type         = uport->iotype;
+        tmp.iomem_reg_shift = uport->regshift;
+        tmp.iomem_base      = (void *)(unsigned long)uport->mapbase;
+
+        mutex_unlock(&port->mutex);
 
         if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
                 return -EFAULT;
         return 0;
 }
 
-static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
-                         struct uart_state *state,
-                         struct serial_struct *new_info)
+static int uart_set_info(struct tty_struct *tty, struct uart_state *state,
+                         struct serial_struct __user *newinfo)
 {
+        struct serial_struct new_serial;
         struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
         unsigned long new_port;
         unsigned int change_irq, change_port, closing_wait;
         unsigned int old_custom_divisor, close_delay;
         upf_t old_flags, new_flags;
         int retval = 0;
 
-        new_port = new_info->port;
+        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_info->port_high << HIGH_BITS_OFFSET;
+                new_port += (unsigned long) new_serial.port_high << HIGH_BITS_OFFSET;
 
-        new_info->irq = irq_canonicalize(new_info->irq);
-        close_delay = msecs_to_jiffies(new_info->close_delay * 10);
-        closing_wait = new_info->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
-                        ASYNC_CLOSING_WAIT_NONE :
-                        msecs_to_jiffies(new_info->closing_wait * 10);
+        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 ?
+                        ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
 
+        /*
+         * This semaphore protects port->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.
+         */
+        mutex_lock(&port->mutex);
 
         change_irq  = !(uport->flags & UPF_FIXED_PORT)
-                && new_info->irq != uport->irq;
+                && new_serial.irq != uport->irq;
 
         /*
          * Since changing the 'type' of the port changes its resource
@@ -738,29 +725,29 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
          */
         change_port = !(uport->flags & UPF_FIXED_PORT)
                 && (new_port != uport->iobase ||
-                    (unsigned long)new_info->iomem_base != uport->mapbase ||
-                    new_info->hub6 != uport->hub6 ||
-                    new_info->io_type != uport->iotype ||
-                    new_info->iomem_reg_shift != uport->regshift ||
-                    new_info->type != uport->type);
+                    (unsigned long)new_serial.iomem_base != uport->mapbase ||
+                    new_serial.hub6 != uport->hub6 ||
+                    new_serial.io_type != uport->iotype ||
+                    new_serial.iomem_reg_shift != uport->regshift ||
+                    new_serial.type != uport->type);
 
         old_flags = uport->flags;
-        new_flags = new_info->flags;
+        new_flags = new_serial.flags;
         old_custom_divisor = uport->custom_divisor;
 
         if (!capable(CAP_SYS_ADMIN)) {
                 retval = -EPERM;
                 if (change_irq || change_port ||
-                    (new_info->baud_base != uport->uartclk / 16) ||
+                    (new_serial.baud_base != uport->uartclk / 16) ||
                     (close_delay != port->close_delay) ||
                     (closing_wait != port->closing_wait) ||
-                    (new_info->xmit_fifo_size &&
-                     new_info->xmit_fifo_size != uport->fifosize) ||
+                    (new_serial.xmit_fifo_size &&
+                     new_serial.xmit_fifo_size != uport->fifosize) ||
                     (((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
                         goto exit;
                 uport->flags = ((uport->flags & ~UPF_USR_MASK) |
                                (new_flags & UPF_USR_MASK));
-                uport->custom_divisor = new_info->custom_divisor;
+                uport->custom_divisor = new_serial.custom_divisor;
                 goto check_and_exit;
         }
 
@@ -768,10 +755,10 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
          * Ask the low level driver to verify the settings.
          */
         if (uport->ops->verify_port)
-                retval = uport->ops->verify_port(uport, new_info);
+                retval = uport->ops->verify_port(uport, &new_serial);
 
-        if ((new_info->irq >= nr_irqs) || (new_info->irq < 0) ||
-            (new_info->baud_base < 9600))
+        if ((new_serial.irq >= nr_irqs) || (new_serial.irq < 0) ||
+            (new_serial.baud_base < 9600))
                 retval = -EINVAL;
 
         if (retval)
@@ -811,11 +798,11 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
                         uport->ops->release_port(uport);
 
                 uport->iobase = new_port;
-                uport->type = new_info->type;
-                uport->hub6 = new_info->hub6;
-                uport->iotype = new_info->io_type;
-                uport->regshift = new_info->iomem_reg_shift;
-                uport->mapbase = (unsigned long)new_info->iomem_base;
+                uport->type = new_serial.type;
+                uport->hub6 = new_serial.hub6;
+                uport->iotype = new_serial.io_type;
+                uport->regshift = new_serial.iomem_reg_shift;
+                uport->mapbase = (unsigned long)new_serial.iomem_base;
 
                 /*
                  * Claim and map the new regions
@@ -856,16 +843,16 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
         }
 
         if (change_irq)
-                uport->irq      = new_info->irq;
+                uport->irq      = new_serial.irq;
         if (!(uport->flags & UPF_FIXED_PORT))
-                uport->uartclk  = new_info->baud_base * 16;
+                uport->uartclk  = new_serial.baud_base * 16;
         uport->flags            = (uport->flags & ~UPF_CHANGE_MASK) |
                                  (new_flags & UPF_CHANGE_MASK);
-        uport->custom_divisor   = new_info->custom_divisor;
+        uport->custom_divisor   = new_serial.custom_divisor;
         port->close_delay     = close_delay;
         port->closing_wait    = closing_wait;
-        if (new_info->xmit_fifo_size)
-                uport->fifosize = new_info->xmit_fifo_size;
+        if (new_serial.xmit_fifo_size)
+                uport->fifosize = new_serial.xmit_fifo_size;
         if (port->tty)
                 port->tty->low_latency =
                         (uport->flags & UPF_LOW_LATENCY) ? 1 : 0;
@@ -894,28 +881,6 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
         } else
                 retval = uart_startup(tty, state, 1);
  exit:
-        return retval;
-}
-
-static int uart_set_info_user(struct tty_struct *tty, struct uart_state *state,
-                         struct serial_struct __user *newinfo)
-{
-        struct serial_struct new_serial;
-        struct tty_port *port = &state->port;
-        int retval;
-
-        if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))
-                return -EFAULT;
-
-        /*
-         * This semaphore protects port->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.
-         */
-        mutex_lock(&port->mutex);
-        retval = uart_set_info(tty, port, state, &new_serial);
         mutex_unlock(&port->mutex);
         return retval;
 }
@@ -1158,11 +1123,11 @@ uart_ioctl(struct tty_struct *tty, unsigned int cmd,
          */
         switch (cmd) {
         case TIOCGSERIAL:
-                ret = uart_get_info_user(port, uarg);
+                ret = uart_get_info(state, uarg);
                 break;
 
         case TIOCSSERIAL:
-                ret = uart_set_info_user(tty, state, uarg);
+                ret = uart_set_info(tty, state, uarg);
                 break;
 
         case TIOCSERCONFIG:
@@ -1230,29 +1195,16 @@ static void uart_set_ldisc(struct tty_struct *tty)
         struct uart_port *uport = state->uart_port;
 
         if (uport->ops->set_ldisc)
-                uport->ops->set_ldisc(uport, tty->termios.c_line);
+                uport->ops->set_ldisc(uport, tty->termios->c_line);
 }
 
 static void uart_set_termios(struct tty_struct *tty,
                                                 struct ktermios *old_termios)
 {
         struct uart_state *state = tty->driver_data;
-        struct uart_port *uport = state->uart_port;
         unsigned long flags;
-        unsigned int cflag = tty->termios.c_cflag;
-        unsigned int iflag_mask = IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK;
-        bool sw_changed = false;
+        unsigned int cflag = tty->termios->c_cflag;
 
-        /*
-         * Drivers doing software flow control also need to know
-         * about changes to these input settings.
-         */
-        if (uport->flags & UPF_SOFT_FLOW) {
-                iflag_mask |= IXANY|IXON|IXOFF;
-                sw_changed =
-                   tty->termios.c_cc[VSTART] != old_termios->c_cc[VSTART] ||
-                   tty->termios.c_cc[VSTOP] != old_termios->c_cc[VSTOP];
-        }
 
         /*
          * These are the bits that are used to setup various
@@ -1260,11 +1212,11 @@ static void uart_set_termios(struct tty_struct *tty,
          * bits in c_cflag; c_[io]speed will always be set
          * appropriately by set_termios() in tty_ioctl.c
          */
+#define RELEVANT_IFLAG(iflag)   ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
         if ((cflag ^ old_termios->c_cflag) == 0 &&
-            tty->termios.c_ospeed == old_termios->c_ospeed &&
-            tty->termios.c_ispeed == old_termios->c_ispeed &&
-            ((tty->termios.c_iflag ^ old_termios->c_iflag) & iflag_mask) == 0 &&
-            !sw_changed) {
+            tty->termios->c_ospeed == old_termios->c_ospeed &&
+            tty->termios->c_ispeed == old_termios->c_ispeed &&
+            RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0) {
                 return;
         }
 
@@ -1272,38 +1224,31 @@ static void uart_set_termios(struct tty_struct *tty,
 
         /* Handle transition to B0 status */
         if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD))
-                uart_clear_mctrl(uport, TIOCM_RTS | TIOCM_DTR);
+                uart_clear_mctrl(state->uart_port, TIOCM_RTS | TIOCM_DTR);
         /* Handle transition away from B0 status */
         else 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(uport, mask);
+                uart_set_mctrl(state->uart_port, mask);
         }
 
-        /*
-         * If the port is doing h/w assisted flow control, do nothing.
-         * We assume that tty->hw_stopped has never been set.
-         */
-        if (uport->flags & UPF_HARD_FLOW)
-                return;
-
         /* Handle turning off CRTSCTS */
         if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
-                spin_lock_irqsave(&uport->lock, flags);
+                spin_lock_irqsave(&state->uart_port->lock, flags);
                 tty->hw_stopped = 0;
                 __uart_start(tty);
-                spin_unlock_irqrestore(&uport->lock, flags);
+                spin_unlock_irqrestore(&state->uart_port->lock, flags);
         }
         /* Handle turning on CRTSCTS */
         else if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
-                spin_lock_irqsave(&uport->lock, flags);
-                if (!(uport->ops->get_mctrl(uport) & TIOCM_CTS)) {
+                spin_lock_irqsave(&state->uart_port->lock, flags);
+                if (!(state->uart_port->ops->get_mctrl(state->uart_port) & TIOCM_CTS)) {
                         tty->hw_stopped = 1;
-                        uport->ops->stop_tx(uport);
+                        state->uart_port->ops->stop_tx(state->uart_port);
                 }
-                spin_unlock_irqrestore(&uport->lock, flags);
+                spin_unlock_irqrestore(&state->uart_port->lock, flags);
         }
 }
 
@@ -1319,6 +1264,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         struct uart_port *uport;
         unsigned long flags;
 
+        BUG_ON(!tty_locked());
+
         if (!state)
                 return;
 
@@ -1327,8 +1274,54 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
 
         pr_debug("uart_close(%d) called\n", uport->line);
 
-        if (tty_port_close_start(port, tty, filp) == 0)
-                return;
+        mutex_lock(&port->mutex);
+        spin_lock_irqsave(&port->lock, flags);
+
+        if (tty_hung_up_p(filp)) {
+                spin_unlock_irqrestore(&port->lock, flags);
+                goto done;
+        }
+
+        if ((tty->count == 1) && (port->count != 1)) {
+                /*
+                 * Uh, oh.  tty->count is 1, which means that the tty
+                 * structure will be freed.  port->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, "
+                       "port->count is %d\n", port->count);
+                port->count = 1;
+        }
+        if (--port->count < 0) {
+                printk(KERN_ERR "uart_close: bad serial port count for %s: %d\n",
+                       tty->name, port->count);
+                port->count = 0;
+        }
+        if (port->count) {
+                spin_unlock_irqrestore(&port->lock, flags);
+                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;
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE) {
+                /*
+                 * hack: open-coded tty_wait_until_sent to avoid
+                 * recursive tty_lock
+                 */
+                long timeout = msecs_to_jiffies(port->closing_wait);
+                if (wait_event_interruptible_timeout(tty->write_wait,
+                                !tty_chars_in_buffer(tty), timeout) >= 0)
+                        __uart_wait_until_sent(uport, timeout);
+        }
 
         /*
          * At this point, we stop accepting input.  To do this, we
@@ -1344,10 +1337,9 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
                  * has completely drained; this is especially
                  * important if there is a transmit FIFO!
                  */
-                uart_wait_until_sent(tty, uport->timeout);
+                __uart_wait_until_sent(uport, uport->timeout);
         }
 
-        mutex_lock(&port->mutex);
         uart_shutdown(tty, state);
         uart_flush_buffer(tty);
 
@@ -1360,8 +1352,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         if (port->blocked_open) {
                 spin_unlock_irqrestore(&port->lock, flags);
                 if (port->close_delay)
-                        msleep_interruptible(
-                                        jiffies_to_msecs(port->close_delay));
+                        msleep_interruptible(port->close_delay);
                 spin_lock_irqsave(&port->lock, flags);
         } else if (!uart_console(uport)) {
                 spin_unlock_irqrestore(&port->lock, flags);
@@ -1373,18 +1364,15 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
          * Wake up anyone trying to open this port.
          */
         clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
-        clear_bit(ASYNCB_CLOSING, &port->flags);
         spin_unlock_irqrestore(&port->lock, flags);
         wake_up_interruptible(&port->open_wait);
-        wake_up_interruptible(&port->close_wait);
 
+done:
         mutex_unlock(&port->mutex);
 }
 
-static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
+static void __uart_wait_until_sent(struct uart_port *port, int timeout)
 {
-        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->uart_port;
         unsigned long char_time, expire;
 
         if (port->type == PORT_UNKNOWN || port->fifosize == 0)
@@ -1436,6 +1424,16 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
         }
 }
 
+static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->uart_port;
+
+        tty_lock();
+        __uart_wait_until_sent(port, timeout);
+        tty_unlock();
+}
+
 /*
  * This is called with the BKL held in
  *  linux/drivers/char/tty_io.c:do_tty_hangup()
@@ -1448,6 +1446,7 @@ static void uart_hangup(struct tty_struct *tty)
         struct tty_port *port = &state->port;
         unsigned long flags;
 
+        BUG_ON(!tty_locked());
         pr_debug("uart_hangup(%d)\n", state->uart_port->line);
 
         mutex_lock(&port->mutex);
@@ -1465,36 +1464,6 @@ static void uart_hangup(struct tty_struct *tty)
         mutex_unlock(&port->mutex);
 }
 
-static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)
-{
-        return 0;
-}
-
-static void uart_port_shutdown(struct tty_port *port)
-{
-        struct uart_state *state = container_of(port, struct uart_state, port);
-        struct uart_port *uport = state->uart_port;
-
-        /*
-         * 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(&port->delta_msr_wait);
-
-        /*
-         * Free the IRQ and disable the port.
-         */
-        uport->ops->shutdown(uport);
-
-        /*
-         * Ensure that the IRQ handler isn't running on another CPU.
-         */
-        synchronize_irq(uport->irq);
-}
-
 static int uart_carrier_raised(struct tty_port *port)
 {
         struct uart_state *state = container_of(port, struct uart_state, port);
@@ -1520,6 +1489,33 @@ static void uart_dtr_rts(struct tty_port *port, int onoff)
                 uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
 }
 
+static struct uart_state *uart_get(struct uart_driver *drv, int line)
+{
+        struct uart_state *state;
+        struct tty_port *port;
+        int ret = 0;
+
+        state = drv->state + line;
+        port = &state->port;
+        if (mutex_lock_interruptible(&port->mutex)) {
+                ret = -ERESTARTSYS;
+                goto err;
+        }
+
+        port->count++;
+        if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
+                ret = -ENXIO;
+                goto err_unlock;
+        }
+        return state;
+
+ err_unlock:
+        port->count--;
+        mutex_unlock(&port->mutex);
+ err:
+        return ERR_PTR(ret);
+}
+
 /*
  * calls to uart_open are serialised by the BKL in
  *   fs/char_dev.c:chrdev_open()
@@ -1533,29 +1529,27 @@ static void uart_dtr_rts(struct tty_port *port, int onoff)
 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;
+        struct tty_port *port;
         int retval, line = tty->index;
-        struct uart_state *state = drv->state + line;
-        struct tty_port *port = &state->port;
 
+        BUG_ON(!tty_locked());
         pr_debug("uart_open(%d) called\n", line);
 
         /*
-         * We take the semaphore here to guarantee that we won't be re-entered
-         * while allocating the state 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
-         * state->port.tty will always contain something reasonable.
+         * We take the semaphore inside uart_get to guarantee that we won't
+         * be re-entered while allocating the state 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 state->port.tty will always contain something
+         * reasonable.
          */
-        if (mutex_lock_interruptible(&port->mutex)) {
-                retval = -ERESTARTSYS;
-                goto end;
-        }
-
-        port->count++;
-        if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
-                retval = -ENXIO;
-                goto err_dec_count;
+        state = uart_get(drv, line);
+        if (IS_ERR(state)) {
+                retval = PTR_ERR(state);
+                goto fail;
         }
+        port = &state->port;
 
         /*
          * Once we set tty->driver_data here, we are guaranteed that
@@ -1565,6 +1559,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         tty->driver_data = state;
         state->uart_port->state = state;
         tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+        tty->alt_speed = 0;
         tty_port_tty_set(port, tty);
 
         /*
@@ -1572,7 +1567,9 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
          */
         if (tty_hung_up_p(filp)) {
                 retval = -EAGAIN;
-                goto err_dec_count;
+                port->count--;
+                mutex_unlock(&port->mutex);
+                goto fail;
         }
 
         /*
@@ -1593,12 +1590,8 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         if (retval == 0)
                 retval = tty_port_block_til_ready(port, tty, filp);
 
-end:
+fail:
         return retval;
-err_dec_count:
-        port->count--;
-        mutex_unlock(&port->mutex);
-        goto end;
 }
 
 static const char *uart_type(struct uart_port *port)
@@ -1889,14 +1882,6 @@ uart_set_options(struct uart_port *port, struct console *co,
 EXPORT_SYMBOL_GPL(uart_set_options);
 #endif /* CONFIG_SERIAL_CORE_CONSOLE */
 
-/**
- * uart_change_pm - set power state of the port
- *
- * @state: port descriptor
- * @pm_state: new state
- *
- * Locking: port->mutex has to be held
- */
 static void uart_change_pm(struct uart_state *state, int pm_state)
 {
         struct uart_port *port = state->uart_port;
@@ -2023,12 +2008,13 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                 /*
                  * If that's unset, use the tty termios setting.
                  */
-                if (port->tty && termios.c_cflag == 0)
-                        termios = port->tty->termios;
+                if (port->tty && port->tty->termios && termios.c_cflag == 0)
+                        termios = *(port->tty->termios);
 
                 if (console_suspend_enabled)
                         uart_change_pm(state, 0);
-                uport->ops->set_termios(uport, &termios, NULL);
+                if (uport->type != PORT_TEGRA)
+                        uport->ops->set_termios(uport, &termios, NULL);
                 if (console_suspend_enabled)
                         console_start(uport->cons);
         }
@@ -2088,6 +2074,8 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
         case UPIO_MEM32:
         case UPIO_AU:
         case UPIO_TSI:
+        case UPIO_DWAPB:
+        case UPIO_DWAPB32:
                 snprintf(address, sizeof(address),
                          "MMIO 0x%llx", (unsigned long long)port->mapbase);
                 break;
@@ -2176,7 +2164,6 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
         int bits = 8;
         int parity = 'n';
         int flow = 'n';
-        int ret;
 
         if (!state || !state->uart_port)
                 return -1;
@@ -2185,22 +2172,6 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
         if (!(port->ops->poll_get_char && port->ops->poll_put_char))
                 return -1;
 
-        if (port->ops->poll_init) {
-                struct tty_port *tport = &state->port;
-
-                ret = 0;
-                mutex_lock(&tport->mutex);
-                /*
-                 * We don't set ASYNCB_INITIALIZED as we only initialized the
-                 * hw, e.g. state->xmit is still uninitialized.
-                 */
-                if (!test_bit(ASYNCB_INITIALIZED, &tport->flags))
-                        ret = port->ops->poll_init(port);
-                mutex_unlock(&tport->mutex);
-                if (ret)
-                        return ret;
-        }
-
         if (options) {
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
                 return uart_set_options(port, NULL, baud, parity, bits, flow);
@@ -2270,8 +2241,6 @@ static const struct tty_operations uart_ops = {
 };
 
 static const struct tty_port_operations uart_port_ops = {
-        .activate       = uart_port_activate,
-        .shutdown       = uart_port_shutdown,
         .carrier_raised = uart_carrier_raised,
         .dtr_rts        = uart_dtr_rts,
 };
@@ -2310,6 +2279,7 @@ int uart_register_driver(struct uart_driver *drv)
 
         drv->tty_driver = normal;
 
+        normal->owner           = drv->owner;
         normal->driver_name     = drv->driver_name;
         normal->name            = drv->dev_name;
         normal->major           = drv->major;
@@ -2332,16 +2302,16 @@ int uart_register_driver(struct uart_driver *drv)
 
                 tty_port_init(port);
                 port->ops = &uart_port_ops;
-                port->close_delay     = HZ / 2; /* .5 seconds */
-                port->closing_wait    = 30 * HZ;/* 30 seconds */
+                port->close_delay     = 500;    /* .5 seconds */
+                port->closing_wait    = 30000;  /* 30 seconds */
+                tasklet_init(&state->tlet, uart_tasklet_action,
+                             (unsigned long)state);
         }
 
         retval = tty_register_driver(normal);
         if (retval >= 0)
                 return retval;
 
-        for (i = 0; i < drv->nr; i++)
-                tty_port_destroy(&drv->state[i].port);
         put_tty_driver(normal);
 out_kfree:
         kfree(drv->state);
@@ -2361,14 +2331,9 @@ out:
 void uart_unregister_driver(struct uart_driver *drv)
 {
         struct tty_driver *p = drv->tty_driver;
-        unsigned int i;
-
         tty_unregister_driver(p);
         put_tty_driver(p);
-        for (i = 0; i < drv->nr; i++)
-                tty_port_destroy(&drv->state[i].port);
         kfree(drv->state);
-        drv->state = NULL;
         drv->tty_driver = NULL;
 }
 
@@ -2379,182 +2344,6 @@ struct tty_driver *uart_console_device(struct console *co, int *index)
         return p->tty_driver;
 }
 
-static ssize_t uart_get_attr_uartclk(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.baud_base * 16);
-}
-
-static ssize_t uart_get_attr_type(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.type);
-}
-static ssize_t uart_get_attr_line(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.line);
-}
-
-static ssize_t uart_get_attr_port(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-        unsigned long ioaddr;
-
-        uart_get_info(port, &tmp);
-        ioaddr = tmp.port;
-        if (HIGH_BITS_OFFSET)
-                ioaddr |= (unsigned long)tmp.port_high << HIGH_BITS_OFFSET;
-        return snprintf(buf, PAGE_SIZE, "0x%lX\n", ioaddr);
-}
-
-static ssize_t uart_get_attr_irq(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.irq);
-}
-
-static ssize_t uart_get_attr_flags(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "0x%X\n", tmp.flags);
-}
-
-static ssize_t uart_get_attr_xmit_fifo_size(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.xmit_fifo_size);
-}
-
-
-static ssize_t uart_get_attr_close_delay(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.close_delay);
-}
-
-
-static ssize_t uart_get_attr_closing_wait(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.closing_wait);
-}
-
-static ssize_t uart_get_attr_custom_divisor(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.custom_divisor);
-}
-
-static ssize_t uart_get_attr_io_type(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.io_type);
-}
-
-static ssize_t uart_get_attr_iomem_base(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "0x%lX\n", (unsigned long)tmp.iomem_base);
-}
-
-static ssize_t uart_get_attr_iomem_reg_shift(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        struct serial_struct tmp;
-        struct tty_port *port = dev_get_drvdata(dev);
-
-        uart_get_info(port, &tmp);
-        return snprintf(buf, PAGE_SIZE, "%d\n", tmp.iomem_reg_shift);
-}
-
-static DEVICE_ATTR(type, S_IRUSR | S_IRGRP, uart_get_attr_type, NULL);
-static DEVICE_ATTR(line, S_IRUSR | S_IRGRP, uart_get_attr_line, NULL);
-static DEVICE_ATTR(port, S_IRUSR | S_IRGRP, uart_get_attr_port, NULL);
-static DEVICE_ATTR(irq, S_IRUSR | S_IRGRP, uart_get_attr_irq, NULL);
-static DEVICE_ATTR(flags, S_IRUSR | S_IRGRP, uart_get_attr_flags, NULL);
-static DEVICE_ATTR(xmit_fifo_size, S_IRUSR | S_IRGRP, uart_get_attr_xmit_fifo_size, NULL);
-static DEVICE_ATTR(uartclk, S_IRUSR | S_IRGRP, uart_get_attr_uartclk, NULL);
-static DEVICE_ATTR(close_delay, S_IRUSR | S_IRGRP, uart_get_attr_close_delay, NULL);
-static DEVICE_ATTR(closing_wait, S_IRUSR | S_IRGRP, uart_get_attr_closing_wait, NULL);
-static DEVICE_ATTR(custom_divisor, S_IRUSR | S_IRGRP, uart_get_attr_custom_divisor, NULL);
-static DEVICE_ATTR(io_type, S_IRUSR | S_IRGRP, uart_get_attr_io_type, NULL);
-static DEVICE_ATTR(iomem_base, S_IRUSR | S_IRGRP, uart_get_attr_iomem_base, NULL);
-static DEVICE_ATTR(iomem_reg_shift, S_IRUSR | S_IRGRP, uart_get_attr_iomem_reg_shift, NULL);
-
-static struct attribute *tty_dev_attrs[] = {
-        &dev_attr_type.attr,
-        &dev_attr_line.attr,
-        &dev_attr_port.attr,
-        &dev_attr_irq.attr,
-        &dev_attr_flags.attr,
-        &dev_attr_xmit_fifo_size.attr,
-        &dev_attr_uartclk.attr,
-        &dev_attr_close_delay.attr,
-        &dev_attr_closing_wait.attr,
-        &dev_attr_custom_divisor.attr,
-        &dev_attr_io_type.attr,
-        &dev_attr_iomem_base.attr,
-        &dev_attr_iomem_reg_shift.attr,
-        NULL,
-        };
-
-static const struct attribute_group tty_dev_attr_group = {
-        .attrs = tty_dev_attrs,
-        };
-
-static const struct attribute_group *tty_dev_attr_groups[] = {
-        &tty_dev_attr_group,
-        NULL
-        };
-
-
 /**
  *      uart_add_one_port - attach a driver-defined port structure
  *      @drv: pointer to the uart low level driver structure for this port
@@ -2608,14 +2397,13 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
          * Register the port whether it's detected or not.  This allows
          * setserial to be used to alter this ports parameters.
          */
-        tty_dev = tty_port_register_device_attr(port, drv->tty_driver,
-                        uport->line, uport->dev, port, tty_dev_attr_groups);
+        tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
         if (likely(!IS_ERR(tty_dev))) {
-                device_set_wakeup_capable(tty_dev, 1);
-        } else {
+                device_init_wakeup(tty_dev, 1);
+                device_set_wakeup_enable(tty_dev, 0);
+        } else
                 printk(KERN_ERR "Cannot register tty device on line %d\n",
                        uport->line);
-        }
 
         /*
          * Ensure UPF_DEAD is not set.
@@ -2678,6 +2466,11 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)
          */
         uport->type = PORT_UNKNOWN;
 
+        /*
+         * Kill the tasklet, and free resources.
+         */
+        tasklet_kill(&state->tlet);
+
         state->uart_port = NULL;
         mutex_unlock(&port_mutex);
 
@@ -2702,110 +2495,14 @@ int uart_match_port(struct uart_port *port1, struct uart_port *port2)
         case UPIO_MEM32:
         case UPIO_AU:
         case UPIO_TSI:
+        case UPIO_DWAPB:
+        case UPIO_DWAPB32:
                 return (port1->mapbase == port2->mapbase);
         }
         return 0;
 }
 EXPORT_SYMBOL(uart_match_port);
 
-/**
- *      uart_handle_dcd_change - handle a change of carrier detect state
- *      @uport: uart_port structure for the open port
- *      @status: new carrier detect status, nonzero if active
- */
-void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
-{
-        struct uart_state *state = uport->state;
-        struct tty_port *port = &state->port;
-        struct tty_ldisc *ld = NULL;
-        struct pps_event_time ts;
-        struct tty_struct *tty = port->tty;
-
-        if (tty)
-                ld = tty_ldisc_ref(tty);
-        if (ld && ld->ops->dcd_change)
-                pps_get_ts(&ts);
-
-        uport->icount.dcd++;
-#ifdef CONFIG_HARD_PPS
-        if ((uport->flags & UPF_HARDPPS_CD) && status)
-                hardpps();
-#endif
-
-        if (port->flags & ASYNC_CHECK_CD) {
-                if (status)
-                        wake_up_interruptible(&port->open_wait);
-                else if (tty)
-                        tty_hangup(tty);
-        }
-
-        if (ld && ld->ops->dcd_change)
-                ld->ops->dcd_change(tty, status, &ts);
-        if (ld)
-                tty_ldisc_deref(ld);
-}
-EXPORT_SYMBOL_GPL(uart_handle_dcd_change);
-
-/**
- *      uart_handle_cts_change - handle a change of clear-to-send state
- *      @uport: uart_port structure for the open port
- *      @status: new clear to send status, nonzero if active
- */
-void uart_handle_cts_change(struct uart_port *uport, unsigned int status)
-{
-        struct tty_port *port = &uport->state->port;
-        struct tty_struct *tty = port->tty;
-
-        uport->icount.cts++;
-
-        if (tty_port_cts_enabled(port)) {
-                if (tty->hw_stopped) {
-                        if (status) {
-                                tty->hw_stopped = 0;
-                                uport->ops->start_tx(uport);
-                                uart_write_wakeup(uport);
-                        }
-                } else {
-                        if (!status) {
-                                tty->hw_stopped = 1;
-                                uport->ops->stop_tx(uport);
-                        }
-                }
-        }
-}
-EXPORT_SYMBOL_GPL(uart_handle_cts_change);
-
-/**
- * uart_insert_char - push a char to the uart layer
- *
- * User is responsible to call tty_flip_buffer_push when they are done with
- * insertion.
- *
- * @port: corresponding port
- * @status: state of the serial port RX buffer (LSR for 8250)
- * @overrun: mask of overrun bits in @status
- * @ch: character to push
- * @flag: flag for the character (see TTY_NORMAL and friends)
- */
-void uart_insert_char(struct uart_port *port, unsigned int status,
-                 unsigned int overrun, unsigned int ch, unsigned int flag)
-{
-        struct tty_struct *tty = port->state->port.tty;
-
-        if ((status & port->ignore_status_mask & ~overrun) == 0)
-                if (tty_insert_flip_char(tty, ch, flag) == 0)
-                        ++port->icount.buf_overrun;
-
-        /*
-         * Overrun is special.  Since it's reported immediately,
-         * it doesn't affect the current character.
-         */
-        if (status & ~port->ignore_status_mask & overrun)
-                if (tty_insert_flip_char(tty, 0, TTY_OVERRUN) == 0)
-                        ++port->icount.buf_overrun;
-}
-EXPORT_SYMBOL_GPL(uart_insert_char);
-
 EXPORT_SYMBOL(uart_write_wakeup);
 EXPORT_SYMBOL(uart_register_driver);
 EXPORT_SYMBOL(uart_unregister_driver);
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index 9bd004f9da8..2430319f2f5 100644
--- a/drivers/tty/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
@@ -13,7 +13,6 @@
  */
 #include <linux/module.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/serial.h>
@@ -337,19 +336,19 @@ static int ks8695uart_startup(struct uart_port *port)
         /*
          * Allocate the IRQ
          */
-        retval = request_irq(KS8695_IRQ_UART_TX, ks8695uart_tx_chars, 0, "UART TX", port);
+        retval = request_irq(KS8695_IRQ_UART_TX, ks8695uart_tx_chars, IRQF_DISABLED, "UART TX", port);
         if (retval)
                 goto err_tx;
 
-        retval = request_irq(KS8695_IRQ_UART_RX, ks8695uart_rx_chars, 0, "UART RX", port);
+        retval = request_irq(KS8695_IRQ_UART_RX, ks8695uart_rx_chars, IRQF_DISABLED, "UART RX", port);
         if (retval)
                 goto err_rx;
 
-        retval = request_irq(KS8695_IRQ_UART_LINE_STATUS, ks8695uart_rx_chars, 0, "UART LineStatus", port);
+        retval = request_irq(KS8695_IRQ_UART_LINE_STATUS, ks8695uart_rx_chars, IRQF_DISABLED, "UART LineStatus", port);
         if (retval)
                 goto err_ls;
 
-        retval = request_irq(KS8695_IRQ_UART_MODEM_STATUS, ks8695uart_modem_status, 0, "UART ModemStatus", port);
+        retval = request_irq(KS8695_IRQ_UART_MODEM_STATUS, ks8695uart_modem_status, IRQF_DISABLED, "UART ModemStatus", port);
         if (retval)
                 goto err_ms;
 
@@ -548,8 +547,8 @@ static struct uart_ops ks8695uart_pops = {
 
 static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
         {
-                .membase        = KS8695_UART_VA,
-                .mapbase        = KS8695_UART_PA,
+                .membase        = (void *) KS8695_UART_VA,
+                .mapbase        = KS8695_UART_VA,
                 .iotype         = SERIAL_IO_MEM,
                 .irq            = KS8695_IRQ_UART_TX,
                 .uartclk        = KS8695_CLOCK_RATE * 16,
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index b52b21aeb25..8e3fc1944e6 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -28,8 +28,6 @@
 #include <linux/pci.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 
 #include <asm/io.h>
 
@@ -466,7 +464,7 @@ static void serial_txx9_break_ctl(struct uart_port *port, int break_state)
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
+#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || (CONFIG_CONSOLE_POLL)
 /*
  *      Wait for transmitter & holding register to empty
  */
@@ -1030,7 +1028,7 @@ static DEFINE_MUTEX(serial_txx9_mutex);
  *
  *      On success the port is ready to use and the line number is returned.
  */
-static int serial_txx9_register_port(struct uart_port *port)
+static int __devinit serial_txx9_register_port(struct uart_port *port)
 {
         int i;
         struct uart_txx9_port *uart;
@@ -1078,7 +1076,7 @@ static int serial_txx9_register_port(struct uart_port *port)
  *      Remove one serial port.  This may not be called from interrupt
  *      context.  We hand the port back to the our control.
  */
-static void serial_txx9_unregister_port(int line)
+static void __devexit serial_txx9_unregister_port(int line)
 {
         struct uart_txx9_port *uart = &serial_txx9_ports[line];
 
@@ -1096,7 +1094,7 @@ static void serial_txx9_unregister_port(int line)
 /*
  * Register a set of serial devices attached to a platform device.
  */
-static int serial_txx9_probe(struct platform_device *dev)
+static int __devinit serial_txx9_probe(struct platform_device *dev)
 {
         struct uart_port *p = dev->dev.platform_data;
         struct uart_port port;
@@ -1126,7 +1124,7 @@ static int serial_txx9_probe(struct platform_device *dev)
 /*
  * Remove serial ports registered against a platform device.
  */
-static int serial_txx9_remove(struct platform_device *dev)
+static int __devexit serial_txx9_remove(struct platform_device *dev)
 {
         int i;
 
@@ -1171,7 +1169,7 @@ static int serial_txx9_resume(struct platform_device *dev)
 
 static struct platform_driver serial_txx9_plat_driver = {
         .probe          = serial_txx9_probe,
-        .remove         = serial_txx9_remove,
+        .remove         = __devexit_p(serial_txx9_remove),
 #ifdef CONFIG_PM
         .suspend        = serial_txx9_suspend,
         .resume         = serial_txx9_resume,
@@ -1187,7 +1185,7 @@ static struct platform_driver serial_txx9_plat_driver = {
  * Probe one serial board.  Unfortunately, there is no rhyme nor reason
  * to the arrangement of serial ports on a PCI card.
  */
-static int
+static int __devinit
 pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 {
         struct uart_port port;
@@ -1217,7 +1215,7 @@ pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
         return 0;
 }
 
-static void pciserial_txx9_remove_one(struct pci_dev *dev)
+static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev)
 {
         struct uart_txx9_port *up = pci_get_drvdata(dev);
 
@@ -1261,7 +1259,7 @@ static const struct pci_device_id serial_txx9_pci_tbl[] = {
 static struct pci_driver serial_txx9_pci_driver = {
         .name           = "serial_txx9",
         .probe          = pciserial_txx9_init_one,
-        .remove         = pciserial_txx9_remove_one,
+        .remove         = __devexit_p(pciserial_txx9_remove_one),
 #ifdef CONFIG_PM
         .suspend        = pciserial_txx9_suspend_one,
         .resume         = pciserial_txx9_resume_one,
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 61477567423..5ea6ec3442e 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -25,7 +25,6 @@
 
 #include <linux/module.h>
 #include <linux/errno.h>
-#include <linux/sh_dma.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
@@ -51,7 +50,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
-#include <linux/gpio.h>
 
 #ifdef CONFIG_SUPERH
 #include <asm/sh_bios.h>
@@ -75,7 +73,6 @@ struct sci_port {
         struct clk              *fclk;
 
         char                    *irqstr[SCIx_NR_IRQS];
-        char                    *gpiostr[SCIx_NR_FNS];
 
         struct dma_chan                 *chan_tx;
         struct dma_chan                 *chan_rx;
@@ -99,6 +96,12 @@ struct sci_port {
 #endif
 
         struct notifier_block           freq_transition;
+
+#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
+        unsigned short saved_smr;
+        unsigned short saved_fcr;
+        unsigned char saved_brr;
+#endif
 };
 
 /* Function prototypes */
@@ -196,30 +199,11 @@ static struct plat_sci_reg sci_regmap[SCIx_NR_REGTYPES][SCIx_NR_REGS] = {
                 [SCxSR]         = { 0x14, 16 },
                 [SCxRDR]        = { 0x60,  8 },
                 [SCFCR]         = { 0x18, 16 },
-                [SCFDR]         = sci_reg_invalid,
-                [SCTFDR]        = { 0x38, 16 },
-                [SCRFDR]        = { 0x3c, 16 },
-                [SCSPTR]        = sci_reg_invalid,
-                [SCLSR]         = sci_reg_invalid,
-        },
-
-        /*
-         * Common SH-2(A) SCIF definitions for ports with FIFO data
-         * count registers.
-         */
-        [SCIx_SH2_SCIF_FIFODATA_REGTYPE] = {
-                [SCSMR]         = { 0x00, 16 },
-                [SCBRR]         = { 0x04,  8 },
-                [SCSCR]         = { 0x08, 16 },
-                [SCxTDR]        = { 0x0c,  8 },
-                [SCxSR]         = { 0x10, 16 },
-                [SCxRDR]        = { 0x14,  8 },
-                [SCFCR]         = { 0x18, 16 },
                 [SCFDR]         = { 0x1c, 16 },
                 [SCTFDR]        = sci_reg_invalid,
                 [SCRFDR]        = sci_reg_invalid,
-                [SCSPTR]        = { 0x20, 16 },
-                [SCLSR]         = { 0x24, 16 },
+                [SCSPTR]        = sci_reg_invalid,
+                [SCLSR]         = sci_reg_invalid,
         },
 
         /*
@@ -350,6 +334,9 @@ static void sci_serial_out(struct uart_port *p, int offset, int value)
                 WARN(1, "Invalid register access\n");
 }
 
+#define sci_in(up, offset)              (up->serial_in(up, offset))
+#define sci_out(up, offset, value)      (up->serial_out(up, offset, value))
+
 static int sci_probe_regmap(struct plat_sci_port *cfg)
 {
         switch (cfg->type) {
@@ -414,9 +401,9 @@ static int sci_poll_get_char(struct uart_port *port)
         int c;
 
         do {
-                status = serial_port_in(port, SCxSR);
+                status = sci_in(port, SCxSR);
                 if (status & SCxSR_ERRORS(port)) {
-                        serial_port_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
+                        sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
                         continue;
                 }
                 break;
@@ -425,11 +412,11 @@ static int sci_poll_get_char(struct uart_port *port)
         if (!(status & SCxSR_RDxF(port)))
                 return NO_POLL_CHAR;
 
-        c = serial_port_in(port, SCxRDR);
+        c = sci_in(port, SCxRDR);
 
         /* Dummy read */
-        serial_port_in(port, SCxSR);
-        serial_port_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+        sci_in(port, SCxSR);
+        sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
 
         return c;
 }
@@ -440,11 +427,11 @@ static void sci_poll_put_char(struct uart_port *port, unsigned char c)
         unsigned short status;
 
         do {
-                status = serial_port_in(port, SCxSR);
+                status = sci_in(port, SCxSR);
         } while (!(status & SCxSR_TDxE(port)));
 
-        serial_port_out(port, SCxTDR, c);
-        serial_port_out(port, SCxSR, SCxSR_TDxE_CLEAR(port) & ~SCxSR_TEND(port));
+        sci_out(port, SCxTDR, c);
+        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port) & ~SCxSR_TEND(port));
 }
 #endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_SH_SCI_CONSOLE */
 
@@ -468,15 +455,8 @@ static void sci_init_pins(struct uart_port *port, unsigned int cflag)
         if (!reg->size)
                 return;
 
-        if ((s->cfg->capabilities & SCIx_HAVE_RTSCTS) &&
-            ((!(cflag & CRTSCTS)))) {
-                unsigned short status;
-
-                status = serial_port_in(port, SCSPTR);
-                status &= ~SCSPTR_CTSIO;
-                status |= SCSPTR_RTSIO;
-                serial_port_out(port, SCSPTR, status); /* Set RTS = 1 */
-        }
+        if (!(cflag & CRTSCTS))
+                sci_out(port, SCSPTR, 0x0080); /* Set RTS = 1 */
 }
 
 static int sci_txfill(struct uart_port *port)
@@ -485,13 +465,13 @@ static int sci_txfill(struct uart_port *port)
 
         reg = sci_getreg(port, SCTFDR);
         if (reg->size)
-                return serial_port_in(port, SCTFDR) & ((port->fifosize << 1) - 1);
+                return sci_in(port, SCTFDR) & 0xff;
 
         reg = sci_getreg(port, SCFDR);
         if (reg->size)
-                return serial_port_in(port, SCFDR) >> 8;
+                return sci_in(port, SCFDR) >> 8;
 
-        return !(serial_port_in(port, SCxSR) & SCI_TDRE);
+        return !(sci_in(port, SCxSR) & SCI_TDRE);
 }
 
 static int sci_txroom(struct uart_port *port)
@@ -505,13 +485,13 @@ static int sci_rxfill(struct uart_port *port)
 
         reg = sci_getreg(port, SCRFDR);
         if (reg->size)
-                return serial_port_in(port, SCRFDR) & ((port->fifosize << 1) - 1);
+                return sci_in(port, SCRFDR) & 0xff;
 
         reg = sci_getreg(port, SCFDR);
         if (reg->size)
-                return serial_port_in(port, SCFDR) & ((port->fifosize << 1) - 1);
+                return sci_in(port, SCFDR) & ((port->fifosize << 1) - 1);
 
-        return (serial_port_in(port, SCxSR) & SCxSR_RDxF(port)) != 0;
+        return (sci_in(port, SCxSR) & SCxSR_RDxF(port)) != 0;
 }
 
 /*
@@ -524,8 +504,7 @@ static inline int sci_rxd_in(struct uart_port *port)
         if (s->cfg->port_reg <= 0)
                 return 1;
 
-        /* Cast for ARM damage */
-        return !!__raw_readb((void __iomem *)s->cfg->port_reg);
+        return !!__raw_readb(s->cfg->port_reg);
 }
 
 /* ********************************************************************** *
@@ -540,14 +519,14 @@ static void sci_transmit_chars(struct uart_port *port)
         unsigned short ctrl;
         int count;
 
-        status = serial_port_in(port, SCxSR);
+        status = sci_in(port, SCxSR);
         if (!(status & SCxSR_TDxE(port))) {
-                ctrl = serial_port_in(port, SCSCR);
+                ctrl = sci_in(port, SCSCR);
                 if (uart_circ_empty(xmit))
                         ctrl &= ~SCSCR_TIE;
                 else
                         ctrl |= SCSCR_TIE;
-                serial_port_out(port, SCSCR, ctrl);
+                sci_out(port, SCSCR, ctrl);
                 return;
         }
 
@@ -566,27 +545,27 @@ static void sci_transmit_chars(struct uart_port *port)
                         break;
                 }
 
-                serial_port_out(port, SCxTDR, c);
+                sci_out(port, SCxTDR, c);
 
                 port->icount.tx++;
         } while (--count > 0);
 
-        serial_port_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
+        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);
         } else {
-                ctrl = serial_port_in(port, SCSCR);
+                ctrl = sci_in(port, SCSCR);
 
                 if (port->type != PORT_SCI) {
-                        serial_port_in(port, SCxSR); /* Dummy read */
-                        serial_port_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
+                        sci_in(port, SCxSR); /* Dummy read */
+                        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
                 }
 
                 ctrl |= SCSCR_TIE;
-                serial_port_out(port, SCSCR, ctrl);
+                sci_out(port, SCSCR, ctrl);
         }
 }
 
@@ -601,7 +580,7 @@ static void sci_receive_chars(struct uart_port *port)
         unsigned short status;
         unsigned char flag;
 
-        status = serial_port_in(port, SCxSR);
+        status = sci_in(port, SCxSR);
         if (!(status & SCxSR_RDxF(port)))
                 return;
 
@@ -614,7 +593,7 @@ static void sci_receive_chars(struct uart_port *port)
                         break;
 
                 if (port->type == PORT_SCI) {
-                        char c = serial_port_in(port, SCxRDR);
+                        char c = sci_in(port, SCxRDR);
                         if (uart_handle_sysrq_char(port, c) ||
                             sci_port->break_flag)
                                 count = 0;
@@ -622,9 +601,8 @@ static void sci_receive_chars(struct uart_port *port)
                                 tty_insert_flip_char(tty, c, TTY_NORMAL);
                 } else {
                         for (i = 0; i < count; i++) {
-                                char c = serial_port_in(port, SCxRDR);
-
-                                status = serial_port_in(port, SCxSR);
+                                char c = sci_in(port, SCxRDR);
+                                status = sci_in(port, SCxSR);
 #if defined(CONFIG_CPU_SH3)
                                 /* Skip "chars" during break */
                                 if (sci_port->break_flag) {
@@ -652,11 +630,9 @@ static void sci_receive_chars(struct uart_port *port)
                                 /* Store data and status */
                                 if (status & SCxSR_FER(port)) {
                                         flag = TTY_FRAME;
-                                        port->icount.frame++;
                                         dev_notice(port->dev, "frame error\n");
                                 } else if (status & SCxSR_PER(port)) {
                                         flag = TTY_PARITY;
-                                        port->icount.parity++;
                                         dev_notice(port->dev, "parity error\n");
                                 } else
                                         flag = TTY_NORMAL;
@@ -665,8 +641,8 @@ static void sci_receive_chars(struct uart_port *port)
                         }
                 }
 
-                serial_port_in(port, SCxSR); /* dummy read */
-                serial_port_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+                sci_in(port, SCxSR); /* dummy read */
+                sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
 
                 copied += count;
                 port->icount.rx += count;
@@ -676,8 +652,8 @@ static void sci_receive_chars(struct uart_port *port)
                 /* Tell the rest of the system the news. New characters! */
                 tty_flip_buffer_push(tty);
         } else {
-                serial_port_in(port, SCxSR); /* dummy read */
-                serial_port_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+                sci_in(port, SCxSR); /* dummy read */
+                sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
         }
 }
 
@@ -719,7 +695,7 @@ static void sci_break_timer(unsigned long data)
 static int sci_handle_errors(struct uart_port *port)
 {
         int copied = 0;
-        unsigned short status = serial_port_in(port, SCxSR);
+        unsigned short status = sci_in(port, SCxSR);
         struct tty_struct *tty = port->state->port.tty;
         struct sci_port *s = to_sci_port(port);
 
@@ -728,8 +704,6 @@ static int sci_handle_errors(struct uart_port *port)
          */
         if (s->cfg->overrun_bit != SCIx_NOT_SUPPORTED) {
                 if (status & (1 << s->cfg->overrun_bit)) {
-                        port->icount.overrun++;
-
                         /* overrun error */
                         if (tty_insert_flip_char(tty, 0, TTY_OVERRUN))
                                 copied++;
@@ -744,8 +718,6 @@ static int sci_handle_errors(struct uart_port *port)
                         struct sci_port *sci_port = to_sci_port(port);
 
                         if (!sci_port->break_flag) {
-                                port->icount.brk++;
-
                                 sci_port->break_flag = 1;
                                 sci_schedule_break_timer(sci_port);
 
@@ -761,8 +733,6 @@ static int sci_handle_errors(struct uart_port *port)
 
                 } else {
                         /* frame error */
-                        port->icount.frame++;
-
                         if (tty_insert_flip_char(tty, 0, TTY_FRAME))
                                 copied++;
 
@@ -772,8 +742,6 @@ static int sci_handle_errors(struct uart_port *port)
 
         if (status & SCxSR_PER(port)) {
                 /* parity error */
-                port->icount.parity++;
-
                 if (tty_insert_flip_char(tty, 0, TTY_PARITY))
                         copied++;
 
@@ -797,10 +765,8 @@ static int sci_handle_fifo_overrun(struct uart_port *port)
         if (!reg->size)
                 return 0;
 
-        if ((serial_port_in(port, SCLSR) & (1 << s->cfg->overrun_bit))) {
-                serial_port_out(port, SCLSR, 0);
-
-                port->icount.overrun++;
+        if ((sci_in(port, SCLSR) & (1 << s->cfg->overrun_bit))) {
+                sci_out(port, SCLSR, 0);
 
                 tty_insert_flip_char(tty, 0, TTY_OVERRUN);
                 tty_flip_buffer_push(tty);
@@ -815,7 +781,7 @@ static int sci_handle_fifo_overrun(struct uart_port *port)
 static int sci_handle_breaks(struct uart_port *port)
 {
         int copied = 0;
-        unsigned short status = serial_port_in(port, SCxSR);
+        unsigned short status = sci_in(port, SCxSR);
         struct tty_struct *tty = port->state->port.tty;
         struct sci_port *s = to_sci_port(port);
 
@@ -827,9 +793,6 @@ static int sci_handle_breaks(struct uart_port *port)
                 /* Debounce break */
                 s->break_flag = 1;
 #endif
-
-                port->icount.brk++;
-
                 /* Notify of BREAK */
                 if (tty_insert_flip_char(tty, 0, TTY_BREAK))
                         copied++;
@@ -852,8 +815,8 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
         struct sci_port *s = to_sci_port(port);
 
         if (s->chan_rx) {
-                u16 scr = serial_port_in(port, SCSCR);
-                u16 ssr = serial_port_in(port, SCxSR);
+                u16 scr = sci_in(port, SCSCR);
+                u16 ssr = sci_in(port, SCxSR);
 
                 /* Disable future Rx interrupts */
                 if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
@@ -862,9 +825,9 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
                 } else {
                         scr &= ~SCSCR_RIE;
                 }
-                serial_port_out(port, SCSCR, scr);
+                sci_out(port, SCSCR, scr);
                 /* Clear current interrupt */
-                serial_port_out(port, SCxSR, ssr & ~(1 | SCxSR_RDxF(port)));
+                sci_out(port, SCxSR, ssr & ~(1 | SCxSR_RDxF(port)));
                 dev_dbg(port->dev, "Rx IRQ %lu: setup t-out in %u jiffies\n",
                         jiffies, s->rx_timeout);
                 mod_timer(&s->rx_timer, jiffies + s->rx_timeout);
@@ -902,15 +865,15 @@ static irqreturn_t sci_er_interrupt(int irq, void *ptr)
         if (port->type == PORT_SCI) {
                 if (sci_handle_errors(port)) {
                         /* discard character in rx buffer */
-                        serial_port_in(port, SCxSR);
-                        serial_port_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
+                        sci_in(port, SCxSR);
+                        sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
                 }
         } else {
                 sci_handle_fifo_overrun(port);
                 sci_rx_interrupt(irq, ptr);
         }
 
-        serial_port_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
+        sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
 
         /* Kick the transmission */
         sci_tx_interrupt(irq, ptr);
@@ -924,7 +887,7 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr)
 
         /* Handle BREAKs */
         sci_handle_breaks(port);
-        serial_port_out(port, SCxSR, SCxSR_BREAK_CLEAR(port));
+        sci_out(port, SCxSR, SCxSR_BREAK_CLEAR(port));
 
         return IRQ_HANDLED;
 }
@@ -948,8 +911,8 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
         struct sci_port *s = to_sci_port(port);
         irqreturn_t ret = IRQ_NONE;
 
-        ssr_status = serial_port_in(port, SCxSR);
-        scr_status = serial_port_in(port, SCSCR);
+        ssr_status = sci_in(port, SCxSR);
+        scr_status = sci_in(port, SCSCR);
         err_enabled = scr_status & port_rx_irq_mask(port);
 
         /* Tx Interrupt */
@@ -1048,17 +1011,9 @@ static int sci_request_irq(struct sci_port *port)
                 if (SCIx_IRQ_IS_MUXED(port)) {
                         i = SCIx_MUX_IRQ;
                         irq = up->irq;
-                } else {
+                } else
                         irq = port->cfg->irqs[i];
 
-                        /*
-                         * Certain port types won't support all of the
-                         * available interrupt sources.
-                         */
-                        if (unlikely(!irq))
-                                continue;
-                }
-
                 desc = sci_irq_desc + i;
                 port->irqstr[j] = kasprintf(GFP_KERNEL, "%s:%s",
                                             dev_name(up->dev), desc->desc);
@@ -1098,15 +1053,6 @@ static void sci_free_irq(struct sci_port *port)
          * IRQ first.
          */
         for (i = 0; i < SCIx_NR_IRQS; i++) {
-                unsigned int irq = port->cfg->irqs[i];
-
-                /*
-                 * Certain port types won't support all of the available
-                 * interrupt sources.
-                 */
-                if (unlikely(!irq))
-                        continue;
-
                 free_irq(port->cfg->irqs[i], port);
                 kfree(port->irqstr[i]);
 
@@ -1117,108 +1063,27 @@ static void sci_free_irq(struct sci_port *port)
         }
 }
 
-static const char *sci_gpio_names[SCIx_NR_FNS] = {
-        "sck", "rxd", "txd", "cts", "rts",
-};
-
-static const char *sci_gpio_str(unsigned int index)
-{
-        return sci_gpio_names[index];
-}
-
-static void sci_init_gpios(struct sci_port *port)
-{
-        struct uart_port *up = &port->port;
-        int i;
-
-        if (!port->cfg)
-                return;
-
-        for (i = 0; i < SCIx_NR_FNS; i++) {
-                const char *desc;
-                int ret;
-
-                if (!port->cfg->gpios[i])
-                        continue;
-
-                desc = sci_gpio_str(i);
-
-                port->gpiostr[i] = kasprintf(GFP_KERNEL, "%s:%s",
-                                             dev_name(up->dev), desc);
-
-                /*
-                 * If we've failed the allocation, we can still continue
-                 * on with a NULL string.
-                 */
-                if (!port->gpiostr[i])
-                        dev_notice(up->dev, "%s string allocation failure\n",
-                                   desc);
-
-                ret = gpio_request(port->cfg->gpios[i], port->gpiostr[i]);
-                if (unlikely(ret != 0)) {
-                        dev_notice(up->dev, "failed %s gpio request\n", desc);
-
-                        /*
-                         * If we can't get the GPIO for whatever reason,
-                         * no point in keeping the verbose string around.
-                         */
-                        kfree(port->gpiostr[i]);
-                }
-        }
-}
-
-static void sci_free_gpios(struct sci_port *port)
-{
-        int i;
-
-        for (i = 0; i < SCIx_NR_FNS; i++)
-                if (port->cfg->gpios[i]) {
-                        gpio_free(port->cfg->gpios[i]);
-                        kfree(port->gpiostr[i]);
-                }
-}
-
 static unsigned int sci_tx_empty(struct uart_port *port)
 {
-        unsigned short status = serial_port_in(port, SCxSR);
+        unsigned short status = sci_in(port, SCxSR);
         unsigned short in_tx_fifo = sci_txfill(port);
 
         return (status & SCxSR_TEND(port)) && !in_tx_fifo ? TIOCSER_TEMT : 0;
 }
 
-/*
- * Modem control is a bit of a mixed bag for SCI(F) ports. Generally
- * CTS/RTS is supported in hardware by at least one port and controlled
- * via SCSPTR (SCxPCR for SCIFA/B parts), or external pins (presently
- * handled via the ->init_pins() op, which is a bit of a one-way street,
- * lacking any ability to defer pin control -- this will later be
- * converted over to the GPIO framework).
- *
- * Other modes (such as loopback) are supported generically on certain
- * port types, but not others. For these it's sufficient to test for the
- * existence of the support register and simply ignore the port type.
- */
 static void sci_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
-        if (mctrl & TIOCM_LOOP) {
-                struct plat_sci_reg *reg;
-
-                /*
-                 * Standard loopback mode for SCFCR ports.
-                 */
-                reg = sci_getreg(port, SCFCR);
-                if (reg->size)
-                        serial_port_out(port, SCFCR, serial_port_in(port, SCFCR) | 1);
-        }
+        /* 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)
 {
-        /*
-         * CTS/RTS is handled in hardware when supported, while nothing
-         * else is wired up. Keep it simple and simply assert DSR/CAR.
-         */
-        return TIOCM_DSR | TIOCM_CAR;
+        /* This routine is used for getting signals of: DTR, DCD, DSR, RI,
+           and CTS/RTS */
+
+        return TIOCM_DTR | TIOCM_RTS | TIOCM_CTS | TIOCM_DSR;
 }
 
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
@@ -1239,20 +1104,17 @@ static void sci_dma_tx_complete(void *arg)
         port->icount.tx += sg_dma_len(&s->sg_tx);
 
         async_tx_ack(s->desc_tx);
+        s->cookie_tx = -EINVAL;
         s->desc_tx = NULL;
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(port);
 
         if (!uart_circ_empty(xmit)) {
-                s->cookie_tx = 0;
                 schedule_work(&s->work_tx);
-        } else {
-                s->cookie_tx = -EINVAL;
-                if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
-                        u16 ctrl = serial_port_in(port, SCSCR);
-                        serial_port_out(port, SCSCR, ctrl & ~SCSCR_TIE);
-                }
+        } else if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
+                u16 ctrl = sci_in(port, SCSCR);
+                sci_out(port, SCSCR, ctrl & ~SCSCR_TIE);
         }
 
         spin_unlock_irqrestore(&port->lock, flags);
@@ -1351,8 +1213,8 @@ static void sci_submit_rx(struct sci_port *s)
                 struct scatterlist *sg = &s->sg_rx[i];
                 struct dma_async_tx_descriptor *desc;
 
-                desc = dmaengine_prep_slave_sg(chan,
-                        sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT);
+                desc = chan->device->device_prep_slave_sg(chan,
+                        sg, 1, DMA_FROM_DEVICE, DMA_PREP_INTERRUPT);
 
                 if (desc) {
                         s->desc_rx[i] = desc;
@@ -1406,8 +1268,8 @@ static void work_fn_rx(struct work_struct *work)
                 /* Handle incomplete DMA receive */
                 struct tty_struct *tty = port->state->port.tty;
                 struct dma_chan *chan = s->chan_rx;
-                struct shdma_desc *sh_desc = container_of(desc,
-                                        struct shdma_desc, async_tx);
+                struct sh_desc *sh_desc = container_of(desc, struct sh_desc,
+                                                       async_tx);
                 unsigned long flags;
                 int count;
 
@@ -1466,8 +1328,8 @@ static void work_fn_tx(struct work_struct *work)
 
         BUG_ON(!sg_dma_len(sg));
 
-        desc = dmaengine_prep_slave_sg(chan,
-                        sg, s->sg_len_tx, DMA_MEM_TO_DEV,
+        desc = chan->device->device_prep_slave_sg(chan,
+                        sg, s->sg_len_tx, DMA_TO_DEVICE,
                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 /* switch to PIO */
@@ -1504,26 +1366,24 @@ static void sci_start_tx(struct uart_port *port)
 
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
         if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
-                u16 new, scr = serial_port_in(port, SCSCR);
+                u16 new, scr = sci_in(port, SCSCR);
                 if (s->chan_tx)
                         new = scr | 0x8000;
                 else
                         new = scr & ~0x8000;
                 if (new != scr)
-                        serial_port_out(port, SCSCR, new);
+                        sci_out(port, SCSCR, new);
         }
 
         if (s->chan_tx && !uart_circ_empty(&s->port.state->xmit) &&
-            s->cookie_tx < 0) {
-                s->cookie_tx = 0;
+            s->cookie_tx < 0)
                 schedule_work(&s->work_tx);
-        }
 #endif
 
         if (!s->chan_tx || port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
                 /* Set TIE (Transmit Interrupt Enable) bit in SCSCR */
-                ctrl = serial_port_in(port, SCSCR);
-                serial_port_out(port, SCSCR, ctrl | SCSCR_TIE);
+                ctrl = sci_in(port, SCSCR);
+                sci_out(port, SCSCR, ctrl | SCSCR_TIE);
         }
 }
 
@@ -1532,77 +1392,50 @@ static void sci_stop_tx(struct uart_port *port)
         unsigned short ctrl;
 
         /* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
-        ctrl = serial_port_in(port, SCSCR);
+        ctrl = sci_in(port, SCSCR);
 
         if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
                 ctrl &= ~0x8000;
 
         ctrl &= ~SCSCR_TIE;
 
-        serial_port_out(port, SCSCR, ctrl);
+        sci_out(port, SCSCR, ctrl);
 }
 
 static void sci_start_rx(struct uart_port *port)
 {
         unsigned short ctrl;
 
-        ctrl = serial_port_in(port, SCSCR) | port_rx_irq_mask(port);
+        ctrl = sci_in(port, SCSCR) | port_rx_irq_mask(port);
 
         if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
                 ctrl &= ~0x4000;
 
-        serial_port_out(port, SCSCR, ctrl);
+        sci_out(port, SCSCR, ctrl);
 }
 
 static void sci_stop_rx(struct uart_port *port)
 {
         unsigned short ctrl;
 
-        ctrl = serial_port_in(port, SCSCR);
+        ctrl = sci_in(port, SCSCR);
 
         if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
                 ctrl &= ~0x4000;
 
         ctrl &= ~port_rx_irq_mask(port);
 
-        serial_port_out(port, SCSCR, ctrl);
+        sci_out(port, SCSCR, ctrl);
 }
 
 static void sci_enable_ms(struct uart_port *port)
 {
-        /*
-         * Not supported by hardware, always a nop.
-         */
+        /* Nothing here yet .. */
 }
 
 static void sci_break_ctl(struct uart_port *port, int break_state)
 {
-        struct sci_port *s = to_sci_port(port);
-        struct plat_sci_reg *reg = sci_regmap[s->cfg->regtype] + SCSPTR;
-        unsigned short scscr, scsptr;
-
-        /* check wheter the port has SCSPTR */
-        if (!reg->size) {
-                /*
-                 * Not supported by hardware. Most parts couple break and rx
-                 * interrupts together, with break detection always enabled.
-                 */
-                return;
-        }
-
-        scsptr = serial_port_in(port, SCSPTR);
-        scscr = serial_port_in(port, SCSCR);
-
-        if (break_state == -1) {
-                scsptr = (scsptr | SCSPTR_SPB2IO) & ~SCSPTR_SPB2DT;
-                scscr &= ~SCSCR_TE;
-        } else {
-                scsptr = (scsptr | SCSPTR_SPB2DT) & ~SCSPTR_SPB2IO;
-                scscr |= SCSCR_TE;
-        }
-
-        serial_port_out(port, SCSPTR, scsptr);
-        serial_port_out(port, SCSCR, scscr);
+        /* Nothing here yet .. */
 }
 
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
@@ -1611,23 +1444,27 @@ static bool filter(struct dma_chan *chan, void *slave)
         struct sh_dmae_slave *param = slave;
 
         dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__,
-                param->shdma_slave.slave_id);
+                param->slave_id);
 
-        chan->private = &param->shdma_slave;
-        return true;
+        if (param->dma_dev == chan->device->dev) {
+                chan->private = param;
+                return true;
+        } else {
+                return false;
+        }
 }
 
 static void rx_timer_fn(unsigned long arg)
 {
         struct sci_port *s = (struct sci_port *)arg;
         struct uart_port *port = &s->port;
-        u16 scr = serial_port_in(port, SCSCR);
+        u16 scr = sci_in(port, SCSCR);
 
         if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
                 scr &= ~0x4000;
                 enable_irq(s->cfg->irqs[1]);
         }
-        serial_port_out(port, SCSCR, scr | SCSCR_RIE);
+        sci_out(port, SCSCR, scr | SCSCR_RIE);
         dev_dbg(port->dev, "DMA Rx timed out\n");
         schedule_work(&s->work_rx);
 }
@@ -1640,10 +1477,10 @@ static void sci_request_dma(struct uart_port *port)
         dma_cap_mask_t mask;
         int nent;
 
-        dev_dbg(port->dev, "%s: port %d\n", __func__,
-                port->line);
+        dev_dbg(port->dev, "%s: port %d DMA %p\n", __func__,
+                port->line, s->cfg->dma_dev);
 
-        if (s->cfg->dma_slave_tx <= 0 || s->cfg->dma_slave_rx <= 0)
+        if (!s->cfg->dma_dev)
                 return;
 
         dma_cap_zero(mask);
@@ -1652,7 +1489,8 @@ static void sci_request_dma(struct uart_port *port)
         param = &s->param_tx;
 
         /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_TX */
-        param->shdma_slave.slave_id = s->cfg->dma_slave_tx;
+        param->slave_id = s->cfg->dma_slave_tx;
+        param->dma_dev = s->cfg->dma_dev;
 
         s->cookie_tx = -EINVAL;
         chan = dma_request_channel(mask, filter, param);
@@ -1680,7 +1518,8 @@ static void sci_request_dma(struct uart_port *port)
         param = &s->param_rx;
 
         /* Slave ID, e.g., SHDMA_SLAVE_SCIF0_RX */
-        param->shdma_slave.slave_id = s->cfg->dma_slave_rx;
+        param->slave_id = s->cfg->dma_slave_rx;
+        param->dma_dev = s->cfg->dma_dev;
 
         chan = dma_request_channel(mask, filter, param);
         dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);
@@ -1725,6 +1564,9 @@ static void sci_free_dma(struct uart_port *port)
 {
         struct sci_port *s = to_sci_port(port);
 
+        if (!s->cfg->dma_dev)
+                return;
+
         if (s->chan_tx)
                 sci_tx_dma_release(s, false);
         if (s->chan_rx)
@@ -1743,21 +1585,20 @@ static inline void sci_free_dma(struct uart_port *port)
 static int sci_startup(struct uart_port *port)
 {
         struct sci_port *s = to_sci_port(port);
-        unsigned long flags;
         int ret;
 
         dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
 
+        sci_port_enable(s);
+
         ret = sci_request_irq(s);
         if (unlikely(ret < 0))
                 return ret;
 
         sci_request_dma(port);
 
-        spin_lock_irqsave(&port->lock, flags);
         sci_start_tx(port);
         sci_start_rx(port);
-        spin_unlock_irqrestore(&port->lock, flags);
 
         return 0;
 }
@@ -1765,17 +1606,16 @@ static int sci_startup(struct uart_port *port)
 static void sci_shutdown(struct uart_port *port)
 {
         struct sci_port *s = to_sci_port(port);
-        unsigned long flags;
 
         dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
 
-        spin_lock_irqsave(&port->lock, flags);
         sci_stop_rx(port);
         sci_stop_tx(port);
-        spin_unlock_irqrestore(&port->lock, flags);
 
         sci_free_dma(port);
         sci_free_irq(s);
+
+        sci_port_disable(s);
 }
 
 static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
@@ -1802,27 +1642,25 @@ static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
 
 static void sci_reset(struct uart_port *port)
 {
-        struct plat_sci_reg *reg;
         unsigned int status;
 
         do {
-                status = serial_port_in(port, SCxSR);
+                status = sci_in(port, SCxSR);
         } while (!(status & SCxSR_TEND(port)));
 
-        serial_port_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
+        sci_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
 
-        reg = sci_getreg(port, SCFCR);
-        if (reg->size)
-                serial_port_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
+        if (port->type != PORT_SCI)
+                sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
 }
 
 static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
                             struct ktermios *old)
 {
         struct sci_port *s = to_sci_port(port);
-        struct plat_sci_reg *reg;
-        unsigned int baud, smr_val, max_baud, cks;
+        unsigned int baud, smr_val, max_baud;
         int t = -1;
+        u16 scfcr = 0;
 
         /*
          * earlyprintk comes here early on with port->uartclk set to zero.
@@ -1842,7 +1680,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 
         sci_reset(port);
 
-        smr_val = serial_port_in(port, SCSMR) & 3;
+        smr_val = sci_in(port, SCSMR) & 3;
 
         if ((termios->c_cflag & CSIZE) == CS7)
                 smr_val |= 0x40;
@@ -1855,43 +1693,26 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 
         uart_update_timeout(port, termios->c_cflag, baud);
 
-        for (cks = 0; t >= 256 && cks <= 3; cks++)
-                t >>= 2;
+        sci_out(port, SCSMR, smr_val);
+
+        dev_dbg(port->dev, "%s: SMR %x, t %x, SCSCR %x\n", __func__, smr_val, t,
+                s->cfg->scscr);
 
-        dev_dbg(port->dev, "%s: SMR %x, cks %x, t %x, SCSCR %x\n",
-                __func__, smr_val, cks, t, s->cfg->scscr);
+        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);
 
-        if (t >= 0) {
-                serial_port_out(port, SCSMR, (smr_val & ~3) | cks);
-                serial_port_out(port, SCBRR, t);
+                sci_out(port, SCBRR, t);
                 udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
-        } else
-                serial_port_out(port, SCSMR, smr_val);
+        }
 
         sci_init_pins(port, termios->c_cflag);
+        sci_out(port, SCFCR, scfcr | ((termios->c_cflag & CRTSCTS) ? SCFCR_MCE : 0));
 
-        reg = sci_getreg(port, SCFCR);
-        if (reg->size) {
-                unsigned short ctrl = serial_port_in(port, SCFCR);
-
-                if (s->cfg->capabilities & SCIx_HAVE_RTSCTS) {
-                        if (termios->c_cflag & CRTSCTS)
-                                ctrl |= SCFCR_MCE;
-                        else
-                                ctrl &= ~SCFCR_MCE;
-                }
-
-                /*
-                 * As we've done a sci_reset() above, ensure we don't
-                 * interfere with the FIFOs while toggling MCE. As the
-                 * reset values could still be set, simply mask them out.
-                 */
-                ctrl &= ~(SCFCR_RFRST | SCFCR_TFRST);
-
-                serial_port_out(port, SCFCR, ctrl);
-        }
-
-        serial_port_out(port, SCSCR, s->cfg->scscr);
+        sci_out(port, SCSCR, s->cfg->scscr);
 
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
         /*
@@ -1921,21 +1742,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
         sci_port_disable(s);
 }
 
-static void sci_pm(struct uart_port *port, unsigned int state,
-                   unsigned int oldstate)
-{
-        struct sci_port *sci_port = to_sci_port(port);
-
-        switch (state) {
-        case 3:
-                sci_port_disable(sci_port);
-                break;
-        default:
-                sci_port_enable(sci_port);
-                break;
-        }
-}
-
 static const char *sci_type(struct uart_port *port)
 {
         switch (port->type) {
@@ -2057,7 +1863,6 @@ static struct uart_ops sci_uart_ops = {
         .startup        = sci_startup,
         .shutdown       = sci_shutdown,
         .set_termios    = sci_set_termios,
-        .pm             = sci_pm,
         .type           = sci_type,
         .release_port   = sci_release_port,
         .request_port   = sci_request_port,
@@ -2069,7 +1874,7 @@ static struct uart_ops sci_uart_ops = {
 #endif
 };
 
-static int sci_init_single(struct platform_device *dev,
+static int __devinit sci_init_single(struct platform_device *dev,
                                      struct sci_port *sci_port,
                                      unsigned int index,
                                      struct plat_sci_port *p)
@@ -2077,8 +1882,6 @@ static int sci_init_single(struct platform_device *dev,
         struct uart_port *port = &sci_port->port;
         int ret;
 
-        sci_port->cfg   = p;
-
         port->ops       = &sci_uart_ops;
         port->iotype    = UPIO_MEM;
         port->line      = index;
@@ -2124,8 +1927,7 @@ static int sci_init_single(struct platform_device *dev,
 
                 port->dev = &dev->dev;
 
-                sci_init_gpios(sci_port);
-
+                pm_runtime_irq_safe(&dev->dev);
                 pm_runtime_enable(&dev->dev);
         }
 
@@ -2159,6 +1961,8 @@ static int sci_init_single(struct platform_device *dev,
                 p->error_mask |= (1 << p->overrun_bit);
         }
 
+        sci_port->cfg           = p;
+
         port->mapbase           = p->mapbase;
         port->type              = p->type;
         port->flags             = p->flags;
@@ -2172,28 +1976,18 @@ static int sci_init_single(struct platform_device *dev,
          * For the muxed case there's nothing more to do.
          */
         port->irq               = p->irqs[SCIx_RXI_IRQ];
-        port->irqflags          = 0;
+        port->irqflags          = IRQF_DISABLED;
 
         port->serial_in         = sci_serial_in;
         port->serial_out        = sci_serial_out;
 
-        if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0)
-                dev_dbg(port->dev, "DMA tx %d, rx %d\n",
-                        p->dma_slave_tx, p->dma_slave_rx);
+        if (p->dma_dev)
+                dev_dbg(port->dev, "DMA device %p, tx %d, rx %d\n",
+                        p->dma_dev, p->dma_slave_tx, p->dma_slave_rx);
 
         return 0;
 }
 
-static void sci_cleanup_single(struct sci_port *port)
-{
-        sci_free_gpios(port);
-
-        clk_put(port->iclk);
-        clk_put(port->fclk);
-
-        pm_runtime_disable(port->port.dev);
-}
-
 #ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
 static void serial_console_putchar(struct uart_port *port, int ch)
 {
@@ -2209,38 +2003,21 @@ static void serial_console_write(struct console *co, const char *s,
 {
         struct sci_port *sci_port = &sci_ports[co->index];
         struct uart_port *port = &sci_port->port;
-        unsigned short bits, ctrl;
-        unsigned long flags;
-        int locked = 1;
+        unsigned short bits;
 
-        local_irq_save(flags);
-        if (port->sysrq)
-                locked = 0;
-        else if (oops_in_progress)
-                locked = spin_trylock(&port->lock);
-        else
-                spin_lock(&port->lock);
-
-        /* first save the SCSCR then disable the interrupts */
-        ctrl = serial_port_in(port, SCSCR);
-        serial_port_out(port, SCSCR, sci_port->cfg->scscr);
+        sci_port_enable(sci_port);
 
         uart_console_write(port, s, count, serial_console_putchar);
 
         /* wait until fifo is empty and last bit has been transmitted */
         bits = SCxSR_TDxE(port) | SCxSR_TEND(port);
-        while ((serial_port_in(port, SCxSR) & bits) != bits)
+        while ((sci_in(port, SCxSR) & bits) != bits)
                 cpu_relax();
 
-        /* restore the SCSCR */
-        serial_port_out(port, SCSCR, ctrl);
-
-        if (locked)
-                spin_unlock(&port->lock);
-        local_irq_restore(flags);
+        sci_port_disable(sci_port);
 }
 
-static int serial_console_setup(struct console *co, char *options)
+static int __devinit serial_console_setup(struct console *co, char *options)
 {
         struct sci_port *sci_port;
         struct uart_port *port;
@@ -2269,9 +2046,13 @@ static int serial_console_setup(struct console *co, char *options)
         if (unlikely(ret != 0))
                 return ret;
 
+        sci_port_enable(sci_port);
+
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
 
+        sci_port_disable(sci_port);
+
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
@@ -2294,7 +2075,7 @@ static struct console early_serial_console = {
 
 static char early_serial_buf[32];
 
-static int sci_probe_earlyprintk(struct platform_device *pdev)
+static int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
 {
         struct plat_sci_port *cfg = pdev->dev.platform_data;
 
@@ -2314,15 +2095,47 @@ static int sci_probe_earlyprintk(struct platform_device *pdev)
         return 0;
 }
 
+#define uart_console(port)      ((port)->cons->index == (port)->line)
+
+static int sci_runtime_suspend(struct device *dev)
+{
+        struct sci_port *sci_port = dev_get_drvdata(dev);
+        struct uart_port *port = &sci_port->port;
+
+        if (uart_console(port)) {
+                sci_port->saved_smr = sci_in(port, SCSMR);
+                sci_port->saved_brr = sci_in(port, SCBRR);
+                sci_port->saved_fcr = sci_in(port, SCFCR);
+        }
+        return 0;
+}
+
+static int sci_runtime_resume(struct device *dev)
+{
+        struct sci_port *sci_port = dev_get_drvdata(dev);
+        struct uart_port *port = &sci_port->port;
+
+        if (uart_console(port)) {
+                sci_reset(port);
+                sci_out(port, SCSMR, sci_port->saved_smr);
+                sci_out(port, SCBRR, sci_port->saved_brr);
+                sci_out(port, SCFCR, sci_port->saved_fcr);
+                sci_out(port, SCSCR, sci_port->cfg->scscr);
+        }
+        return 0;
+}
+
 #define SCI_CONSOLE     (&serial_console)
 
 #else
-static inline int sci_probe_earlyprintk(struct platform_device *pdev)
+static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
 {
         return -EINVAL;
 }
 
 #define SCI_CONSOLE     NULL
+#define sci_runtime_suspend     NULL
+#define sci_runtime_resume      NULL
 
 #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
 
@@ -2348,12 +2161,14 @@ static int sci_remove(struct platform_device *dev)
 
         uart_remove_one_port(&sci_uart_driver, &port->port);
 
-        sci_cleanup_single(port);
+        clk_put(port->iclk);
+        clk_put(port->fclk);
 
+        pm_runtime_disable(&dev->dev);
         return 0;
 }
 
-static int sci_probe_single(struct platform_device *dev,
+static int __devinit sci_probe_single(struct platform_device *dev,
                                       unsigned int index,
                                       struct plat_sci_port *p,
                                       struct sci_port *sciport)
@@ -2367,23 +2182,17 @@ static int sci_probe_single(struct platform_device *dev,
                            index+1, SCI_NPORTS);
                 dev_notice(&dev->dev, "Consider bumping "
                            "CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
-                return -EINVAL;
+                return 0;
         }
 
         ret = sci_init_single(dev, sciport, index, p);
         if (ret)
                 return ret;
 
-        ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
-        if (ret) {
-                sci_cleanup_single(sciport);
-                return ret;
-        }
-
-        return 0;
+        return uart_add_one_port(&sci_uart_driver, &sciport->port);
 }
 
-static int sci_probe(struct platform_device *dev)
+static int __devinit sci_probe(struct platform_device *dev)
 {
         struct plat_sci_port *p = dev->dev.platform_data;
         struct sci_port *sp = &sci_ports[dev->id];
@@ -2401,22 +2210,24 @@ static int sci_probe(struct platform_device *dev)
 
         ret = sci_probe_single(dev, dev->id, p, sp);
         if (ret)
-                return ret;
+                goto err_unreg;
 
         sp->freq_transition.notifier_call = sci_notifier;
 
         ret = cpufreq_register_notifier(&sp->freq_transition,
                                         CPUFREQ_TRANSITION_NOTIFIER);
-        if (unlikely(ret < 0)) {
-                sci_cleanup_single(sp);
-                return ret;
-        }
+        if (unlikely(ret < 0))
+                goto err_unreg;
 
 #ifdef CONFIG_SH_STANDARD_BIOS
         sh_bios_gdb_detach();
 #endif
 
         return 0;
+
+err_unreg:
+        sci_remove(dev);
+        return ret;
 }
 
 static int sci_suspend(struct device *dev)
@@ -2440,6 +2251,8 @@ static int sci_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops sci_dev_pm_ops = {
+        .runtime_suspend = sci_runtime_suspend,
+        .runtime_resume = sci_runtime_resume,
         .suspend        = sci_suspend,
         .resume         = sci_resume,
 };
diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
index 4c22a1529aa..e9bed038aa1 100644
--- a/drivers/tty/serial/sh-sci.h
+++ b/drivers/tty/serial/sh-sci.h
@@ -17,13 +17,11 @@
     defined(CONFIG_ARCH_SH73A0) || \
     defined(CONFIG_ARCH_SH7367) || \
     defined(CONFIG_ARCH_SH7377) || \
-    defined(CONFIG_ARCH_SH7372) || \
-    defined(CONFIG_ARCH_R8A7740)
-
-# define SCxSR_RDxF_CLEAR(port)  (serial_port_in(port, SCxSR) & 0xfffc)
-# define SCxSR_ERROR_CLEAR(port) (serial_port_in(port, SCxSR) & 0xfd73)
-# define SCxSR_TDxE_CLEAR(port)  (serial_port_in(port, SCxSR) & 0xffdf)
-# define SCxSR_BREAK_CLEAR(port) (serial_port_in(port, SCxSR) & 0xffe3)
+    defined(CONFIG_ARCH_SH7372)
+# 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
 # define SCxSR_RDxF_CLEAR(port)  (((port)->type == PORT_SCI) ? 0xbc : 0x00fc)
 # define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0073)
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
deleted file mode 100644
index 5da5cb96276..00000000000
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- * Driver for CSR SiRFprimaII onboard UARTs.
- *
- * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
- */
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/platform_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/clk.h>
-#include <linux/of.h>
-#include <linux/slab.h>
-#include <linux/io.h>
-#include <asm/irq.h>
-#include <asm/mach/irq.h>
-#include <linux/pinctrl/consumer.h>
-
-#include "sirfsoc_uart.h"
-
-static unsigned int
-sirfsoc_uart_pio_tx_chars(struct sirfsoc_uart_port *sirfport, int count);
-static unsigned int
-sirfsoc_uart_pio_rx_chars(struct uart_port *port, unsigned int max_rx_count);
-static struct uart_driver sirfsoc_uart_drv;
-
-static const struct sirfsoc_baudrate_to_regv baudrate_to_regv[] = {
-        {4000000, 2359296},
-        {3500000, 1310721},
-        {3000000, 1572865},
-        {2500000, 1245186},
-        {2000000, 1572866},
-        {1500000, 1245188},
-        {1152000, 1638404},
-        {1000000, 1572869},
-        {921600, 1114120},
-        {576000, 1245196},
-        {500000, 1245198},
-        {460800, 1572876},
-        {230400, 1310750},
-        {115200, 1310781},
-        {57600, 1310843},
-        {38400, 1114328},
-        {19200, 1114545},
-        {9600, 1114979},
-};
-
-static struct sirfsoc_uart_port sirfsoc_uart_ports[SIRFSOC_UART_NR] = {
-        [0] = {
-                .port = {
-                        .iotype         = UPIO_MEM,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 0,
-                },
-        },
-        [1] = {
-                .port = {
-                        .iotype         = UPIO_MEM,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 1,
-                },
-        },
-        [2] = {
-                .port = {
-                        .iotype         = UPIO_MEM,
-                        .flags          = UPF_BOOT_AUTOCONF,
-                        .line           = 2,
-                },
-        },
-};
-
-static inline struct sirfsoc_uart_port *to_sirfport(struct uart_port *port)
-{
-        return container_of(port, struct sirfsoc_uart_port, port);
-}
-
-static inline unsigned int sirfsoc_uart_tx_empty(struct uart_port *port)
-{
-        unsigned long reg;
-        reg = rd_regl(port, SIRFUART_TX_FIFO_STATUS);
-        if (reg & SIRFUART_FIFOEMPTY_MASK(port))
-                return TIOCSER_TEMT;
-        else
-                return 0;
-}
-
-static unsigned int sirfsoc_uart_get_mctrl(struct uart_port *port)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        if (!(sirfport->ms_enabled)) {
-                goto cts_asserted;
-        } else if (sirfport->hw_flow_ctrl) {
-                if (!(rd_regl(port, SIRFUART_AFC_CTRL) &
-                                                SIRFUART_CTS_IN_STATUS))
-                        goto cts_asserted;
-                else
-                        goto cts_deasserted;
-        }
-cts_deasserted:
-        return TIOCM_CAR | TIOCM_DSR;
-cts_asserted:
-        return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
-}
-
-static void sirfsoc_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        unsigned int assert = mctrl & TIOCM_RTS;
-        unsigned int val = assert ? SIRFUART_AFC_CTRL_RX_THD : 0x0;
-        unsigned int current_val;
-        if (sirfport->hw_flow_ctrl) {
-                current_val = rd_regl(port, SIRFUART_AFC_CTRL) & ~0xFF;
-                val |= current_val;
-                wr_regl(port, SIRFUART_AFC_CTRL, val);
-        }
-}
-
-static void sirfsoc_uart_stop_tx(struct uart_port *port)
-{
-        unsigned int regv;
-        regv = rd_regl(port, SIRFUART_INT_EN);
-        wr_regl(port, SIRFUART_INT_EN, regv & ~SIRFUART_TX_INT_EN);
-}
-
-void sirfsoc_uart_start_tx(struct uart_port *port)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        unsigned long regv;
-        sirfsoc_uart_pio_tx_chars(sirfport, 1);
-        wr_regl(port, SIRFUART_TX_FIFO_OP, SIRFUART_TX_FIFO_START);
-        regv = rd_regl(port, SIRFUART_INT_EN);
-        wr_regl(port, SIRFUART_INT_EN, regv | SIRFUART_TX_INT_EN);
-}
-
-static void sirfsoc_uart_stop_rx(struct uart_port *port)
-{
-        unsigned long regv;
-        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
-        regv = rd_regl(port, SIRFUART_INT_EN);
-        wr_regl(port, SIRFUART_INT_EN, regv & ~SIRFUART_RX_IO_INT_EN);
-}
-
-static void sirfsoc_uart_disable_ms(struct uart_port *port)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        unsigned long reg;
-        sirfport->ms_enabled = 0;
-        if (!sirfport->hw_flow_ctrl)
-                return;
-        reg = rd_regl(port, SIRFUART_AFC_CTRL);
-        wr_regl(port, SIRFUART_AFC_CTRL, reg & ~0x3FF);
-        reg = rd_regl(port, SIRFUART_INT_EN);
-        wr_regl(port, SIRFUART_INT_EN, reg & ~SIRFUART_CTS_INT_EN);
-}
-
-static void sirfsoc_uart_enable_ms(struct uart_port *port)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        unsigned long reg;
-        unsigned long flg;
-        if (!sirfport->hw_flow_ctrl)
-                return;
-        flg = SIRFUART_AFC_RX_EN | SIRFUART_AFC_TX_EN;
-        reg = rd_regl(port, SIRFUART_AFC_CTRL);
-        wr_regl(port, SIRFUART_AFC_CTRL, reg | flg);
-        reg = rd_regl(port, SIRFUART_INT_EN);
-        wr_regl(port, SIRFUART_INT_EN, reg | SIRFUART_CTS_INT_EN);
-        uart_handle_cts_change(port,
-                !(rd_regl(port, SIRFUART_AFC_CTRL) & SIRFUART_CTS_IN_STATUS));
-        sirfport->ms_enabled = 1;
-}
-
-static void sirfsoc_uart_break_ctl(struct uart_port *port, int break_state)
-{
-        unsigned long ulcon = rd_regl(port, SIRFUART_LINE_CTRL);
-        if (break_state)
-                ulcon |= SIRFUART_SET_BREAK;
-        else
-                ulcon &= ~SIRFUART_SET_BREAK;
-        wr_regl(port, SIRFUART_LINE_CTRL, ulcon);
-}
-
-static unsigned int
-sirfsoc_uart_pio_rx_chars(struct uart_port *port, unsigned int max_rx_count)
-{
-        unsigned int ch, rx_count = 0;
-        struct tty_struct *tty;
-
-        tty = tty_port_tty_get(&port->state->port);
-        if (!tty)
-                return -ENODEV;
-
-        while (!(rd_regl(port, SIRFUART_RX_FIFO_STATUS) &
-                                        SIRFUART_FIFOEMPTY_MASK(port))) {
-                ch = rd_regl(port, SIRFUART_RX_FIFO_DATA) | SIRFUART_DUMMY_READ;
-                if (unlikely(uart_handle_sysrq_char(port, ch)))
-                        continue;
-                uart_insert_char(port, 0, 0, ch, TTY_NORMAL);
-                rx_count++;
-                if (rx_count >= max_rx_count)
-                        break;
-        }
-
-        port->icount.rx += rx_count;
-        tty_flip_buffer_push(tty);
-        tty_kref_put(tty);
-
-        return rx_count;
-}
-
-static unsigned int
-sirfsoc_uart_pio_tx_chars(struct sirfsoc_uart_port *sirfport, int count)
-{
-        struct uart_port *port = &sirfport->port;
-        struct circ_buf *xmit = &port->state->xmit;
-        unsigned int num_tx = 0;
-        while (!uart_circ_empty(xmit) &&
-                !(rd_regl(port, SIRFUART_TX_FIFO_STATUS) &
-                                        SIRFUART_FIFOFULL_MASK(port)) &&
-                count--) {
-                wr_regl(port, SIRFUART_TX_FIFO_DATA, xmit->buf[xmit->tail]);
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                port->icount.tx++;
-                num_tx++;
-        }
-        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(port);
-        return num_tx;
-}
-
-static irqreturn_t sirfsoc_uart_isr(int irq, void *dev_id)
-{
-        unsigned long intr_status;
-        unsigned long cts_status;
-        unsigned long flag = TTY_NORMAL;
-        struct sirfsoc_uart_port *sirfport = (struct sirfsoc_uart_port *)dev_id;
-        struct uart_port *port = &sirfport->port;
-        struct uart_state *state = port->state;
-        struct circ_buf *xmit = &port->state->xmit;
-        intr_status = rd_regl(port, SIRFUART_INT_STATUS);
-        wr_regl(port, SIRFUART_INT_STATUS, intr_status);
-        intr_status &= rd_regl(port, SIRFUART_INT_EN);
-        if (unlikely(intr_status & (SIRFUART_ERR_INT_STAT))) {
-                if (intr_status & SIRFUART_RXD_BREAK) {
-                        if (uart_handle_break(port))
-                                goto recv_char;
-                        uart_insert_char(port, intr_status,
-                                        SIRFUART_RX_OFLOW, 0, TTY_BREAK);
-                        return IRQ_HANDLED;
-                }
-                if (intr_status & SIRFUART_RX_OFLOW)
-                        port->icount.overrun++;
-                if (intr_status & SIRFUART_FRM_ERR) {
-                        port->icount.frame++;
-                        flag = TTY_FRAME;
-                }
-                if (intr_status & SIRFUART_PARITY_ERR)
-                        flag = TTY_PARITY;
-                wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_RESET);
-                wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
-                wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_START);
-                intr_status &= port->read_status_mask;
-                uart_insert_char(port, intr_status,
-                                        SIRFUART_RX_OFLOW_INT, 0, flag);
-        }
-recv_char:
-        if (intr_status & SIRFUART_CTS_INT_EN) {
-                cts_status = !(rd_regl(port, SIRFUART_AFC_CTRL) &
-                                                        SIRFUART_CTS_IN_STATUS);
-                if (cts_status != 0) {
-                        uart_handle_cts_change(port, 1);
-                } else {
-                        uart_handle_cts_change(port, 0);
-                        wake_up_interruptible(&state->port.delta_msr_wait);
-                }
-        }
-        if (intr_status & SIRFUART_RX_IO_INT_EN)
-                sirfsoc_uart_pio_rx_chars(port, SIRFSOC_UART_IO_RX_MAX_CNT);
-        if (intr_status & SIRFUART_TX_INT_EN) {
-                if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                        return IRQ_HANDLED;
-                } else {
-                        sirfsoc_uart_pio_tx_chars(sirfport,
-                                        SIRFSOC_UART_IO_TX_REASONABLE_CNT);
-                        if ((uart_circ_empty(xmit)) &&
-                                (rd_regl(port, SIRFUART_TX_FIFO_STATUS) &
-                                                SIRFUART_FIFOEMPTY_MASK(port)))
-                                sirfsoc_uart_stop_tx(port);
-                }
-        }
-        return IRQ_HANDLED;
-}
-
-static void sirfsoc_uart_start_rx(struct uart_port *port)
-{
-        unsigned long regv;
-        regv = rd_regl(port, SIRFUART_INT_EN);
-        wr_regl(port, SIRFUART_INT_EN, regv | SIRFUART_RX_IO_INT_EN);
-        wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_RESET);
-        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
-        wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_START);
-}
-
-static unsigned int
-sirfsoc_calc_sample_div(unsigned long baud_rate,
-                        unsigned long ioclk_rate, unsigned long *setted_baud)
-{
-        unsigned long min_delta = ~0UL;
-        unsigned short sample_div;
-        unsigned int regv = 0;
-        unsigned long ioclk_div;
-        unsigned long baud_tmp;
-        int temp_delta;
-
-        for (sample_div = SIRF_MIN_SAMPLE_DIV;
-                        sample_div <= SIRF_MAX_SAMPLE_DIV; sample_div++) {
-                ioclk_div = (ioclk_rate / (baud_rate * (sample_div + 1))) - 1;
-                if (ioclk_div > SIRF_IOCLK_DIV_MAX)
-                        continue;
-                baud_tmp = ioclk_rate / ((ioclk_div + 1) * (sample_div + 1));
-                temp_delta = baud_tmp - baud_rate;
-                temp_delta = (temp_delta > 0) ? temp_delta : -temp_delta;
-                if (temp_delta < min_delta) {
-                        regv = regv & (~SIRF_IOCLK_DIV_MASK);
-                        regv = regv | ioclk_div;
-                        regv = regv & (~SIRF_SAMPLE_DIV_MASK);
-                        regv = regv | (sample_div << SIRF_SAMPLE_DIV_SHIFT);
-                        min_delta = temp_delta;
-                        *setted_baud = baud_tmp;
-                }
-        }
-        return regv;
-}
-
-static void sirfsoc_uart_set_termios(struct uart_port *port,
-                                       struct ktermios *termios,
-                                       struct ktermios *old)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        unsigned long   ioclk_rate;
-        unsigned long   config_reg = 0;
-        unsigned long   baud_rate;
-        unsigned long   setted_baud;
-        unsigned long   flags;
-        unsigned long   ic;
-        unsigned int    clk_div_reg = 0;
-        unsigned long   temp_reg_val;
-        unsigned long   rx_time_out;
-        int             threshold_div;
-        int             temp;
-
-        ioclk_rate = 150000000;
-        switch (termios->c_cflag & CSIZE) {
-        default:
-        case CS8:
-                config_reg |= SIRFUART_DATA_BIT_LEN_8;
-                break;
-        case CS7:
-                config_reg |= SIRFUART_DATA_BIT_LEN_7;
-                break;
-        case CS6:
-                config_reg |= SIRFUART_DATA_BIT_LEN_6;
-                break;
-        case CS5:
-                config_reg |= SIRFUART_DATA_BIT_LEN_5;
-                break;
-        }
-        if (termios->c_cflag & CSTOPB)
-                config_reg |= SIRFUART_STOP_BIT_LEN_2;
-        baud_rate = uart_get_baud_rate(port, termios, old, 0, 4000000);
-        spin_lock_irqsave(&port->lock, flags);
-        port->read_status_mask = SIRFUART_RX_OFLOW_INT;
-        port->ignore_status_mask = 0;
-        /* read flags */
-        if (termios->c_iflag & INPCK)
-                port->read_status_mask |=
-                        SIRFUART_FRM_ERR_INT | SIRFUART_PARITY_ERR_INT;
-        if (termios->c_iflag & (BRKINT | PARMRK))
-                port->read_status_mask |= SIRFUART_RXD_BREAK_INT;
-        /* ignore flags */
-        if (termios->c_iflag & IGNPAR)
-                port->ignore_status_mask |=
-                        SIRFUART_FRM_ERR_INT | SIRFUART_PARITY_ERR_INT;
-        if ((termios->c_cflag & CREAD) == 0)
-                port->ignore_status_mask |= SIRFUART_DUMMY_READ;
-        /* enable parity if PARENB is set*/
-        if (termios->c_cflag & PARENB) {
-                if (termios->c_cflag & CMSPAR) {
-                        if (termios->c_cflag & PARODD)
-                                config_reg |= SIRFUART_STICK_BIT_MARK;
-                        else
-                                config_reg |= SIRFUART_STICK_BIT_SPACE;
-                } else if (termios->c_cflag & PARODD) {
-                        config_reg |= SIRFUART_STICK_BIT_ODD;
-                } else {
-                        config_reg |= SIRFUART_STICK_BIT_EVEN;
-                }
-        }
-        /* Hardware Flow Control Settings */
-        if (UART_ENABLE_MS(port, termios->c_cflag)) {
-                if (!sirfport->ms_enabled)
-                        sirfsoc_uart_enable_ms(port);
-        } else {
-                if (sirfport->ms_enabled)
-                        sirfsoc_uart_disable_ms(port);
-        }
-
-        /* common rate: fast calculation */
-        for (ic = 0; ic < SIRF_BAUD_RATE_SUPPORT_NR; ic++)
-                if (baud_rate == baudrate_to_regv[ic].baud_rate)
-                        clk_div_reg = baudrate_to_regv[ic].reg_val;
-        setted_baud = baud_rate;
-        /* arbitary rate setting */
-        if (unlikely(clk_div_reg == 0))
-                clk_div_reg = sirfsoc_calc_sample_div(baud_rate, ioclk_rate,
-                                                                &setted_baud);
-        wr_regl(port, SIRFUART_DIVISOR, clk_div_reg);
-
-        if (tty_termios_baud_rate(termios))
-                tty_termios_encode_baud_rate(termios, setted_baud, setted_baud);
-
-        /* set receive timeout */
-        rx_time_out = SIRFSOC_UART_RX_TIMEOUT(baud_rate, 20000);
-        rx_time_out = (rx_time_out > 0xFFFF) ? 0xFFFF : rx_time_out;
-        config_reg |= SIRFUART_RECV_TIMEOUT(rx_time_out);
-        temp_reg_val = rd_regl(port, SIRFUART_TX_FIFO_OP);
-        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
-        wr_regl(port, SIRFUART_TX_FIFO_OP,
-                                temp_reg_val & ~SIRFUART_TX_FIFO_START);
-        wr_regl(port, SIRFUART_TX_DMA_IO_CTRL, SIRFUART_TX_MODE_IO);
-        wr_regl(port, SIRFUART_RX_DMA_IO_CTRL, SIRFUART_RX_MODE_IO);
-        wr_regl(port, SIRFUART_LINE_CTRL, config_reg);
-
-        /* Reset Rx/Tx FIFO Threshold level for proper baudrate */
-        if (baud_rate < 1000000)
-                threshold_div = 1;
-        else
-                threshold_div = 2;
-        temp = port->line == 1 ? 16 : 64;
-        wr_regl(port, SIRFUART_TX_FIFO_CTRL, temp / threshold_div);
-        wr_regl(port, SIRFUART_RX_FIFO_CTRL, temp / threshold_div);
-        temp_reg_val |= SIRFUART_TX_FIFO_START;
-        wr_regl(port, SIRFUART_TX_FIFO_OP, temp_reg_val);
-        uart_update_timeout(port, termios->c_cflag, baud_rate);
-        sirfsoc_uart_start_rx(port);
-        wr_regl(port, SIRFUART_TX_RX_EN, SIRFUART_TX_EN | SIRFUART_RX_EN);
-        spin_unlock_irqrestore(&port->lock, flags);
-}
-
-static void startup_uart_controller(struct uart_port *port)
-{
-        unsigned long temp_regv;
-        int temp;
-        temp_regv = rd_regl(port, SIRFUART_TX_DMA_IO_CTRL);
-        wr_regl(port, SIRFUART_TX_DMA_IO_CTRL, temp_regv | SIRFUART_TX_MODE_IO);
-        temp_regv = rd_regl(port, SIRFUART_RX_DMA_IO_CTRL);
-        wr_regl(port, SIRFUART_RX_DMA_IO_CTRL, temp_regv | SIRFUART_RX_MODE_IO);
-        wr_regl(port, SIRFUART_TX_DMA_IO_LEN, 0);
-        wr_regl(port, SIRFUART_RX_DMA_IO_LEN, 0);
-        wr_regl(port, SIRFUART_TX_RX_EN, SIRFUART_RX_EN | SIRFUART_TX_EN);
-        wr_regl(port, SIRFUART_TX_FIFO_OP, SIRFUART_TX_FIFO_RESET);
-        wr_regl(port, SIRFUART_TX_FIFO_OP, 0);
-        wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_RESET);
-        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
-        temp = port->line == 1 ? 16 : 64;
-        wr_regl(port, SIRFUART_TX_FIFO_CTRL, temp);
-        wr_regl(port, SIRFUART_RX_FIFO_CTRL, temp);
-}
-
-static int sirfsoc_uart_startup(struct uart_port *port)
-{
-        struct sirfsoc_uart_port *sirfport      = to_sirfport(port);
-        unsigned int index                      = port->line;
-        int ret;
-        set_irq_flags(port->irq, IRQF_VALID | IRQF_NOAUTOEN);
-        ret = request_irq(port->irq,
-                                sirfsoc_uart_isr,
-                                0,
-                                SIRFUART_PORT_NAME,
-                                sirfport);
-        if (ret != 0) {
-                dev_err(port->dev, "UART%d request IRQ line (%d) failed.\n",
-                                                        index, port->irq);
-                goto irq_err;
-        }
-        startup_uart_controller(port);
-        enable_irq(port->irq);
-irq_err:
-        return ret;
-}
-
-static void sirfsoc_uart_shutdown(struct uart_port *port)
-{
-        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-        wr_regl(port, SIRFUART_INT_EN, 0);
-        free_irq(port->irq, sirfport);
-        if (sirfport->ms_enabled) {
-                sirfsoc_uart_disable_ms(port);
-                sirfport->ms_enabled = 0;
-        }
-}
-
-static const char *sirfsoc_uart_type(struct uart_port *port)
-{
-        return port->type == SIRFSOC_PORT_TYPE ? SIRFUART_PORT_NAME : NULL;
-}
-
-static int sirfsoc_uart_request_port(struct uart_port *port)
-{
-        void *ret;
-        ret = request_mem_region(port->mapbase,
-                                SIRFUART_MAP_SIZE, SIRFUART_PORT_NAME);
-        return ret ? 0 : -EBUSY;
-}
-
-static void sirfsoc_uart_release_port(struct uart_port *port)
-{
-        release_mem_region(port->mapbase, SIRFUART_MAP_SIZE);
-}
-
-static void sirfsoc_uart_config_port(struct uart_port *port, int flags)
-{
-        if (flags & UART_CONFIG_TYPE) {
-                port->type = SIRFSOC_PORT_TYPE;
-                sirfsoc_uart_request_port(port);
-        }
-}
-
-static struct uart_ops sirfsoc_uart_ops = {
-        .tx_empty       = sirfsoc_uart_tx_empty,
-        .get_mctrl      = sirfsoc_uart_get_mctrl,
-        .set_mctrl      = sirfsoc_uart_set_mctrl,
-        .stop_tx        = sirfsoc_uart_stop_tx,
-        .start_tx       = sirfsoc_uart_start_tx,
-        .stop_rx        = sirfsoc_uart_stop_rx,
-        .enable_ms      = sirfsoc_uart_enable_ms,
-        .break_ctl      = sirfsoc_uart_break_ctl,
-        .startup        = sirfsoc_uart_startup,
-        .shutdown       = sirfsoc_uart_shutdown,
-        .set_termios    = sirfsoc_uart_set_termios,
-        .type           = sirfsoc_uart_type,
-        .release_port   = sirfsoc_uart_release_port,
-        .request_port   = sirfsoc_uart_request_port,
-        .config_port    = sirfsoc_uart_config_port,
-};
-
-#ifdef CONFIG_SERIAL_SIRFSOC_CONSOLE
-static int __init sirfsoc_uart_console_setup(struct console *co, char *options)
-{
-        unsigned int baud = 115200;
-        unsigned int bits = 8;
-        unsigned int parity = 'n';
-        unsigned int flow = 'n';
-        struct uart_port *port = &sirfsoc_uart_ports[co->index].port;
-
-        if (co->index < 0 || co->index >= SIRFSOC_UART_NR)
-                return -EINVAL;
-
-        if (!port->mapbase)
-                return -ENODEV;
-
-        if (options)
-                uart_parse_options(options, &baud, &parity, &bits, &flow);
-        port->cons = co;
-        return uart_set_options(port, co, baud, parity, bits, flow);
-}
-
-static void sirfsoc_uart_console_putchar(struct uart_port *port, int ch)
-{
-        while (rd_regl(port,
-                SIRFUART_TX_FIFO_STATUS) & SIRFUART_FIFOFULL_MASK(port))
-                cpu_relax();
-        wr_regb(port, SIRFUART_TX_FIFO_DATA, ch);
-}
-
-static void sirfsoc_uart_console_write(struct console *co, const char *s,
-                                                        unsigned int count)
-{
-        struct uart_port *port = &sirfsoc_uart_ports[co->index].port;
-        uart_console_write(port, s, count, sirfsoc_uart_console_putchar);
-}
-
-static struct console sirfsoc_uart_console = {
-        .name           = SIRFSOC_UART_NAME,
-        .device         = uart_console_device,
-        .flags          = CON_PRINTBUFFER,
-        .index          = -1,
-        .write          = sirfsoc_uart_console_write,
-        .setup          = sirfsoc_uart_console_setup,
-        .data           = &sirfsoc_uart_drv,
-};
-
-static int __init sirfsoc_uart_console_init(void)
-{
-        register_console(&sirfsoc_uart_console);
-        return 0;
-}
-console_initcall(sirfsoc_uart_console_init);
-#endif
-
-static struct uart_driver sirfsoc_uart_drv = {
-        .owner          = THIS_MODULE,
-        .driver_name    = SIRFUART_PORT_NAME,
-        .nr             = SIRFSOC_UART_NR,
-        .dev_name       = SIRFSOC_UART_NAME,
-        .major          = SIRFSOC_UART_MAJOR,
-        .minor          = SIRFSOC_UART_MINOR,
-#ifdef CONFIG_SERIAL_SIRFSOC_CONSOLE
-        .cons                   = &sirfsoc_uart_console,
-#else
-        .cons                   = NULL,
-#endif
-};
-
-int sirfsoc_uart_probe(struct platform_device *pdev)
-{
-        struct sirfsoc_uart_port *sirfport;
-        struct uart_port *port;
-        struct resource *res;
-        int ret;
-
-        if (of_property_read_u32(pdev->dev.of_node, "cell-index", &pdev->id)) {
-                dev_err(&pdev->dev,
-                        "Unable to find cell-index in uart node.\n");
-                ret = -EFAULT;
-                goto err;
-        }
-
-        sirfport = &sirfsoc_uart_ports[pdev->id];
-        port = &sirfport->port;
-        port->dev = &pdev->dev;
-        port->private_data = sirfport;
-
-        if (of_find_property(pdev->dev.of_node, "hw_flow_ctrl", NULL))
-                sirfport->hw_flow_ctrl = 1;
-
-        if (of_property_read_u32(pdev->dev.of_node,
-                        "fifosize",
-                        &port->fifosize)) {
-                dev_err(&pdev->dev,
-                        "Unable to find fifosize in uart node.\n");
-                ret = -EFAULT;
-                goto err;
-        }
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "Insufficient resources.\n");
-                ret = -EFAULT;
-                goto err;
-        }
-        port->mapbase = res->start;
-        port->membase = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-        if (!port->membase) {
-                dev_err(&pdev->dev, "Cannot remap resource.\n");
-                ret = -ENOMEM;
-                goto err;
-        }
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "Insufficient resources.\n");
-                ret = -EFAULT;
-                goto err;
-        }
-        port->irq = res->start;
-
-        if (sirfport->hw_flow_ctrl) {
-                sirfport->p = pinctrl_get_select_default(&pdev->dev);
-                ret = IS_ERR(sirfport->p);
-                if (ret)
-                        goto err;
-        }
-
-        port->ops = &sirfsoc_uart_ops;
-        spin_lock_init(&port->lock);
-
-        platform_set_drvdata(pdev, sirfport);
-        ret = uart_add_one_port(&sirfsoc_uart_drv, port);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "Cannot add UART port(%d).\n", pdev->id);
-                goto port_err;
-        }
-
-        return 0;
-
-port_err:
-        platform_set_drvdata(pdev, NULL);
-        if (sirfport->hw_flow_ctrl)
-                pinctrl_put(sirfport->p);
-err:
-        return ret;
-}
-
-static int sirfsoc_uart_remove(struct platform_device *pdev)
-{
-        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
-        struct uart_port *port = &sirfport->port;
-        platform_set_drvdata(pdev, NULL);
-        if (sirfport->hw_flow_ctrl)
-                pinctrl_put(sirfport->p);
-        uart_remove_one_port(&sirfsoc_uart_drv, port);
-        return 0;
-}
-
-static int
-sirfsoc_uart_suspend(struct platform_device *pdev, pm_message_t state)
-{
-        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
-        struct uart_port *port = &sirfport->port;
-        uart_suspend_port(&sirfsoc_uart_drv, port);
-        return 0;
-}
-
-static int sirfsoc_uart_resume(struct platform_device *pdev)
-{
-        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
-        struct uart_port *port = &sirfport->port;
-        uart_resume_port(&sirfsoc_uart_drv, port);
-        return 0;
-}
-
-static struct of_device_id sirfsoc_uart_ids[] = {
-        { .compatible = "sirf,prima2-uart", },
-        {}
-};
-MODULE_DEVICE_TABLE(of, sirfsoc_serial_of_match);
-
-static struct platform_driver sirfsoc_uart_driver = {
-        .probe          = sirfsoc_uart_probe,
-        .remove         = sirfsoc_uart_remove,
-        .suspend        = sirfsoc_uart_suspend,
-        .resume         = sirfsoc_uart_resume,
-        .driver         = {
-                .name   = SIRFUART_PORT_NAME,
-                .owner  = THIS_MODULE,
-                .of_match_table = sirfsoc_uart_ids,
-        },
-};
-
-static int __init sirfsoc_uart_init(void)
-{
-        int ret = 0;
-
-        ret = uart_register_driver(&sirfsoc_uart_drv);
-        if (ret)
-                goto out;
-
-        ret = platform_driver_register(&sirfsoc_uart_driver);
-        if (ret)
-                uart_unregister_driver(&sirfsoc_uart_drv);
-out:
-        return ret;
-}
-module_init(sirfsoc_uart_init);
-
-static void __exit sirfsoc_uart_exit(void)
-{
-        platform_driver_unregister(&sirfsoc_uart_driver);
-        uart_unregister_driver(&sirfsoc_uart_drv);
-}
-module_exit(sirfsoc_uart_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Bin Shi <Bin.Shi@csr.com>, Rong Wang<Rong.Wang@csr.com>");
-MODULE_DESCRIPTION("CSR SiRFprimaII Uart Driver");
diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
deleted file mode 100644
index 6e207fdc2fe..00000000000
--- a/drivers/tty/serial/sirfsoc_uart.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Drivers for CSR SiRFprimaII onboard UARTs.
- *
- * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
- */
-#include <linux/bitops.h>
-
-/* UART Register Offset Define */
-#define SIRFUART_LINE_CTRL                      0x0040
-#define SIRFUART_TX_RX_EN                       0x004c
-#define SIRFUART_DIVISOR                        0x0050
-#define SIRFUART_INT_EN                         0x0054
-#define SIRFUART_INT_STATUS                     0x0058
-#define SIRFUART_TX_DMA_IO_CTRL                 0x0100
-#define SIRFUART_TX_DMA_IO_LEN                  0x0104
-#define SIRFUART_TX_FIFO_CTRL                   0x0108
-#define SIRFUART_TX_FIFO_LEVEL_CHK              0x010C
-#define SIRFUART_TX_FIFO_OP                     0x0110
-#define SIRFUART_TX_FIFO_STATUS                 0x0114
-#define SIRFUART_TX_FIFO_DATA                   0x0118
-#define SIRFUART_RX_DMA_IO_CTRL                 0x0120
-#define SIRFUART_RX_DMA_IO_LEN                  0x0124
-#define SIRFUART_RX_FIFO_CTRL                   0x0128
-#define SIRFUART_RX_FIFO_LEVEL_CHK              0x012C
-#define SIRFUART_RX_FIFO_OP                     0x0130
-#define SIRFUART_RX_FIFO_STATUS                 0x0134
-#define SIRFUART_RX_FIFO_DATA                   0x0138
-#define SIRFUART_AFC_CTRL                       0x0140
-#define SIRFUART_SWH_DMA_IO                     0x0148
-
-/* UART Line Control Register */
-#define SIRFUART_DATA_BIT_LEN_MASK              0x3
-#define SIRFUART_DATA_BIT_LEN_5                 BIT(0)
-#define SIRFUART_DATA_BIT_LEN_6                 1
-#define SIRFUART_DATA_BIT_LEN_7                 2
-#define SIRFUART_DATA_BIT_LEN_8                 3
-#define SIRFUART_STOP_BIT_LEN_1                 0
-#define SIRFUART_STOP_BIT_LEN_2                 BIT(2)
-#define SIRFUART_PARITY_EN                      BIT(3)
-#define SIRFUART_EVEN_BIT                       BIT(4)
-#define SIRFUART_STICK_BIT_MASK                 (7 << 3)
-#define SIRFUART_STICK_BIT_NONE                 (0 << 3)
-#define SIRFUART_STICK_BIT_EVEN                 BIT(3)
-#define SIRFUART_STICK_BIT_ODD                  (3 << 3)
-#define SIRFUART_STICK_BIT_MARK                 (5 << 3)
-#define SIRFUART_STICK_BIT_SPACE                (7 << 3)
-#define SIRFUART_SET_BREAK                      BIT(6)
-#define SIRFUART_LOOP_BACK                      BIT(7)
-#define SIRFUART_PARITY_MASK                    (7 << 3)
-#define SIRFUART_DUMMY_READ                     BIT(16)
-
-#define SIRFSOC_UART_RX_TIMEOUT(br, to) (((br) * (((to) + 999) / 1000)) / 1000)
-#define SIRFUART_RECV_TIMEOUT_MASK      (0xFFFF << 16)
-#define SIRFUART_RECV_TIMEOUT(x)        (((x) & 0xFFFF) << 16)
-
-/* UART Auto Flow Control */
-#define SIRFUART_AFC_RX_THD_MASK                0x000000FF
-#define SIRFUART_AFC_RX_EN                      BIT(8)
-#define SIRFUART_AFC_TX_EN                      BIT(9)
-#define SIRFUART_CTS_CTRL                       BIT(10)
-#define SIRFUART_RTS_CTRL                       BIT(11)
-#define SIRFUART_CTS_IN_STATUS                  BIT(12)
-#define SIRFUART_RTS_OUT_STATUS                 BIT(13)
-
-/* UART Interrupt Enable Register */
-#define SIRFUART_RX_DONE_INT                    BIT(0)
-#define SIRFUART_TX_DONE_INT                    BIT(1)
-#define SIRFUART_RX_OFLOW_INT                   BIT(2)
-#define SIRFUART_TX_ALLOUT_INT                  BIT(3)
-#define SIRFUART_RX_IO_DMA_INT                  BIT(4)
-#define SIRFUART_TX_IO_DMA_INT                  BIT(5)
-#define SIRFUART_RXFIFO_FULL_INT                BIT(6)
-#define SIRFUART_TXFIFO_EMPTY_INT               BIT(7)
-#define SIRFUART_RXFIFO_THD_INT                 BIT(8)
-#define SIRFUART_TXFIFO_THD_INT                 BIT(9)
-#define SIRFUART_FRM_ERR_INT                    BIT(10)
-#define SIRFUART_RXD_BREAK_INT                  BIT(11)
-#define SIRFUART_RX_TIMEOUT_INT                 BIT(12)
-#define SIRFUART_PARITY_ERR_INT                 BIT(13)
-#define SIRFUART_CTS_INT_EN                     BIT(14)
-#define SIRFUART_RTS_INT_EN                     BIT(15)
-
-/* UART Interrupt Status Register */
-#define SIRFUART_RX_DONE                        BIT(0)
-#define SIRFUART_TX_DONE                        BIT(1)
-#define SIRFUART_RX_OFLOW                       BIT(2)
-#define SIRFUART_TX_ALL_EMPTY                   BIT(3)
-#define SIRFUART_DMA_IO_RX_DONE                 BIT(4)
-#define SIRFUART_DMA_IO_TX_DONE                 BIT(5)
-#define SIRFUART_RXFIFO_FULL                    BIT(6)
-#define SIRFUART_TXFIFO_EMPTY                   BIT(7)
-#define SIRFUART_RXFIFO_THD_REACH               BIT(8)
-#define SIRFUART_TXFIFO_THD_REACH               BIT(9)
-#define SIRFUART_FRM_ERR                        BIT(10)
-#define SIRFUART_RXD_BREAK                      BIT(11)
-#define SIRFUART_RX_TIMEOUT                     BIT(12)
-#define SIRFUART_PARITY_ERR                     BIT(13)
-#define SIRFUART_CTS_CHANGE                     BIT(14)
-#define SIRFUART_RTS_CHANGE                     BIT(15)
-#define SIRFUART_PLUG_IN                        BIT(16)
-
-#define SIRFUART_ERR_INT_STAT                                   \
-                                (SIRFUART_RX_OFLOW |            \
-                                SIRFUART_FRM_ERR |              \
-                                SIRFUART_RXD_BREAK |            \
-                                SIRFUART_PARITY_ERR)
-#define SIRFUART_ERR_INT_EN                                     \
-                                (SIRFUART_RX_OFLOW_INT |        \
-                                SIRFUART_FRM_ERR_INT |          \
-                                SIRFUART_RXD_BREAK_INT |        \
-                                SIRFUART_PARITY_ERR_INT)
-#define SIRFUART_TX_INT_EN      SIRFUART_TXFIFO_EMPTY_INT
-#define SIRFUART_RX_IO_INT_EN                                   \
-                                (SIRFUART_RX_TIMEOUT_INT |      \
-                                SIRFUART_RXFIFO_THD_INT |       \
-                                SIRFUART_RXFIFO_FULL_INT |      \
-                                SIRFUART_ERR_INT_EN)
-
-/* UART FIFO Register */
-#define SIRFUART_TX_FIFO_STOP                   0x0
-#define SIRFUART_TX_FIFO_RESET                  0x1
-#define SIRFUART_TX_FIFO_START                  0x2
-#define SIRFUART_RX_FIFO_STOP                   0x0
-#define SIRFUART_RX_FIFO_RESET                  0x1
-#define SIRFUART_RX_FIFO_START                  0x2
-#define SIRFUART_TX_MODE_DMA                    0
-#define SIRFUART_TX_MODE_IO                     1
-#define SIRFUART_RX_MODE_DMA                    0
-#define SIRFUART_RX_MODE_IO                     1
-
-#define SIRFUART_RX_EN                          0x1
-#define SIRFUART_TX_EN                          0x2
-
-/* Generic Definitions */
-#define SIRFSOC_UART_NAME                       "ttySiRF"
-#define SIRFSOC_UART_MAJOR                      0
-#define SIRFSOC_UART_MINOR                      0
-#define SIRFUART_PORT_NAME                      "sirfsoc-uart"
-#define SIRFUART_MAP_SIZE                       0x200
-#define SIRFSOC_UART_NR                         3
-#define SIRFSOC_PORT_TYPE                       0xa5
-
-/* Baud Rate Calculation */
-#define SIRF_MIN_SAMPLE_DIV                     0xf
-#define SIRF_MAX_SAMPLE_DIV                     0x3f
-#define SIRF_IOCLK_DIV_MAX                      0xffff
-#define SIRF_SAMPLE_DIV_SHIFT                   16
-#define SIRF_IOCLK_DIV_MASK                     0xffff
-#define SIRF_SAMPLE_DIV_MASK                    0x3f0000
-#define SIRF_BAUD_RATE_SUPPORT_NR               18
-
-/* For Fast Baud Rate Calculation */
-struct sirfsoc_baudrate_to_regv {
-        unsigned int baud_rate;
-        unsigned int reg_val;
-};
-
-struct sirfsoc_uart_port {
-        unsigned char                   hw_flow_ctrl;
-        unsigned char                   ms_enabled;
-
-        struct uart_port                port;
-        struct pinctrl                  *p;
-};
-
-/* Hardware Flow Control */
-#define SIRFUART_AFC_CTRL_RX_THD        0x70
-
-/* Register Access Control */
-#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)         __raw_writeb(val, portaddr(port, reg))
-#define wr_regl(port, reg, val)         __raw_writel(val, portaddr(port, reg))
-
-/* UART Port Mask */
-#define SIRFUART_FIFOLEVEL_MASK(port)   ((port->line == 1) ? (0x1f) : (0x7f))
-#define SIRFUART_FIFOFULL_MASK(port)    ((port->line == 1) ? (0x20) : (0x80))
-#define SIRFUART_FIFOEMPTY_MASK(port)   ((port->line == 1) ? (0x40) : (0x100))
-
-/* I/O Mode */
-#define SIRFSOC_UART_IO_RX_MAX_CNT              256
-#define SIRFSOC_UART_IO_TX_REASONABLE_CNT       6
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index 1c6de9f5869..377ae74e715 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -39,7 +39,6 @@
 
 #include <linux/interrupt.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/console.h>
 #include <linux/module.h>
@@ -461,12 +460,12 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
         struct tty_struct *tty;
 
         if (!port) {
-                printk(KERN_ERR "sn_receive_chars - port NULL so can't receive\n");
+                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 receive\n");
+                printk(KERN_ERR "sn_receive_chars - port->sc_ops  NULL so can't receieve\n");
                 return;
         }
 
@@ -738,12 +737,11 @@ static void __init sn_sal_switch_to_interrupts(struct sn_cons_port *port)
                 DPRINTF("sn_console: switching to interrupt driven console\n");
 
                 if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
-                                IRQF_SHARED,
+                                IRQF_DISABLED | IRQF_SHARED,
                                 "SAL console driver", port) >= 0) {
                         spin_lock_irqsave(&port->sc_port.lock, flags);
                         port->sc_port.irq = SGI_UART_VECTOR;
                         port->sc_ops = &intr_ops;
-                        irq_set_handler(port->sc_port.irq, handle_level_irq);
 
                         /* turn on receive interrupts */
                         ia64_sn_console_intr_enable(SAL_CONSOLE_INTR_RECV);
diff --git a/drivers/tty/serial/suncore.c b/drivers/tty/serial/suncore.c
index 6e4ac8db2d7..6381a0282ee 100644
--- a/drivers/tty/serial/suncore.c
+++ b/drivers/tty/serial/suncore.c
@@ -17,11 +17,11 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/serial_core.h>
-#include <linux/sunserialcore.h>
 #include <linux/init.h>
 
 #include <asm/prom.h>
 
+#include "suncore.h"
 
 static int sunserial_current_minor = 64;
 
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index b9bf9c53f7f..c0b7246d733 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -23,14 +23,14 @@
 #include <asm/spitfire.h>
 #include <asm/prom.h>
 #include <asm/irq.h>
-#include <asm/setup.h>
 
 #if defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
 
 #include <linux/serial_core.h>
-#include <linux/sunserialcore.h>
+
+#include "suncore.h"
 
 #define CON_BREAK       ((long)-1)
 #define CON_HUP         ((long)-2)
@@ -519,7 +519,7 @@ static struct console sunhv_console = {
         .data   =       &sunhv_reg,
 };
 
-static int hv_probe(struct platform_device *op)
+static int __devinit hv_probe(struct platform_device *op)
 {
         struct uart_port *port;
         unsigned long minor;
@@ -598,7 +598,7 @@ out_free_port:
         return err;
 }
 
-static int hv_remove(struct platform_device *dev)
+static int __devexit hv_remove(struct platform_device *dev)
 {
         struct uart_port *port = dev_get_drvdata(&dev->dev);
 
@@ -636,7 +636,7 @@ static struct platform_driver hv_driver = {
                 .of_match_table = hv_match,
         },
         .probe          = hv_probe,
-        .remove         = hv_remove,
+        .remove         = __devexit_p(hv_remove),
 };
 
 static int __init sunhv_init(void)
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index bd8b3b63410..b5fa2a57b9d 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -37,15 +37,14 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
-#include <asm/setup.h>
 
 #if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
 
 #include <linux/serial_core.h>
-#include <linux/sunserialcore.h>
 
+#include "suncore.h"
 #include "sunsab.h"
 
 struct uart_sunsab_port {
@@ -954,7 +953,7 @@ static inline struct console *SUNSAB_CONSOLE(void)
 #define sunsab_console_init()   do { } while (0)
 #endif
 
-static int sunsab_init_one(struct uart_sunsab_port *up,
+static int __devinit sunsab_init_one(struct uart_sunsab_port *up,
                                      struct platform_device *op,
                                      unsigned long offset,
                                      int line)
@@ -1007,7 +1006,7 @@ static int sunsab_init_one(struct uart_sunsab_port *up,
         return 0;
 }
 
-static int sab_probe(struct platform_device *op)
+static int __devinit sab_probe(struct platform_device *op)
 {
         static int inst;
         struct uart_sunsab_port *up;
@@ -1063,7 +1062,7 @@ out:
         return err;
 }
 
-static int sab_remove(struct platform_device *op)
+static int __devexit sab_remove(struct platform_device *op)
 {
         struct uart_sunsab_port *up = dev_get_drvdata(&op->dev);
 
@@ -1100,7 +1099,7 @@ static struct platform_driver sab_driver = {
                 .of_match_table = sab_match,
         },
         .probe          = sab_probe,
-        .remove         = sab_remove,
+        .remove         = __devexit_p(sab_remove),
 };
 
 static int __init sunsab_init(void)
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 220da3f9724..ad0f8f5f6ea 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -41,14 +41,14 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
-#include <asm/setup.h>
 
 #if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
 
 #include <linux/serial_core.h>
-#include <linux/sunserialcore.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.
@@ -58,16 +58,10 @@
 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)" };
 
-struct serial_uart_config {
-        char    *name;
-        int     dfl_xmit_fifo_size;
-        int     flags;
-};
-
 /*
  * Here we define the default xmit fifo size used for each type of UART.
  */
-static const struct serial_uart_config uart_config[] = {
+static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = {
         { "unknown",    1,      0 },
         { "8250",       1,      0 },
         { "16450",      1,      0 },
@@ -1185,7 +1179,7 @@ static struct uart_driver sunsu_reg = {
         .major                  = TTY_MAJOR,
 };
 
-static int sunsu_kbd_ms_init(struct uart_sunsu_port *up)
+static int __devinit sunsu_kbd_ms_init(struct uart_sunsu_port *up)
 {
         int quot, baud;
 #ifdef CONFIG_SERIO
@@ -1391,7 +1385,7 @@ static inline struct console *SUNSU_CONSOLE(void)
 #define sunsu_serial_console_init()     do { } while (0)
 #endif
 
-static enum su_type su_get_type(struct device_node *dp)
+static enum su_type __devinit su_get_type(struct device_node *dp)
 {
         struct device_node *ap = of_find_node_by_path("/aliases");
 
@@ -1412,7 +1406,7 @@ static enum su_type su_get_type(struct device_node *dp)
         return SU_PORT_PORT;
 }
 
-static int su_probe(struct platform_device *op)
+static int __devinit su_probe(struct platform_device *op)
 {
         static int inst;
         struct device_node *dp = op->dev.of_node;
@@ -1503,7 +1497,7 @@ out_unmap:
         return err;
 }
 
-static int su_remove(struct platform_device *op)
+static int __devexit su_remove(struct platform_device *op)
 {
         struct uart_sunsu_port *up = dev_get_drvdata(&op->dev);
         bool kbdms = false;
@@ -1556,7 +1550,7 @@ static struct platform_driver su_driver = {
                 .of_match_table = su_match,
         },
         .probe          = su_probe,
-        .remove         = su_remove,
+        .remove         = __devexit_p(su_remove),
 };
 
 static int __init sunsu_init(void)
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index aef4fab957c..8e916e76b7b 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -37,15 +37,14 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
-#include <asm/setup.h>
 
 #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
 #endif
 
 #include <linux/serial_core.h>
-#include <linux/sunserialcore.h>
 
+#include "suncore.h"
 #include "sunzilog.h"
 
 /* On 32-bit sparcs we need to delay after register accesses
@@ -1282,7 +1281,7 @@ static inline struct console *SUNZILOG_CONSOLE(void)
 #define SUNZILOG_CONSOLE()      (NULL)
 #endif
 
-static void sunzilog_init_kbdms(struct uart_sunzilog_port *up)
+static void __devinit sunzilog_init_kbdms(struct uart_sunzilog_port *up)
 {
         int baud, brg;
 
@@ -1302,7 +1301,7 @@ static void sunzilog_init_kbdms(struct uart_sunzilog_port *up)
 }
 
 #ifdef CONFIG_SERIO
-static void sunzilog_register_serio(struct uart_sunzilog_port *up)
+static void __devinit sunzilog_register_serio(struct uart_sunzilog_port *up)
 {
         struct serio *serio = &up->serio;
 
@@ -1331,7 +1330,7 @@ static void sunzilog_register_serio(struct uart_sunzilog_port *up)
 }
 #endif
 
-static void sunzilog_init_hw(struct uart_sunzilog_port *up)
+static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
 {
         struct zilog_channel __iomem *channel;
         unsigned long flags;
@@ -1398,9 +1397,9 @@ static void sunzilog_init_hw(struct uart_sunzilog_port *up)
 #endif
 }
 
-static int zilog_irq;
+static int zilog_irq = -1;
 
-static int zs_probe(struct platform_device *op)
+static int __devinit zs_probe(struct platform_device *op)
 {
         static int kbm_inst, uart_inst;
         int inst;
@@ -1426,7 +1425,7 @@ static int zs_probe(struct platform_device *op)
 
         rp = sunzilog_chip_regs[inst];
 
-        if (!zilog_irq)
+        if (zilog_irq == -1)
                 zilog_irq = op->archdata.irqs[0];
 
         up = &sunzilog_port_table[inst * 2];
@@ -1507,7 +1506,7 @@ static int zs_probe(struct platform_device *op)
         return 0;
 }
 
-static void zs_remove_one(struct uart_sunzilog_port *up)
+static void __devexit zs_remove_one(struct uart_sunzilog_port *up)
 {
         if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) {
 #ifdef CONFIG_SERIO
@@ -1517,7 +1516,7 @@ static void zs_remove_one(struct uart_sunzilog_port *up)
                 uart_remove_one_port(&sunzilog_reg, &up->port);
 }
 
-static int zs_remove(struct platform_device *op)
+static int __devexit zs_remove(struct platform_device *op)
 {
         struct uart_sunzilog_port *up = dev_get_drvdata(&op->dev);
         struct zilog_layout __iomem *regs;
@@ -1548,7 +1547,7 @@ static struct platform_driver zs_driver = {
                 .of_match_table = zs_match,
         },
         .probe          = zs_probe,
-        .remove         = zs_remove,
+        .remove         = __devexit_p(zs_remove),
 };
 
 static int __init sunzilog_init(void)
@@ -1581,7 +1580,7 @@ static int __init sunzilog_init(void)
         if (err)
                 goto out_unregister_uart;
 
-        if (zilog_irq) {
+        if (zilog_irq != -1) {
                 struct uart_sunzilog_port *up = sunzilog_irq_chain;
                 err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
                                   "zs", sunzilog_irq_chain);
@@ -1622,7 +1621,7 @@ static void __exit sunzilog_exit(void)
 {
         platform_driver_unregister(&zs_driver);
 
-        if (zilog_irq) {
+        if (zilog_irq != -1) {
                 struct uart_sunzilog_port *up = sunzilog_irq_chain;
 
                 /* Disable Interrupts */
@@ -1638,7 +1637,7 @@ static void __exit sunzilog_exit(void)
                 }
 
                 free_irq(zilog_irq, sunzilog_irq_chain);
-                zilog_irq = 0;
+                zilog_irq = -1;
         }
 
         if (sunzilog_reg.nr) {
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 5be0d68fece..1f36b7eb735 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -23,13 +23,10 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/serial_core.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 
 #include "timbuart.h"
 
@@ -426,7 +423,7 @@ static struct uart_driver timbuart_driver = {
         .nr = 1
 };
 
-static int timbuart_probe(struct platform_device *dev)
+static int __devinit timbuart_probe(struct platform_device *dev)
 {
         int err, irq;
         struct timbuart_port *uart;
@@ -492,7 +489,7 @@ err_mem:
         return err;
 }
 
-static int timbuart_remove(struct platform_device *dev)
+static int __devexit timbuart_remove(struct platform_device *dev)
 {
         struct timbuart_port *uart = platform_get_drvdata(dev);
 
@@ -510,10 +507,23 @@ static struct platform_driver timbuart_platform_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = timbuart_probe,
-        .remove         = timbuart_remove,
+        .remove         = __devexit_p(timbuart_remove),
 };
 
-module_platform_driver(timbuart_platform_driver);
+/*--------------------------------------------------------------------------*/
+
+static int __init timbuart_init(void)
+{
+        return platform_driver_register(&timbuart_platform_driver);
+}
+
+static void __exit timbuart_exit(void)
+{
+        platform_driver_unregister(&timbuart_platform_driver);
+}
+
+module_init(timbuart_init);
+module_exit(timbuart_exit);
 
 MODULE_DESCRIPTION("Timberdale UART driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 89eee43c4e2..8af1ed83a4c 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -15,7 +15,6 @@
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
@@ -216,7 +215,8 @@ static int ulite_startup(struct uart_port *port)
 {
         int ret;
 
-        ret = request_irq(port->irq, ulite_isr, IRQF_SHARED, "uartlite", port);
+        ret = request_irq(port->irq, ulite_isr,
+                          IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);
         if (ret)
                 return ret;
 
@@ -408,7 +408,7 @@ static void ulite_console_write(struct console *co, const char *s,
                 spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static int ulite_console_setup(struct console *co, char *options)
+static int __devinit ulite_console_setup(struct console *co, char *options)
 {
         struct uart_port *port;
         int baud = 9600;
@@ -486,7 +486,7 @@ static struct uart_driver ulite_uart_driver = {
  *
  * Returns: 0 on success, <0 otherwise
  */
-static int ulite_assign(struct device *dev, int id, u32 base, int irq)
+static int __devinit ulite_assign(struct device *dev, int id, u32 base, int irq)
 {
         struct uart_port *port;
         int rc;
@@ -542,7 +542,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq)
  *
  * @dev: pointer to device structure
  */
-static int ulite_release(struct device *dev)
+static int __devexit ulite_release(struct device *dev)
 {
         struct uart_port *port = dev_get_drvdata(dev);
         int rc = 0;
@@ -562,15 +562,17 @@ static int ulite_release(struct device *dev)
 
 #if defined(CONFIG_OF)
 /* Match table for of_platform binding */
-static struct of_device_id ulite_of_match[] = {
+static struct of_device_id ulite_of_match[] __devinitdata = {
         { .compatible = "xlnx,opb-uartlite-1.00.b", },
         { .compatible = "xlnx,xps-uartlite-1.00.a", },
         {}
 };
 MODULE_DEVICE_TABLE(of, ulite_of_match);
+#else /* CONFIG_OF */
+#define ulite_of_match NULL
 #endif /* CONFIG_OF */
 
-static int ulite_probe(struct platform_device *pdev)
+static int __devinit ulite_probe(struct platform_device *pdev)
 {
         struct resource *res, *res2;
         int id = pdev->id;
@@ -593,7 +595,7 @@ static int ulite_probe(struct platform_device *pdev)
         return ulite_assign(&pdev->dev, id, res->start, res2->start);
 }
 
-static int ulite_remove(struct platform_device *pdev)
+static int __devexit ulite_remove(struct platform_device *pdev)
 {
         return ulite_release(&pdev->dev);
 }
@@ -603,11 +605,11 @@ MODULE_ALIAS("platform:uartlite");
 
 static struct platform_driver ulite_platform_driver = {
         .probe = ulite_probe,
-        .remove = ulite_remove,
+        .remove = __devexit_p(ulite_remove),
         .driver = {
                 .owner = THIS_MODULE,
                 .name  = "uartlite",
-                .of_match_table = of_match_ptr(ulite_of_match),
+                .of_match_table = ulite_of_match,
         },
 };
 
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index f99b0c965f8..9af9f0879a2 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -20,10 +20,8 @@
 
 #include <linux/module.h>
 #include <linux/serial.h>
-#include <linux/serial_core.h>
 #include <linux/slab.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
 #include <linux/io.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
@@ -963,9 +961,6 @@ static void qe_uart_set_termios(struct uart_port *port,
         /* Do we really need a spinlock here? */
         spin_lock_irqsave(&port->lock, flags);
 
-        /* Update the per-port timeout. */
-        uart_update_timeout(port, termios->c_cflag, baud);
-
         out_be16(&uccp->upsmr, upsmr);
         if (soft_uart) {
                 out_be16(&uccup->supsmr, supsmr);
@@ -1360,7 +1355,7 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         }
 
         qe_port->port.irq = irq_of_parse_and_map(np, 0);
-        if (qe_port->port.irq == 0) {
+        if (qe_port->port.irq == NO_IRQ) {
                 dev_err(&ofdev->dev, "could not map IRQ for UCC%u\n",
                        qe_port->ucc_num + 1);
                 ret = -EINVAL;
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index 62ee0166bc6..3beb6ab4fa6 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -61,7 +61,7 @@
 static struct uart_port siu_uart_ports[SIU_PORTS_MAX] = {
         [0 ... SIU_PORTS_MAX-1] = {
                 .lock   = __SPIN_LOCK_UNLOCKED(siu_uart_ports->lock),
-                .irq    = 0,
+                .irq    = -1,
         },
 };
 
@@ -171,7 +171,7 @@ static inline unsigned int siu_check_type(struct uart_port *port)
 {
         if (port->line == 0)
                 return PORT_VR41XX_SIU;
-        if (port->line == 1 && port->irq)
+        if (port->line == 1 && port->irq != -1)
                 return PORT_VR41XX_DSIU;
 
         return PORT_UNKNOWN;
@@ -823,7 +823,7 @@ static struct console siu_console = {
         .data   = &siu_uart_driver,
 };
 
-static int siu_console_init(void)
+static int __devinit siu_console_init(void)
 {
         struct uart_port *port;
         int i;
@@ -867,7 +867,7 @@ static struct uart_driver siu_uart_driver = {
         .cons           = SERIAL_VR41XX_CONSOLE,
 };
 
-static int siu_probe(struct platform_device *dev)
+static int __devinit siu_probe(struct platform_device *dev)
 {
         struct uart_port *port;
         int num, i, retval;
@@ -901,7 +901,7 @@ static int siu_probe(struct platform_device *dev)
         return 0;
 }
 
-static int siu_remove(struct platform_device *dev)
+static int __devexit siu_remove(struct platform_device *dev)
 {
         struct uart_port *port;
         int i;
@@ -952,7 +952,7 @@ static int siu_resume(struct platform_device *dev)
 
 static struct platform_driver siu_device_driver = {
         .probe          = siu_probe,
-        .remove         = siu_remove,
+        .remove         = __devexit_p(siu_remove),
         .suspend        = siu_suspend,
         .resume         = siu_resume,
         .driver         = {
@@ -961,7 +961,18 @@ static struct platform_driver siu_device_driver = {
         },
 };
 
-module_platform_driver(siu_device_driver);
+static int __init vr41xx_siu_init(void)
+{
+        return platform_driver_register(&siu_device_driver);
+}
+
+static void __exit vr41xx_siu_exit(void)
+{
+        platform_driver_unregister(&siu_device_driver);
+}
+
+module_init(vr41xx_siu_init);
+module_exit(vr41xx_siu_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:SIU");
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 8fd181436a6..026cb9ea5cd 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
-#include <linux/of.h>
 
 /*
  * UART Register offsets
@@ -77,8 +76,6 @@
 #define RX_FIFO_INTS    (RXFAF | RXFF | RXOVER | PER | FER | RXTOUT)
 #define TX_FIFO_INTS    (TXFAE | TXFE | TXUDR)
 
-#define VT8500_MAX_PORTS        6
-
 struct vt8500_port {
         struct uart_port        uart;
         char                    name[16];
@@ -86,13 +83,6 @@ struct vt8500_port {
         unsigned int            ier;
 };
 
-/*
- * we use this variable to keep track of which ports
- * have been allocated as we can't use pdev->id in
- * devicetree
- */
-static unsigned long vt8500_ports_in_use;
-
 static inline void vt8500_write(struct uart_port *port, unsigned int val,
                              unsigned int off)
 {
@@ -441,7 +431,7 @@ static int vt8500_verify_port(struct uart_port *port,
         return 0;
 }
 
-static struct vt8500_port *vt8500_uart_ports[VT8500_MAX_PORTS];
+static struct vt8500_port *vt8500_uart_ports[4];
 static struct uart_driver vt8500_uart_driver;
 
 #ifdef CONFIG_SERIAL_VT8500_CONSOLE
@@ -554,41 +544,17 @@ static struct uart_driver vt8500_uart_driver = {
         .cons           = VT8500_CONSOLE,
 };
 
-static int vt8500_serial_probe(struct platform_device *pdev)
+static int __init vt8500_serial_probe(struct platform_device *pdev)
 {
         struct vt8500_port *vt8500_port;
         struct resource *mmres, *irqres;
-        struct device_node *np = pdev->dev.of_node;
         int ret;
-        int port;
 
         mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!mmres || !irqres)
                 return -ENODEV;
 
-        if (np)
-                port = of_alias_get_id(np, "serial");
-                if (port > VT8500_MAX_PORTS)
-                        port = -1;
-        else
-                port = -1;
-
-        if (port < 0) {
-                /* calculate the port id */
-                port = find_first_zero_bit(&vt8500_ports_in_use,
-                                        sizeof(vt8500_ports_in_use));
-        }
-
-        if (port > VT8500_MAX_PORTS)
-                return -ENODEV;
-
-        /* reserve the port id */
-        if (test_and_set_bit(port, &vt8500_ports_in_use)) {
-                /* port already in use - shouldn't really happen */
-                return -EBUSY;
-        }
-
         vt8500_port = kzalloc(sizeof(struct vt8500_port), GFP_KERNEL);
         if (!vt8500_port)
                 return -ENOMEM;
@@ -599,18 +565,10 @@ static int vt8500_serial_probe(struct platform_device *pdev)
         vt8500_port->uart.irq = irqres->start;
         vt8500_port->uart.fifosize = 16;
         vt8500_port->uart.ops = &vt8500_uart_pops;
-        vt8500_port->uart.line = port;
+        vt8500_port->uart.line = pdev->id;
         vt8500_port->uart.dev = &pdev->dev;
         vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
-
-        vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0);
-        if (vt8500_port->clk) {
-                vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk);
-        } else {
-                /* use the default of 24Mhz if not specified and warn */
-                pr_warn("%s: serial clock source not specified\n", __func__);
-                vt8500_port->uart.uartclk = 24000000;
-        }
+        vt8500_port->uart.uartclk = 24000000;
 
         snprintf(vt8500_port->name, sizeof(vt8500_port->name),
                  "VT8500 UART%d", pdev->id);
@@ -621,7 +579,7 @@ static int vt8500_serial_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        vt8500_uart_ports[port] = vt8500_port;
+        vt8500_uart_ports[pdev->id] = vt8500_port;
 
         uart_add_one_port(&vt8500_uart_driver, &vt8500_port->uart);
 
@@ -634,7 +592,7 @@ err:
         return ret;
 }
 
-static int vt8500_serial_remove(struct platform_device *pdev)
+static int __devexit vt8500_serial_remove(struct platform_device *pdev)
 {
         struct vt8500_port *vt8500_port = platform_get_drvdata(pdev);
 
@@ -645,18 +603,12 @@ static int vt8500_serial_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id wmt_dt_ids[] = {
-        { .compatible = "via,vt8500-uart", },
-        {}
-};
-
 static struct platform_driver vt8500_platform_driver = {
         .probe  = vt8500_serial_probe,
         .remove = vt8500_serial_remove,
         .driver = {
                 .name = "vt8500_serial",
                 .owner = THIS_MODULE,
-                .of_match_table = of_match_ptr(wmt_dt_ids),
         },
 };
 
@@ -690,4 +642,4 @@ module_exit(vt8500_serial_exit);
 
 MODULE_AUTHOR("Alexey Charkov <alchark@gmail.com>");
 MODULE_DESCRIPTION("Driver for vt8500 serial device");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 9ab910370c5..19cc1e8149d 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -12,15 +12,12 @@
  */
 
 #include <linux/platform_device.h>
-#include <linux/serial.h>
 #include <linux/serial_core.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/console.h>
+#include <linux/serial.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/of.h>
-#include <linux/module.h>
 
 #define XUARTPS_TTY_NAME        "ttyPS"
 #define XUARTPS_NAME            "xuartps"
@@ -939,18 +936,22 @@ static struct uart_driver xuartps_uart_driver = {
  *
  * Returns 0 on success, negative error otherwise
  **/
-static int xuartps_probe(struct platform_device *pdev)
+static int __devinit xuartps_probe(struct platform_device *pdev)
 {
         int rc;
         struct uart_port *port;
         struct resource *res, *res2;
         int clk = 0;
 
+#ifdef CONFIG_OF
         const unsigned int *prop;
 
         prop = of_get_property(pdev->dev.of_node, "clock", NULL);
         if (prop)
                 clk = be32_to_cpup(prop);
+#else
+        clk = *((unsigned int *)(pdev->dev.platform_data));
+#endif
         if (!clk) {
                 dev_err(&pdev->dev, "no clock specified\n");
                 return -ENODEV;
@@ -997,7 +998,7 @@ static int xuartps_probe(struct platform_device *pdev)
  *
  * Returns 0 on success, negative error otherwise
  **/
-static int xuartps_remove(struct platform_device *pdev)
+static int __devexit xuartps_remove(struct platform_device *pdev)
 {
         struct uart_port *port = dev_get_drvdata(&pdev->dev);
         int rc = 0;
@@ -1040,11 +1041,16 @@ static int xuartps_resume(struct platform_device *pdev)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id xuartps_of_match[] = {
+
+#ifdef CONFIG_OF
+static struct of_device_id xuartps_of_match[] __devinitdata = {
         { .compatible = "xlnx,xuartps", },
         {}
 };
 MODULE_DEVICE_TABLE(of, xuartps_of_match);
+#else
+#define xuartps_of_match NULL
+#endif
 
 static struct platform_driver xuartps_platform_driver = {
         .probe   = xuartps_probe,               /* Probe method */
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index 92c00b24d0d..0aebd7121b5 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -57,17 +57,16 @@
 #include <linux/ioport.h>
 #include <linux/irqflags.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/major.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/spinlock.h>
 #include <linux/sysrq.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/types.h>
 
 #include <linux/atomic.h>
+#include <asm/system.h>
 
 #include <asm/dec/interrupts.h>
 #include <asm/dec/ioasic_addrs.h>
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 9e071f6985f..272e417a9b0 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -86,6 +86,7 @@
 #include <linux/ioctl.h>
 #include <linux/synclink.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
@@ -849,7 +850,7 @@ static int mgsl_device_count;
  * .text section address and breakpoint on module load.
  * This is useful for use with gdb and add-symbol-file command.
  */
-static bool break_on_load;
+static int break_on_load;
 
 /*
  * Driver major number, defaults to zero to get auto
@@ -898,7 +899,7 @@ static struct pci_driver synclink_pci_driver = {
         .name           = "synclink",
         .id_table       = synclink_pci_tbl,
         .probe          = synclink_init_one,
-        .remove         = synclink_remove_one,
+        .remove         = __devexit_p(synclink_remove_one),
 };
 
 static struct tty_driver *serial_driver;
@@ -1359,7 +1360,7 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info )
                         }
                 }
         
-                if (tty_port_cts_enabled(&info->port) &&
+                if ( (info->port.flags & ASYNC_CTS_FLOW) && 
                      (status & MISCSTATUS_CTS_LATCHED) ) {
                         if (info->port.tty->hw_stopped) {
                                 if (status & MISCSTATUS_CTS) {
@@ -1840,22 +1841,22 @@ static void shutdown(struct mgsl_struct * info)
         usc_DisableInterrupts(info,RECEIVE_DATA + RECEIVE_STATUS +
                 TRANSMIT_DATA + TRANSMIT_STATUS + IO_PIN + MISC );
         usc_DisableDmaInterrupts(info,DICR_MASTER + DICR_TRANSMIT + DICR_RECEIVE);
-
+        
         /* Disable DMAEN (Port 7, Bit 14) */
         /* This disconnects the DMA request signal from the ISA bus */
         /* on the ISA adapter. This has no effect for the PCI adapter */
         usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT15) | BIT14));
-
+        
         /* Disable INTEN (Port 6, Bit12) */
         /* This disconnects the IRQ request signal to the ISA bus */
         /* on the ISA adapter. This has no effect for the PCI adapter */
         usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) | BIT12));
-
-        if (!info->port.tty || info->port.tty->termios.c_cflag & HUPCL) {
+        
+        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
                 info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 usc_set_serial_signals(info);
         }
-
+        
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
 
         mgsl_release_resources(info);   
@@ -1895,7 +1896,7 @@ static void mgsl_program_hw(struct mgsl_struct *info)
         usc_EnableInterrupts(info, IO_PIN);
         usc_get_serial_signals(info);
                 
-        if (info->netcount || info->port.tty->termios.c_cflag & CREAD)
+        if (info->netcount || info->port.tty->termios->c_cflag & CREAD)
                 usc_start_receiver(info);
                 
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
@@ -1908,14 +1909,14 @@ static void mgsl_change_params(struct mgsl_struct *info)
         unsigned cflag;
         int bits_per_char;
 
-        if (!info->port.tty)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
                 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgsl_change_params(%s)\n",
                          __FILE__,__LINE__, info->device_name );
                          
-        cflag = info->port.tty->termios.c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -2123,6 +2124,7 @@ static int mgsl_write(struct tty_struct * tty,
         if ( info->params.mode == MGSL_MODE_HDLC ||
                         info->params.mode == MGSL_MODE_RAW ) {
                 /* operating in synchronous (frame oriented) mode */
+                /* operating in synchronous (frame oriented) mode */
                 if (info->tx_active) {
 
                         if ( info->params.mode == MGSL_MODE_HDLC ) {
@@ -2367,8 +2369,8 @@ static void mgsl_throttle(struct tty_struct * tty)
         
         if (I_IXOFF(tty))
                 mgsl_send_xchar(tty, STOP_CHAR(tty));
-
-        if (tty->termios.c_cflag & CRTSCTS) {
+ 
+        if (tty->termios->c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->irq_spinlock,flags);
                 info->serial_signals &= ~SerialSignal_RTS;
                 usc_set_serial_signals(info);
@@ -2401,8 +2403,8 @@ static void mgsl_unthrottle(struct tty_struct * tty)
                 else
                         mgsl_send_xchar(tty, START_CHAR(tty));
         }
-
-        if (tty->termios.c_cflag & CRTSCTS) {
+        
+        if (tty->termios->c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->irq_spinlock,flags);
                 info->serial_signals |= SerialSignal_RTS;
                 usc_set_serial_signals(info);
@@ -3045,7 +3047,7 @@ static void mgsl_set_termios(struct tty_struct *tty, struct ktermios *old_termio
 
         /* Handle transition to B0 status */
         if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios.c_cflag & CBAUD)) {
+            !(tty->termios->c_cflag & CBAUD)) {
                 info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
                 spin_lock_irqsave(&info->irq_spinlock,flags);
                 usc_set_serial_signals(info);
@@ -3054,9 +3056,9 @@ static void mgsl_set_termios(struct tty_struct *tty, struct ktermios *old_termio
         
         /* Handle transition away from B0 status */
         if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios.c_cflag & CBAUD) {
+            tty->termios->c_cflag & CBAUD) {
                 info->serial_signals |= SerialSignal_DTR;
-                if (!(tty->termios.c_cflag & CRTSCTS) || 
+                if (!(tty->termios->c_cflag & CRTSCTS) || 
                     !test_bit(TTY_THROTTLED, &tty->flags)) {
                         info->serial_signals |= SerialSignal_RTS;
                 }
@@ -3067,7 +3069,7 @@ static void mgsl_set_termios(struct tty_struct *tty, struct ktermios *old_termio
         
         /* Handle turning off CRTSCTS */
         if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
+            !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 mgsl_start(tty);
         }
@@ -3287,7 +3289,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 return 0;
         }
 
-        if (tty->termios.c_cflag & CLOCAL)
+        if (tty->termios->c_cflag & CLOCAL)
                 do_clocal = true;
 
         /* Wait for carrier detect and the line to become
@@ -3313,7 +3315,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         port->blocked_open++;
         
         while (1) {
-                if (tty->termios.c_cflag & CBAUD)
+                if (tty->termios->c_cflag & CBAUD)
                         tty_port_raise_dtr_rts(port);
                 
                 set_current_state(TASK_INTERRUPTIBLE);
@@ -3338,9 +3340,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                         printk("%s(%d):block_til_ready blocking on %s count=%d\n",
                                  __FILE__,__LINE__, tty->driver->name, port->count );
                                  
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
         
         set_current_state(TASK_RUNNING);
@@ -3362,29 +3364,6 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         
 }       /* end of block_til_ready() */
 
-static int mgsl_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        struct mgsl_struct *info;
-        int line = tty->index;
-
-        /* verify range of specified line number */
-        if (line >= mgsl_device_count) {
-                printk("%s(%d):mgsl_open with invalid line #%d.\n",
-                        __FILE__, __LINE__, line);
-                return -ENODEV;
-        }
-
-        /* find the info structure for the specified line */
-        info = mgsl_device_list;
-        while (info && info->line != line)
-                info = info->next_device;
-        if (mgsl_paranoia_check(info, tty->name, "mgsl_open"))
-                return -ENODEV;
-        tty->driver_data = info;
-
-        return tty_port_install(&info->port, driver, tty);
-}
-
 /* mgsl_open()
  *
  *      Called when a port is opened.  Init and enable port.
@@ -3397,10 +3376,26 @@ static int mgsl_install(struct tty_driver *driver, struct tty_struct *tty)
  */
 static int mgsl_open(struct tty_struct *tty, struct file * filp)
 {
-        struct mgsl_struct *info = tty->driver_data;
+        struct mgsl_struct      *info;
+        int                     retval, line;
         unsigned long flags;
-        int retval;
 
+        /* verify range of specified line number */     
+        line = tty->index;
+        if ((line < 0) || (line >= mgsl_device_count)) {
+                printk("%s(%d):mgsl_open with invalid line #%d.\n",
+                        __FILE__,__LINE__,line);
+                return -ENODEV;
+        }
+
+        /* find the info structure for the specified line */
+        info = mgsl_device_list;
+        while(info && info->line != line)
+                info = info->next_device;
+        if (mgsl_paranoia_check(info, tty->name, "mgsl_open"))
+                return -ENODEV;
+        
+        tty->driver_data = info;
         info->port.tty = tty;
                 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -4304,7 +4299,6 @@ static struct mgsl_struct* mgsl_allocate_device(void)
 }       /* end of mgsl_allocate_device()*/
 
 static const struct tty_operations mgsl_ops = {
-        .install = mgsl_install,
         .open = mgsl_open,
         .close = mgsl_close,
         .write = mgsl_write,
@@ -4340,6 +4334,7 @@ static int mgsl_init_tty(void)
         if (!serial_driver)
                 return -ENOMEM;
         
+        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "synclink";
         serial_driver->name = "ttySL";
         serial_driver->major = ttymajor;
@@ -4425,7 +4420,6 @@ static void synclink_cleanup(void)
                 mgsl_release_resources(info);
                 tmp = info;
                 info = info->next_device;
-                tty_port_destroy(&tmp->port);
                 kfree(tmp);
         }
         
@@ -8065,7 +8059,7 @@ static void hdlcdev_exit(struct mgsl_struct *info)
 #endif /* CONFIG_HDLC */
 
 
-static int synclink_init_one (struct pci_dev *dev,
+static int __devinit synclink_init_one (struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
         struct mgsl_struct *info;
@@ -8117,7 +8111,7 @@ static int synclink_init_one (struct pci_dev *dev,
         return 0;
 }
 
-static void synclink_remove_one (struct pci_dev *dev)
+static void __devexit synclink_remove_one (struct pci_dev *dev)
 {
 }
 
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index aba1e59f4a8..18b48cd3b41 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -73,6 +73,7 @@
 #include <linux/hdlc.h>
 #include <linux/synclink.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
@@ -110,7 +111,7 @@ static struct pci_driver pci_driver = {
         .name           = "synclink_gt",
         .id_table       = pci_table,
         .probe          = init_one,
-        .remove         = remove_one,
+        .remove         = __devexit_p(remove_one),
 };
 
 static bool pci_registered;
@@ -653,7 +654,7 @@ static int open(struct tty_struct *tty, struct file *filp)
         unsigned long flags;
 
         line = tty->index;
-        if (line >= slgt_device_count) {
+        if ((line < 0) || (line >= slgt_device_count)) {
                 DBGERR(("%s: open with invalid line #%d.\n", driver_name, line));
                 return -ENODEV;
         }
@@ -785,7 +786,7 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle transition to B0 status */
         if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios.c_cflag & CBAUD)) {
+            !(tty->termios->c_cflag & CBAUD)) {
                 info->signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
                 spin_lock_irqsave(&info->lock,flags);
                 set_signals(info);
@@ -794,9 +795,9 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle transition away from B0 status */
         if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios.c_cflag & CBAUD) {
+            tty->termios->c_cflag & CBAUD) {
                 info->signals |= SerialSignal_DTR;
-                if (!(tty->termios.c_cflag & CRTSCTS) ||
+                if (!(tty->termios->c_cflag & CRTSCTS) ||
                     !test_bit(TTY_THROTTLED, &tty->flags)) {
                         info->signals |= SerialSignal_RTS;
                 }
@@ -807,7 +808,7 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle turning off CRTSCTS */
         if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
+            !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 tx_release(tty);
         }
@@ -1372,7 +1373,7 @@ static void throttle(struct tty_struct * tty)
         DBGINFO(("%s throttle\n", info->device_name));
         if (I_IXOFF(tty))
                 send_xchar(tty, STOP_CHAR(tty));
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->lock,flags);
                 info->signals &= ~SerialSignal_RTS;
                 set_signals(info);
@@ -1397,7 +1398,7 @@ static void unthrottle(struct tty_struct * tty)
                 else
                         send_xchar(tty, START_CHAR(tty));
         }
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->lock,flags);
                 info->signals |= SerialSignal_RTS;
                 set_signals(info);
@@ -2053,7 +2054,7 @@ static void cts_change(struct slgt_info *info, unsigned short status)
         wake_up_interruptible(&info->event_wait_q);
         info->pending_bh |= BH_STATUS;
 
-        if (tty_port_cts_enabled(&info->port)) {
+        if (info->port.flags & ASYNC_CTS_FLOW) {
                 if (info->port.tty) {
                         if (info->port.tty->hw_stopped) {
                                 if (info->signals & SerialSignal_CTS) {
@@ -2493,7 +2494,7 @@ static void shutdown(struct slgt_info *info)
 
         slgt_irq_off(info, IRQ_ALL | IRQ_MASTER);
 
-        if (!info->port.tty || info->port.tty->termios.c_cflag & HUPCL) {
+        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
                 info->signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 set_signals(info);
         }
@@ -2534,7 +2535,7 @@ static void program_hw(struct slgt_info *info)
         get_signals(info);
 
         if (info->netcount ||
-            (info->port.tty && info->port.tty->termios.c_cflag & CREAD))
+            (info->port.tty && info->port.tty->termios->c_cflag & CREAD))
                 rx_start(info);
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -2548,11 +2549,11 @@ static void change_params(struct slgt_info *info)
         unsigned cflag;
         int bits_per_char;
 
-        if (!info->port.tty)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
         DBGINFO(("%s change_params\n", info->device_name));
 
-        cflag = info->port.tty->termios.c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -3292,7 +3293,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 return 0;
         }
 
-        if (tty->termios.c_cflag & CLOCAL)
+        if (tty->termios->c_cflag & CLOCAL)
                 do_clocal = true;
 
         /* Wait for carrier detect and the line to become
@@ -3314,7 +3315,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         port->blocked_open++;
 
         while (1) {
-                if ((tty->termios.c_cflag & CBAUD))
+                if ((tty->termios->c_cflag & CBAUD))
                         tty_port_raise_dtr_rts(port);
 
                 set_current_state(TASK_INTERRUPTIBLE);
@@ -3336,9 +3337,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 }
 
                 DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
 
         set_current_state(TASK_RUNNING);
@@ -3645,10 +3646,8 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
         for (i=0; i < port_count; ++i) {
                 port_array[i] = alloc_dev(adapter_num, i, pdev);
                 if (port_array[i] == NULL) {
-                        for (--i; i >= 0; --i) {
-                                tty_port_destroy(&port_array[i]->port);
+                        for (--i; i >= 0; --i)
                                 kfree(port_array[i]);
-                        }
                         return;
                 }
         }
@@ -3691,14 +3690,11 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
                 }
         }
 
-        for (i = 0; i < port_count; ++i) {
-                struct slgt_info *info = port_array[i];
-                tty_port_register_device(&info->port, serial_driver, info->line,
-                                &info->pdev->dev);
-        }
+        for (i=0; i < port_count; ++i)
+                tty_register_device(serial_driver, port_array[i]->line, &(port_array[i]->pdev->dev));
 }
 
-static int init_one(struct pci_dev *dev,
+static int __devinit init_one(struct pci_dev *dev,
                               const struct pci_device_id *ent)
 {
         if (pci_enable_device(dev)) {
@@ -3710,7 +3706,7 @@ static int init_one(struct pci_dev *dev,
         return 0;
 }
 
-static void remove_one(struct pci_dev *dev)
+static void __devexit remove_one(struct pci_dev *dev)
 {
 }
 
@@ -3775,7 +3771,6 @@ static void slgt_cleanup(void)
                         release_resources(info);
                 tmp = info;
                 info = info->next_device;
-                tty_port_destroy(&tmp->port);
                 kfree(tmp);
         }
 
@@ -3800,6 +3795,7 @@ static int __init slgt_init(void)
 
         /* Initialize the tty_driver structure */
 
+        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = tty_driver_name;
         serial_driver->name = tty_dev_prefix;
         serial_driver->major = ttymajor;
@@ -3928,7 +3924,7 @@ static void tdma_reset(struct slgt_info *info)
  */
 static void enable_loopback(struct slgt_info *info)
 {
-        /* SCR (serial control) BIT2=loopback enable */
+        /* SCR (serial control) BIT2=looopback enable */
         wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) | BIT2));
 
         if (info->params.mode != MGSL_MODE_ASYNC) {
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index fd43fb6f7ce..c77831c7675 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -58,6 +58,7 @@
 #include <linux/delay.h>
 #include <linux/ioctl.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
@@ -455,7 +456,7 @@ static int synclinkmp_device_count = 0;
  * .text section address and breakpoint on module load.
  * This is useful for use with gdb and add-symbol-file command.
  */
-static bool break_on_load = 0;
+static int break_on_load = 0;
 
 /*
  * Driver major number, defaults to zero to get auto
@@ -492,7 +493,7 @@ static struct pci_driver synclinkmp_pci_driver = {
         .name           = "synclinkmp",
         .id_table       = synclinkmp_pci_tbl,
         .probe          = synclinkmp_init_one,
-        .remove         = synclinkmp_remove_one,
+        .remove         = __devexit_p(synclinkmp_remove_one),
 };
 
 
@@ -711,42 +712,33 @@ static void ldisc_receive_buf(struct tty_struct *tty,
 
 /* tty callbacks */
 
-static int install(struct tty_driver *driver, struct tty_struct *tty)
+/* Called when a port is opened.  Init and enable port.
+ */
+static int open(struct tty_struct *tty, struct file *filp)
 {
         SLMP_INFO *info;
-        int line = tty->index;
+        int retval, line;
+        unsigned long flags;
 
-        if (line >= synclinkmp_device_count) {
+        line = tty->index;
+        if ((line < 0) || (line >= synclinkmp_device_count)) {
                 printk("%s(%d): open with invalid line #%d.\n",
                         __FILE__,__LINE__,line);
                 return -ENODEV;
         }
 
         info = synclinkmp_device_list;
-        while (info && info->line != line)
+        while(info && info->line != line)
                 info = info->next_device;
         if (sanity_check(info, tty->name, "open"))
                 return -ENODEV;
-        if (info->init_error) {
+        if ( info->init_error ) {
                 printk("%s(%d):%s device is not allocated, init error=%d\n",
-                        __FILE__, __LINE__, info->device_name,
-                        info->init_error);
+                        __FILE__,__LINE__,info->device_name,info->init_error);
                 return -ENODEV;
         }
 
         tty->driver_data = info;
-
-        return tty_port_install(&info->port, driver, tty);
-}
-
-/* Called when a port is opened.  Init and enable port.
- */
-static int open(struct tty_struct *tty, struct file *filp)
-{
-        SLMP_INFO *info = tty->driver_data;
-        unsigned long flags;
-        int retval;
-
         info->port.tty = tty;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -882,7 +874,7 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle transition to B0 status */
         if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios.c_cflag & CBAUD)) {
+            !(tty->termios->c_cflag & CBAUD)) {
                 info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
                 spin_lock_irqsave(&info->lock,flags);
                 set_signals(info);
@@ -891,9 +883,9 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle transition away from B0 status */
         if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios.c_cflag & CBAUD) {
+            tty->termios->c_cflag & CBAUD) {
                 info->serial_signals |= SerialSignal_DTR;
-                if (!(tty->termios.c_cflag & CRTSCTS) ||
+                if (!(tty->termios->c_cflag & CRTSCTS) ||
                     !test_bit(TTY_THROTTLED, &tty->flags)) {
                         info->serial_signals |= SerialSignal_RTS;
                 }
@@ -904,7 +896,7 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         /* Handle turning off CRTSCTS */
         if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
+            !(tty->termios->c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 tx_release(tty);
         }
@@ -1482,7 +1474,7 @@ static void throttle(struct tty_struct * tty)
         if (I_IXOFF(tty))
                 send_xchar(tty, STOP_CHAR(tty));
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->lock,flags);
                 info->serial_signals &= ~SerialSignal_RTS;
                 set_signals(info);
@@ -1511,7 +1503,7 @@ static void unthrottle(struct tty_struct * tty)
                         send_xchar(tty, START_CHAR(tty));
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (tty->termios->c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->lock,flags);
                 info->serial_signals |= SerialSignal_RTS;
                 set_signals(info);
@@ -2500,7 +2492,7 @@ static void isr_io_pin( SLMP_INFO *info, u16 status )
                         }
                 }
 
-                if (tty_port_cts_enabled(&info->port) &&
+                if ( (info->port.flags & ASYNC_CTS_FLOW) &&
                      (status & MISCSTATUS_CTS_LATCHED) ) {
                         if ( info->port.tty ) {
                                 if (info->port.tty->hw_stopped) {
@@ -2717,7 +2709,7 @@ static void shutdown(SLMP_INFO * info)
 
         reset_port(info);
 
-        if (!info->port.tty || info->port.tty->termios.c_cflag & HUPCL) {
+        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
                 info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 set_signals(info);
         }
@@ -2758,7 +2750,7 @@ static void program_hw(SLMP_INFO *info)
 
         get_signals(info);
 
-        if (info->netcount || (info->port.tty && info->port.tty->termios.c_cflag & CREAD) )
+        if (info->netcount || (info->port.tty && info->port.tty->termios->c_cflag & CREAD) )
                 rx_start(info);
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -2771,14 +2763,14 @@ static void change_params(SLMP_INFO *info)
         unsigned cflag;
         int bits_per_char;
 
-        if (!info->port.tty)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s change_params()\n",
                          __FILE__,__LINE__, info->device_name );
 
-        cflag = info->port.tty->termios.c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -3315,7 +3307,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 return 0;
         }
 
-        if (tty->termios.c_cflag & CLOCAL)
+        if (tty->termios->c_cflag & CLOCAL)
                 do_clocal = true;
 
         /* Wait for carrier detect and the line to become
@@ -3341,7 +3333,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         port->blocked_open++;
 
         while (1) {
-                if (tty->termios.c_cflag & CBAUD)
+                if (tty->termios->c_cflag & CBAUD)
                         tty_port_raise_dtr_rts(port);
 
                 set_current_state(TASK_INTERRUPTIBLE);
@@ -3366,9 +3358,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                         printk("%s(%d):%s block_til_ready() count=%d\n",
                                  __FILE__,__LINE__, tty->driver->name, port->count );
 
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
 
         set_current_state(TASK_RUNNING);
@@ -3843,10 +3835,8 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
         for ( port = 0; port < SCA_MAX_PORTS; ++port ) {
                 port_array[port] = alloc_dev(adapter_num,port,pdev);
                 if( port_array[port] == NULL ) {
-                        for (--port; port >= 0; --port) {
-                                tty_port_destroy(&port_array[port]->port);
+                        for ( --port; port >= 0; --port )
                                 kfree(port_array[port]);
-                        }
                         return;
                 }
         }
@@ -3892,7 +3882,6 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
 }
 
 static const struct tty_operations ops = {
-        .install = install,
         .open = open,
         .close = close,
         .write = write,
@@ -3955,7 +3944,6 @@ static void synclinkmp_cleanup(void)
                 }
                 tmp = info;
                 info = info->next_device;
-                tty_port_destroy(&tmp->port);
                 kfree(tmp);
         }
 
@@ -3989,6 +3977,7 @@ static int __init synclinkmp_init(void)
 
         /* Initialize the tty_driver structure */
 
+        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "synclinkmp";
         serial_driver->name = "ttySLM";
         serial_driver->major = ttymajor;
@@ -4961,7 +4950,7 @@ CheckAgain:
 
         if ( debug_level >= DEBUG_LEVEL_DATA )
                 trace_block(info,info->rx_buf_list_ex[StartIndex].virt_addr,
-                        min_t(unsigned int, framesize, SCABUFSIZE), 0);
+                        min_t(int, framesize,SCABUFSIZE),0);
 
         if (framesize) {
                 if (framesize > info->max_frame_size)
@@ -5026,14 +5015,14 @@ static void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int co
         SCADESC_EX *desc_ex;
 
         if ( debug_level >= DEBUG_LEVEL_DATA )
-                trace_block(info, buf, min_t(unsigned int, count, SCABUFSIZE), 1);
+                trace_block(info,buf, min_t(int, count,SCABUFSIZE), 1);
 
         /* Copy source buffer to one or more DMA buffers, starting with
          * the first transmit dma buffer.
          */
         for(i=0;;)
         {
-                copy_count = min_t(unsigned int, count, SCABUFSIZE);
+                copy_count = min_t(unsigned short,count,SCABUFSIZE);
 
                 desc = &info->tx_buf_list[i];
                 desc_ex = &info->tx_buf_list_ex[i];
@@ -5595,7 +5584,7 @@ static void write_control_reg(SLMP_INFO * info)
 }
 
 
-static int synclinkmp_init_one (struct pci_dev *dev,
+static int __devinit synclinkmp_init_one (struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
         if (pci_enable_device(dev)) {
@@ -5606,6 +5595,6 @@ static int synclinkmp_init_one (struct pci_dev *dev,
         return 0;
 }
 
-static void synclinkmp_remove_one (struct pci_dev *dev)
+static void __devexit synclinkmp_remove_one (struct pci_dev *dev)
 {
 }
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index b3c4a250ff8..43db715f150 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/suspend.h>
 #include <linux/writeback.h>
+#include <linux/buffer_head.h>          /* for fsync_bdev() */
 #include <linux/swap.h>
 #include <linux/spinlock.h>
 #include <linux/vt_kern.h>
@@ -40,7 +41,6 @@
 #include <linux/oom.h>
 #include <linux/slab.h>
 #include <linux/input.h>
-#include <linux/uaccess.h>
 
 #include <asm/ptrace.h>
 #include <asm/irq_regs.h>
@@ -110,9 +110,11 @@ static struct sysrq_key_op sysrq_SAK_op = {
 #ifdef CONFIG_VT
 static void sysrq_handle_unraw(int key)
 {
-        vt_reset_unicode(fg_console);
-}
+        struct kbd_struct *kbd = &kbd_table[fg_console];
 
+        if (kbd)
+                kbd->kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
+}
 static struct sysrq_key_op sysrq_unraw_op = {
         .handler        = sysrq_handle_unraw,
         .help_msg       = "unRaw",
@@ -320,16 +322,11 @@ static void send_sig_all(int sig)
 {
         struct task_struct *p;
 
-        read_lock(&tasklist_lock);
         for_each_process(p) {
-                if (p->flags & PF_KTHREAD)
-                        continue;
-                if (is_global_init(p))
-                        continue;
-
-                do_send_sig_info(sig, SEND_SIG_FORCED, p, true);
+                if (p->mm && !is_global_init(p))
+                        /* Not swapper, init nor kernel thread */
+                        force_sig(sig, p);
         }
-        read_unlock(&tasklist_lock);
 }
 
 static void sysrq_handle_term(int key)
@@ -346,8 +343,7 @@ static struct sysrq_key_op sysrq_term_op = {
 
 static void moom_callback(struct work_struct *ignored)
 {
-        out_of_memory(node_zonelist(first_online_node, GFP_KERNEL), GFP_KERNEL,
-                      0, NULL, true);
+        out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0, NULL);
 }
 
 static DECLARE_WORK(moom_work, moom_callback);
@@ -453,7 +449,6 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
         NULL,                           /* v */
         &sysrq_showstate_blocked_op,    /* w */
         /* x: May be registered on ppc/powerpc for xmon */
-        /* x: May be registered on sparc64 for global PMU dump */
         NULL,                           /* x */
         /* y: May be registered on sparc64 for global register dump */
         NULL,                           /* y */
diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index 6953dc82850..7c586692062 100644
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -23,7 +23,7 @@ struct tty_audit_buf {
 };
 
 static struct tty_audit_buf *tty_audit_buf_alloc(int major, int minor,
-                                                 unsigned icanon)
+                                                 int icanon)
 {
         struct tty_audit_buf *buf;
 
@@ -61,7 +61,7 @@ static void tty_audit_buf_put(struct tty_audit_buf *buf)
 }
 
 static void tty_audit_log(const char *description, struct task_struct *tsk,
-                          kuid_t loginuid, unsigned sessionid, int major,
+                          uid_t loginuid, unsigned sessionid, int major,
                           int minor, unsigned char *data, size_t size)
 {
         struct audit_buffer *ab;
@@ -69,14 +69,11 @@ static void tty_audit_log(const char *description, struct task_struct *tsk,
         ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
         if (ab) {
                 char name[sizeof(tsk->comm)];
-                kuid_t uid = task_uid(tsk);
+                uid_t uid = task_uid(tsk);
 
                 audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u "
                                  "major=%d minor=%d comm=", description,
-                                 tsk->pid,
-                                 from_kuid(&init_user_ns, uid),
-                                 from_kuid(&init_user_ns, loginuid),
-                                 sessionid,
+                                 tsk->pid, uid, loginuid, sessionid,
                                  major, minor);
                 get_task_comm(name, tsk);
                 audit_log_untrustedstring(ab, name);
@@ -92,7 +89,7 @@ static void tty_audit_log(const char *description, struct task_struct *tsk,
  *      Generate an audit message from the contents of @buf, which is owned by
  *      @tsk with @loginuid.  @buf->mutex must be locked.
  */
-static void tty_audit_buf_push(struct task_struct *tsk, kuid_t loginuid,
+static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
                                unsigned int sessionid,
                                struct tty_audit_buf *buf)
 {
@@ -115,7 +112,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, kuid_t loginuid,
  */
 static void tty_audit_buf_push_current(struct tty_audit_buf *buf)
 {
-        kuid_t auid = audit_get_loginuid(current);
+        uid_t auid = audit_get_loginuid(current);
         unsigned int sessionid = audit_get_sessionid(current);
         tty_audit_buf_push(current, auid, sessionid, buf);
 }
@@ -182,7 +179,7 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch)
         }
 
         if (should_audit && audit_enabled) {
-                kuid_t auid;
+                uid_t auid;
                 unsigned int sessionid;
 
                 auid = audit_get_loginuid(current);
@@ -202,7 +199,7 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch)
  * reference to the tty audit buffer if available.
  * Flush the buffer or return an appropriate error code.
  */
-int tty_audit_push_task(struct task_struct *tsk, kuid_t loginuid, u32 sessionid)
+int tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
 {
         struct tty_audit_buf *buf = ERR_PTR(-EPERM);
         unsigned long flags;
@@ -239,8 +236,7 @@ int tty_audit_push_task(struct task_struct *tsk, kuid_t loginuid, u32 sessionid)
  *      if TTY auditing is disabled or out of memory.  Otherwise, return a new
  *      reference to the buffer.
  */
-static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
-                unsigned icanon)
+static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty)
 {
         struct tty_audit_buf *buf, *buf2;
 
@@ -258,7 +254,7 @@ static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
 
         buf2 = tty_audit_buf_alloc(tty->driver->major,
                                    tty->driver->minor_start + tty->index,
-                                   icanon);
+                                   tty->icanon);
         if (buf2 == NULL) {
                 audit_log_lost("out of memory in TTY auditing");
                 return NULL;
@@ -288,7 +284,7 @@ static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
  *      Audit @data of @size from @tty, if necessary.
  */
 void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
-                        size_t size, unsigned icanon)
+                        size_t size)
 {
         struct tty_audit_buf *buf;
         int major, minor;
@@ -300,7 +296,7 @@ void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
             && tty->driver->subtype == PTY_TYPE_MASTER)
                 return;
 
-        buf = tty_audit_buf_get(tty, icanon);
+        buf = tty_audit_buf_get(tty);
         if (!buf)
                 return;
 
@@ -308,11 +304,11 @@ void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
         major = tty->driver->major;
         minor = tty->driver->minor_start + tty->index;
         if (buf->major != major || buf->minor != minor
-            || buf->icanon != icanon) {
+            || buf->icanon != tty->icanon) {
                 tty_audit_buf_push_current(buf);
                 buf->major = major;
                 buf->minor = minor;
-                buf->icanon = icanon;
+                buf->icanon = tty->icanon;
         }
         do {
                 size_t run;
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 45d916198f7..6c9b7cd6778 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -27,21 +27,19 @@
  *      Locking: none
  */
 
-void tty_buffer_free_all(struct tty_port *port)
+void tty_buffer_free_all(struct tty_struct *tty)
 {
-        struct tty_bufhead *buf = &port->buf;
         struct tty_buffer *thead;
-
-        while ((thead = buf->head) != NULL) {
-                buf->head = thead->next;
+        while ((thead = tty->buf.head) != NULL) {
+                tty->buf.head = thead->next;
                 kfree(thead);
         }
-        while ((thead = buf->free) != NULL) {
-                buf->free = thead->next;
+        while ((thead = tty->buf.free) != NULL) {
+                tty->buf.free = thead->next;
                 kfree(thead);
         }
-        buf->tail = NULL;
-        buf->memory_used = 0;
+        tty->buf.tail = NULL;
+        tty->buf.memory_used = 0;
 }
 
 /**
@@ -56,11 +54,11 @@ void tty_buffer_free_all(struct tty_port *port)
  *      Locking: Caller must hold tty->buf.lock
  */
 
-static struct tty_buffer *tty_buffer_alloc(struct tty_port *port, size_t size)
+static struct tty_buffer *tty_buffer_alloc(struct tty_struct *tty, size_t size)
 {
         struct tty_buffer *p;
 
-        if (port->buf.memory_used + size > 65536)
+        if (tty->buf.memory_used + size > 65536)
                 return NULL;
         p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);
         if (p == NULL)
@@ -72,7 +70,7 @@ static struct tty_buffer *tty_buffer_alloc(struct tty_port *port, size_t size)
         p->read = 0;
         p->char_buf_ptr = (char *)(p->data);
         p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size;
-        port->buf.memory_used += size;
+        tty->buf.memory_used += size;
         return p;
 }
 
@@ -87,19 +85,17 @@ static struct tty_buffer *tty_buffer_alloc(struct tty_port *port, size_t size)
  *      Locking: Caller must hold tty->buf.lock
  */
 
-static void tty_buffer_free(struct tty_port *port, struct tty_buffer *b)
+static void tty_buffer_free(struct tty_struct *tty, struct tty_buffer *b)
 {
-        struct tty_bufhead *buf = &port->buf;
-
         /* Dumb strategy for now - should keep some stats */
-        buf->memory_used -= b->size;
-        WARN_ON(buf->memory_used < 0);
+        tty->buf.memory_used -= b->size;
+        WARN_ON(tty->buf.memory_used < 0);
 
         if (b->size >= 512)
                 kfree(b);
         else {
-                b->next = buf->free;
-                buf->free = b;
+                b->next = tty->buf.free;
+                tty->buf.free = b;
         }
 }
 
@@ -114,16 +110,15 @@ static void tty_buffer_free(struct tty_port *port, struct tty_buffer *b)
  *      Locking: Caller must hold tty->buf.lock
  */
 
-static void __tty_buffer_flush(struct tty_port *port)
+static void __tty_buffer_flush(struct tty_struct *tty)
 {
-        struct tty_bufhead *buf = &port->buf;
         struct tty_buffer *thead;
 
-        while ((thead = buf->head) != NULL) {
-                buf->head = thead->next;
-                tty_buffer_free(port, thead);
+        while ((thead = tty->buf.head) != NULL) {
+                tty->buf.head = thead->next;
+                tty_buffer_free(tty, thead);
         }
-        buf->tail = NULL;
+        tty->buf.tail = NULL;
 }
 
 /**
@@ -139,24 +134,21 @@ static void __tty_buffer_flush(struct tty_port *port)
 
 void tty_buffer_flush(struct tty_struct *tty)
 {
-        struct tty_port *port = tty->port;
-        struct tty_bufhead *buf = &port->buf;
         unsigned long flags;
-
-        spin_lock_irqsave(&buf->lock, flags);
+        spin_lock_irqsave(&tty->buf.lock, flags);
 
         /* If the data is being pushed to the tty layer then we can't
            process it here. Instead set a flag and the flush_to_ldisc
            path will process the flush request before it exits */
-        if (test_bit(TTYP_FLUSHING, &port->iflags)) {
-                set_bit(TTYP_FLUSHPENDING, &port->iflags);
-                spin_unlock_irqrestore(&buf->lock, flags);
+        if (test_bit(TTY_FLUSHING, &tty->flags)) {
+                set_bit(TTY_FLUSHPENDING, &tty->flags);
+                spin_unlock_irqrestore(&tty->buf.lock, flags);
                 wait_event(tty->read_wait,
-                                test_bit(TTYP_FLUSHPENDING, &port->iflags) == 0);
+                                test_bit(TTY_FLUSHPENDING, &tty->flags) == 0);
                 return;
         } else
-                __tty_buffer_flush(port);
-        spin_unlock_irqrestore(&buf->lock, flags);
+                __tty_buffer_flush(tty);
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
 }
 
 /**
@@ -171,9 +163,9 @@ void tty_buffer_flush(struct tty_struct *tty)
  *      Locking: Caller must hold tty->buf.lock
  */
 
-static struct tty_buffer *tty_buffer_find(struct tty_port *port, size_t size)
+static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
 {
-        struct tty_buffer **tbh = &port->buf.free;
+        struct tty_buffer **tbh = &tty->buf.free;
         while ((*tbh) != NULL) {
                 struct tty_buffer *t = *tbh;
                 if (t->size >= size) {
@@ -182,78 +174,60 @@ static struct tty_buffer *tty_buffer_find(struct tty_port *port, size_t size)
                         t->used = 0;
                         t->commit = 0;
                         t->read = 0;
-                        port->buf.memory_used += t->size;
+                        tty->buf.memory_used += t->size;
                         return t;
                 }
                 tbh = &((*tbh)->next);
         }
         /* Round the buffer size out */
         size = (size + 0xFF) & ~0xFF;
-        return tty_buffer_alloc(port, size);
+        return tty_buffer_alloc(tty, size);
         /* Should possibly check if this fails for the largest buffer we
            have queued and recycle that ? */
 }
+
 /**
- *      __tty_buffer_request_room               -       grow tty buffer if needed
+ *      tty_buffer_request_room         -       grow tty buffer if needed
  *      @tty: tty structure
  *      @size: size desired
  *
  *      Make at least size bytes of linear space available for the tty
  *      buffer. If we fail return the size we managed to find.
- *      Locking: Caller must hold port->buf.lock
+ *
+ *      Locking: Takes tty->buf.lock
  */
-static int __tty_buffer_request_room(struct tty_port *port, size_t size)
+int tty_buffer_request_room(struct tty_struct *tty, size_t size)
 {
-        struct tty_bufhead *buf = &port->buf;
         struct tty_buffer *b, *n;
         int left;
+        unsigned long flags;
+
+        spin_lock_irqsave(&tty->buf.lock, flags);
+
         /* OPTIMISATION: We could keep a per tty "zero" sized buffer to
            remove this conditional if its worth it. This would be invisible
            to the callers */
-        b = buf->tail;
-        if (b != NULL)
+        if ((b = tty->buf.tail) != NULL)
                 left = b->size - b->used;
         else
                 left = 0;
 
         if (left < size) {
                 /* This is the slow path - looking for new buffers to use */
-                if ((n = tty_buffer_find(port, size)) != NULL) {
+                if ((n = tty_buffer_find(tty, size)) != NULL) {
                         if (b != NULL) {
                                 b->next = n;
                                 b->commit = b->used;
                         } else
-                                buf->head = n;
-                        buf->tail = n;
+                                tty->buf.head = n;
+                        tty->buf.tail = n;
                 } else
                         size = left;
         }
 
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
         return size;
 }
-
-
-/**
- *      tty_buffer_request_room         -       grow tty buffer if needed
- *      @tty: tty structure
- *      @size: size desired
- *
- *      Make at least size bytes of linear space available for the tty
- *      buffer. If we fail return the size we managed to find.
- *
- *      Locking: Takes port->buf.lock
- */
-int tty_buffer_request_room(struct tty_struct *tty, size_t size)
-{
-        struct tty_port *port = tty->port;
-        unsigned long flags;
-        int length;
-
-        spin_lock_irqsave(&port->buf.lock, flags);
-        length = __tty_buffer_request_room(port, size);
-        spin_unlock_irqrestore(&port->buf.lock, flags);
-        return length;
-}
 EXPORT_SYMBOL_GPL(tty_buffer_request_room);
 
 /**
@@ -266,32 +240,23 @@ EXPORT_SYMBOL_GPL(tty_buffer_request_room);
  *      Queue a series of bytes to the tty buffering. All the characters
  *      passed are marked with the supplied flag. Returns the number added.
  *
- *      Locking: Called functions may take port->buf.lock
+ *      Locking: Called functions may take tty->buf.lock
  */
 
 int tty_insert_flip_string_fixed_flag(struct tty_struct *tty,
                 const unsigned char *chars, char flag, size_t size)
 {
-        struct tty_bufhead *buf = &tty->port->buf;
         int copied = 0;
         do {
                 int goal = min_t(size_t, size - copied, TTY_BUFFER_PAGE);
-                int space;
-                unsigned long flags;
-                struct tty_buffer *tb;
-
-                spin_lock_irqsave(&buf->lock, flags);
-                space = __tty_buffer_request_room(tty->port, goal);
-                tb = buf->tail;
+                int space = tty_buffer_request_room(tty, goal);
+                struct tty_buffer *tb = tty->buf.tail;
                 /* If there is no space then tb may be NULL */
-                if (unlikely(space == 0)) {
-                        spin_unlock_irqrestore(&buf->lock, flags);
+                if (unlikely(space == 0))
                         break;
-                }
                 memcpy(tb->char_buf_ptr + tb->used, chars, space);
                 memset(tb->flag_buf_ptr + tb->used, flag, space);
                 tb->used += space;
-                spin_unlock_irqrestore(&buf->lock, flags);
                 copied += space;
                 chars += space;
                 /* There is a small chance that we need to split the data over
@@ -312,32 +277,23 @@ EXPORT_SYMBOL(tty_insert_flip_string_fixed_flag);
  *      the flags array indicates the status of the character. Returns the
  *      number added.
  *
- *      Locking: Called functions may take port->buf.lock
+ *      Locking: Called functions may take tty->buf.lock
  */
 
 int tty_insert_flip_string_flags(struct tty_struct *tty,
                 const unsigned char *chars, const char *flags, size_t size)
 {
-        struct tty_bufhead *buf = &tty->port->buf;
         int copied = 0;
         do {
                 int goal = min_t(size_t, size - copied, TTY_BUFFER_PAGE);
-                int space;
-                unsigned long __flags;
-                struct tty_buffer *tb;
-
-                spin_lock_irqsave(&buf->lock, __flags);
-                space = __tty_buffer_request_room(tty->port, goal);
-                tb = buf->tail;
+                int space = tty_buffer_request_room(tty, goal);
+                struct tty_buffer *tb = tty->buf.tail;
                 /* If there is no space then tb may be NULL */
-                if (unlikely(space == 0)) {
-                        spin_unlock_irqrestore(&buf->lock, __flags);
+                if (unlikely(space == 0))
                         break;
-                }
                 memcpy(tb->char_buf_ptr + tb->used, chars, space);
                 memcpy(tb->flag_buf_ptr + tb->used, flags, space);
                 tb->used += space;
-                spin_unlock_irqrestore(&buf->lock, __flags);
                 copied += space;
                 chars += space;
                 flags += space;
@@ -355,23 +311,18 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags);
  *      Takes any pending buffers and transfers their ownership to the
  *      ldisc side of the queue. It then schedules those characters for
  *      processing by the line discipline.
- *      Note that this function can only be used when the low_latency flag
- *      is unset. Otherwise the workqueue won't be flushed.
  *
- *      Locking: Takes port->buf.lock
+ *      Locking: Takes tty->buf.lock
  */
 
 void tty_schedule_flip(struct tty_struct *tty)
 {
-        struct tty_bufhead *buf = &tty->port->buf;
         unsigned long flags;
-        WARN_ON(tty->low_latency);
-
-        spin_lock_irqsave(&buf->lock, flags);
-        if (buf->tail != NULL)
-                buf->tail->commit = buf->tail->used;
-        spin_unlock_irqrestore(&buf->lock, flags);
-        schedule_work(&buf->work);
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        if (tty->buf.tail != NULL)
+                tty->buf.tail->commit = tty->buf.tail->used;
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+        schedule_work(&tty->buf.work);
 }
 EXPORT_SYMBOL(tty_schedule_flip);
 
@@ -387,27 +338,19 @@ EXPORT_SYMBOL(tty_schedule_flip);
  *      that need their own block copy routines into the buffer. There is no
  *      guarantee the buffer is a DMA target!
  *
- *      Locking: May call functions taking port->buf.lock
+ *      Locking: May call functions taking tty->buf.lock
  */
 
 int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars,
-                size_t size)
+                                                                size_t size)
 {
-        struct tty_bufhead *buf = &tty->port->buf;
-        int space;
-        unsigned long flags;
-        struct tty_buffer *tb;
-
-        spin_lock_irqsave(&buf->lock, flags);
-        space = __tty_buffer_request_room(tty->port, size);
-
-        tb = buf->tail;
+        int space = tty_buffer_request_room(tty, size);
         if (likely(space)) {
+                struct tty_buffer *tb = tty->buf.tail;
                 *chars = tb->char_buf_ptr + tb->used;
                 memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
                 tb->used += space;
         }
-        spin_unlock_irqrestore(&buf->lock, flags);
         return space;
 }
 EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
@@ -425,27 +368,19 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
  *      that need their own block copy routines into the buffer. There is no
  *      guarantee the buffer is a DMA target!
  *
- *      Locking: May call functions taking port->buf.lock
+ *      Locking: May call functions taking tty->buf.lock
  */
 
 int tty_prepare_flip_string_flags(struct tty_struct *tty,
                         unsigned char **chars, char **flags, size_t size)
 {
-        struct tty_bufhead *buf = &tty->port->buf;
-        int space;
-        unsigned long __flags;
-        struct tty_buffer *tb;
-
-        spin_lock_irqsave(&buf->lock, __flags);
-        space = __tty_buffer_request_room(tty->port, size);
-
-        tb = buf->tail;
+        int space = tty_buffer_request_room(tty, size);
         if (likely(space)) {
+                struct tty_buffer *tb = tty->buf.tail;
                 *chars = tb->char_buf_ptr + tb->used;
                 *flags = tb->flag_buf_ptr + tb->used;
                 tb->used += space;
         }
-        spin_unlock_irqrestore(&buf->lock, __flags);
         return space;
 }
 EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);
@@ -466,25 +401,20 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string_flags);
 
 static void flush_to_ldisc(struct work_struct *work)
 {
-        struct tty_port *port = container_of(work, struct tty_port, buf.work);
-        struct tty_bufhead *buf = &port->buf;
-        struct tty_struct *tty;
+        struct tty_struct *tty =
+                container_of(work, struct tty_struct, buf.work);
         unsigned long   flags;
         struct tty_ldisc *disc;
 
-        tty = port->itty;
-        if (WARN_RATELIMIT(tty == NULL, "tty is NULL\n"))
-                return;
-
         disc = tty_ldisc_ref(tty);
         if (disc == NULL)       /*  !TTY_LDISC */
                 return;
 
-        spin_lock_irqsave(&buf->lock, flags);
+        spin_lock_irqsave(&tty->buf.lock, flags);
 
-        if (!test_and_set_bit(TTYP_FLUSHING, &port->iflags)) {
+        if (!test_and_set_bit(TTY_FLUSHING, &tty->flags)) {
                 struct tty_buffer *head;
-                while ((head = buf->head) != NULL) {
+                while ((head = tty->buf.head) != NULL) {
                         int count;
                         char *char_buf;
                         unsigned char *flag_buf;
@@ -493,14 +423,14 @@ static void flush_to_ldisc(struct work_struct *work)
                         if (!count) {
                                 if (head->next == NULL)
                                         break;
-                                buf->head = head->next;
-                                tty_buffer_free(port, head);
+                                tty->buf.head = head->next;
+                                tty_buffer_free(tty, head);
                                 continue;
                         }
                         /* Ldisc or user is trying to flush the buffers
                            we are feeding to the ldisc, stop feeding the
                            line discipline as we want to empty the queue */
-                        if (test_bit(TTYP_FLUSHPENDING, &port->iflags))
+                        if (test_bit(TTY_FLUSHPENDING, &tty->flags))
                                 break;
                         if (!tty->receive_room)
                                 break;
@@ -509,22 +439,22 @@ static void flush_to_ldisc(struct work_struct *work)
                         char_buf = head->char_buf_ptr + head->read;
                         flag_buf = head->flag_buf_ptr + head->read;
                         head->read += count;
-                        spin_unlock_irqrestore(&buf->lock, flags);
+                        spin_unlock_irqrestore(&tty->buf.lock, flags);
                         disc->ops->receive_buf(tty, char_buf,
                                                         flag_buf, count);
-                        spin_lock_irqsave(&buf->lock, flags);
+                        spin_lock_irqsave(&tty->buf.lock, flags);
                 }
-                clear_bit(TTYP_FLUSHING, &port->iflags);
+                clear_bit(TTY_FLUSHING, &tty->flags);
         }
 
         /* We may have a deferred request to flush the input buffer,
            if so pull the chain under the lock and empty the queue */
-        if (test_bit(TTYP_FLUSHPENDING, &port->iflags)) {
-                __tty_buffer_flush(port);
-                clear_bit(TTYP_FLUSHPENDING, &port->iflags);
+        if (test_bit(TTY_FLUSHPENDING, &tty->flags)) {
+                __tty_buffer_flush(tty);
+                clear_bit(TTY_FLUSHPENDING, &tty->flags);
                 wake_up(&tty->read_wait);
         }
-        spin_unlock_irqrestore(&buf->lock, flags);
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
 
         tty_ldisc_deref(disc);
 }
@@ -539,8 +469,7 @@ static void flush_to_ldisc(struct work_struct *work)
  */
 void tty_flush_to_ldisc(struct tty_struct *tty)
 {
-        if (!tty->low_latency)
-                flush_work(&tty->port->buf.work);
+        flush_work(&tty->buf.work);
 }
 
 /**
@@ -558,18 +487,16 @@ void tty_flush_to_ldisc(struct tty_struct *tty)
 
 void tty_flip_buffer_push(struct tty_struct *tty)
 {
-        struct tty_bufhead *buf = &tty->port->buf;
         unsigned long flags;
-
-        spin_lock_irqsave(&buf->lock, flags);
-        if (buf->tail != NULL)
-                buf->tail->commit = buf->tail->used;
-        spin_unlock_irqrestore(&buf->lock, flags);
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        if (tty->buf.tail != NULL)
+                tty->buf.tail->commit = tty->buf.tail->used;
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
 
         if (tty->low_latency)
-                flush_to_ldisc(&buf->work);
+                flush_to_ldisc(&tty->buf.work);
         else
-                schedule_work(&buf->work);
+                schedule_work(&tty->buf.work);
 }
 EXPORT_SYMBOL(tty_flip_buffer_push);
 
@@ -583,15 +510,13 @@ EXPORT_SYMBOL(tty_flip_buffer_push);
  *      Locking: none
  */
 
-void tty_buffer_init(struct tty_port *port)
+void tty_buffer_init(struct tty_struct *tty)
 {
-        struct tty_bufhead *buf = &port->buf;
-
-        spin_lock_init(&buf->lock);
-        buf->head = NULL;
-        buf->tail = NULL;
-        buf->free = NULL;
-        buf->memory_used = 0;
-        INIT_WORK(&buf->work, flush_to_ldisc);
+        spin_lock_init(&tty->buf.lock);
+        tty->buf.head = NULL;
+        tty->buf.tail = NULL;
+        tty->buf.free = NULL;
+        tty->buf.memory_used = 0;
+        INIT_WORK(&tty->buf.work, flush_to_ldisc);
 }
 
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index da9fde85075..1a890e270be 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -97,6 +97,7 @@
 #include <linux/ratelimit.h>
 
 #include <linux/uaccess.h>
+#include <asm/system.h>
 
 #include <linux/kbd_kern.h>
 #include <linux/vt_kern.h>
@@ -181,12 +182,10 @@ struct tty_struct *alloc_tty_struct(void)
 
 void free_tty_struct(struct tty_struct *tty)
 {
-        if (!tty)
-                return;
         if (tty->dev)
                 put_device(tty->dev);
         kfree(tty->write_buf);
-        tty->magic = 0xDEADDEAD;
+        tty_buffer_free_all(tty);
         kfree(tty);
 }
 
@@ -236,7 +235,7 @@ void tty_free_file(struct file *file)
 }
 
 /* Delete file from its tty */
-static void tty_del_file(struct file *file)
+void tty_del_file(struct file *file)
 {
         struct tty_file_private *priv = file->private_data;
 
@@ -554,7 +553,7 @@ EXPORT_SYMBOL_GPL(tty_wakeup);
  *                tasklist_lock to walk task list for hangup event
  *                  ->siglock to protect ->signal/->sighand
  */
-static void __tty_hangup(struct tty_struct *tty)
+void __tty_hangup(struct tty_struct *tty)
 {
         struct file *cons_filp = NULL;
         struct file *filp, *f = NULL;
@@ -575,7 +574,7 @@ static void __tty_hangup(struct tty_struct *tty)
         }
         spin_unlock(&redirect_lock);
 
-        tty_lock(tty);
+        tty_lock();
 
         /* some functions below drop BTM, so we need this bit */
         set_bit(TTY_HUPPING, &tty->flags);
@@ -668,7 +667,7 @@ static void __tty_hangup(struct tty_struct *tty)
         clear_bit(TTY_HUPPING, &tty->flags);
         tty_ldisc_enable(tty);
 
-        tty_unlock(tty);
+        tty_unlock();
 
         if (f)
                 fput(f);
@@ -791,24 +790,19 @@ static void session_clear_tty(struct pid *session)
 void disassociate_ctty(int on_exit)
 {
         struct tty_struct *tty;
+        struct pid *tty_pgrp = NULL;
 
         if (!current->signal->leader)
                 return;
 
         tty = get_current_tty();
         if (tty) {
-                struct pid *tty_pgrp = get_pid(tty->pgrp);
+                tty_pgrp = get_pid(tty->pgrp);
                 if (on_exit) {
                         if (tty->driver->type != TTY_DRIVER_TYPE_PTY)
                                 tty_vhangup(tty);
                 }
                 tty_kref_put(tty);
-                if (tty_pgrp) {
-                        kill_pgrp(tty_pgrp, SIGHUP, on_exit);
-                        if (!on_exit)
-                                kill_pgrp(tty_pgrp, SIGCONT, on_exit);
-                        put_pid(tty_pgrp);
-                }
         } else if (on_exit) {
                 struct pid *old_pgrp;
                 spin_lock_irq(&current->sighand->siglock);
@@ -822,6 +816,12 @@ void disassociate_ctty(int on_exit)
                 }
                 return;
         }
+        if (tty_pgrp) {
+                kill_pgrp(tty_pgrp, SIGHUP, on_exit);
+                if (!on_exit)
+                        kill_pgrp(tty_pgrp, SIGCONT, on_exit);
+                put_pid(tty_pgrp);
+        }
 
         spin_lock_irq(&current->sighand->siglock);
         put_pid(current->signal->tty_old_pgrp);
@@ -857,11 +857,10 @@ void disassociate_ctty(int on_exit)
  */
 void no_tty(void)
 {
-        /* FIXME: Review locking here. The tty_lock never covered any race
-           between a new association and proc_clear_tty but possible we need
-           to protect against this anyway */
         struct task_struct *tsk = current;
+        tty_lock();
         disassociate_ctty(0);
+        tty_unlock();
         proc_clear_tty(tsk);
 }
 
@@ -1105,12 +1104,12 @@ void tty_write_message(struct tty_struct *tty, char *msg)
 {
         if (tty) {
                 mutex_lock(&tty->atomic_write_lock);
-                tty_lock(tty);
+                tty_lock();
                 if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags)) {
-                        tty_unlock(tty);
+                        tty_unlock();
                         tty->ops->write(tty, msg, strlen(msg));
                 } else
-                        tty_unlock(tty);
+                        tty_unlock();
                 tty_write_unlock(tty);
         }
         return;
@@ -1165,8 +1164,10 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
         struct file *p = NULL;
 
         spin_lock(&redirect_lock);
-        if (redirect)
-                p = get_file(redirect);
+        if (redirect) {
+                get_file(redirect);
+                p = redirect;
+        }
         spin_unlock(&redirect_lock);
 
         if (p) {
@@ -1213,10 +1214,7 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p)
  */
 static void tty_line_name(struct tty_driver *driver, int index, char *p)
 {
-        if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)
-                strcpy(p, driver->name);
-        else
-                sprintf(p, "%s%d", driver->name, index + driver->name_base);
+        sprintf(p, "%s%d", driver->name, index + driver->name_base);
 }
 
 /**
@@ -1233,10 +1231,13 @@ static void tty_line_name(struct tty_driver *driver, int index, char *p)
 static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,
                 struct inode *inode, int idx)
 {
+        struct tty_struct *tty;
+
         if (driver->ops->lookup)
                 return driver->ops->lookup(driver, inode, idx);
 
-        return driver->ttys[idx];
+        tty = driver->ttys[idx];
+        return tty;
 }
 
 /**
@@ -1252,36 +1253,25 @@ int tty_init_termios(struct tty_struct *tty)
         struct ktermios *tp;
         int idx = tty->index;
 
-        if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS)
-                tty->termios = tty->driver->init_termios;
-        else {
-                /* Check for lazy saved data */
-                tp = tty->driver->termios[idx];
-                if (tp != NULL)
-                        tty->termios = *tp;
-                else
-                        tty->termios = tty->driver->init_termios;
+        tp = tty->driver->termios[idx];
+        if (tp == NULL) {
+                tp = kzalloc(sizeof(struct ktermios[2]), GFP_KERNEL);
+                if (tp == NULL)
+                        return -ENOMEM;
+                memcpy(tp, &tty->driver->init_termios,
+                                                sizeof(struct ktermios));
+                tty->driver->termios[idx] = tp;
         }
+        tty->termios = tp;
+        tty->termios_locked = tp + 1;
+
         /* Compatibility until drivers always set this */
-        tty->termios.c_ispeed = tty_termios_input_baud_rate(&tty->termios);
-        tty->termios.c_ospeed = tty_termios_baud_rate(&tty->termios);
+        tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios);
+        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
         return 0;
 }
 EXPORT_SYMBOL_GPL(tty_init_termios);
 
-int tty_standard_install(struct tty_driver *driver, struct tty_struct *tty)
-{
-        int ret = tty_init_termios(tty);
-        if (ret)
-                return ret;
-
-        tty_driver_kref_get(driver);
-        tty->count++;
-        driver->ttys[tty->index] = tty;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(tty_standard_install);
-
 /**
  *      tty_driver_install_tty() - install a tty entry in the driver
  *      @driver: the driver for the tty
@@ -1297,8 +1287,21 @@ EXPORT_SYMBOL_GPL(tty_standard_install);
 static int tty_driver_install_tty(struct tty_driver *driver,
                                                 struct tty_struct *tty)
 {
-        return driver->ops->install ? driver->ops->install(driver, tty) :
-                tty_standard_install(driver, tty);
+        int idx = tty->index;
+        int ret;
+
+        if (driver->ops->install) {
+                ret = driver->ops->install(driver, tty);
+                return ret;
+        }
+
+        if (tty_init_termios(tty) == 0) {
+                tty_driver_kref_get(driver);
+                tty->count++;
+                driver->ttys[idx] = tty;
+                return 0;
+        }
+        return -ENOMEM;
 }
 
 /**
@@ -1349,6 +1352,7 @@ static int tty_reopen(struct tty_struct *tty)
                 tty->link->count++;
         }
         tty->count++;
+        tty->driver = driver; /* N.B. why do this every time?? */
 
         mutex_lock(&tty->ldisc_mutex);
         WARN_ON(!test_bit(TTY_LDISC, &tty->flags));
@@ -1362,6 +1366,7 @@ static int tty_reopen(struct tty_struct *tty)
  *      @driver: tty driver we are opening a device on
  *      @idx: device index
  *      @ret_tty: returned tty structure
+ *      @first_ok: ok to open a new device (used by ptmx)
  *
  *      Prepare a tty device. This may not be a "new" clean device but
  *      could also be an active device. The pty drivers require special
@@ -1381,11 +1386,18 @@ static int tty_reopen(struct tty_struct *tty)
  * relaxed for the (most common) case of reopening a tty.
  */
 
-struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
+struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx,
+                                                                int first_ok)
 {
         struct tty_struct *tty;
         int retval;
 
+        /* Check if pty master is being opened multiple times */
+        if (driver->subtype == PTY_TYPE_MASTER &&
+                (driver->flags & TTY_DRIVER_DEVPTS_MEM) && !first_ok) {
+                return ERR_PTR(-EIO);
+        }
+
         /*
          * First time open is complex, especially for PTY devices.
          * This code guarantees that either everything succeeds and the
@@ -1404,20 +1416,10 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
         }
         initialize_tty_struct(tty, driver, idx);
 
-        tty_lock(tty);
         retval = tty_driver_install_tty(driver, tty);
         if (retval < 0)
                 goto err_deinit_tty;
 
-        if (!tty->port)
-                tty->port = driver->ports[idx];
-
-        WARN_RATELIMIT(!tty->port,
-                        "%s: %s driver does not set tty->port. This will crash the kernel later. Fix the driver!\n",
-                        __func__, tty->driver->name);
-
-        tty->port->itty = tty;
-
         /*
          * Structures all installed ... call the ldisc open routines.
          * If we fail here just call release_tty to clean up.  No need
@@ -1426,11 +1428,9 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
         retval = tty_ldisc_setup(tty, tty->link);
         if (retval)
                 goto err_release_tty;
-        /* Return the tty locked so that it cannot vanish under the caller */
         return tty;
 
 err_deinit_tty:
-        tty_unlock(tty);
         deinitialize_tty_struct(tty);
         free_tty_struct(tty);
 err_module_put:
@@ -1439,7 +1439,6 @@ err_module_put:
 
         /* call the tty release_tty routine to clean out this slot */
 err_release_tty:
-        tty_unlock(tty);
         printk_ratelimited(KERN_INFO "tty_init_dev: ldisc open failed, "
                                  "clearing slot %d\n", idx);
         release_tty(tty, idx);
@@ -1450,25 +1449,22 @@ void tty_free_termios(struct tty_struct *tty)
 {
         struct ktermios *tp;
         int idx = tty->index;
-
-        /* If the port is going to reset then it has no termios to save */
-        if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS)
-                return;
-
-        /* Stash the termios data */
-        tp = tty->driver->termios[idx];
-        if (tp == NULL) {
-                tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
-                if (tp == NULL) {
-                        pr_warn("tty: no memory to save termios state.\n");
-                        return;
-                }
-                tty->driver->termios[idx] = tp;
+        /* Kill this flag and push into drivers for locking etc */
+        if (tty->driver->flags & TTY_DRIVER_RESET_TERMIOS) {
+                /* FIXME: Locking on ->termios array */
+                tp = tty->termios;
+                tty->driver->termios[idx] = NULL;
+                kfree(tp);
         }
-        *tp = tty->termios;
 }
 EXPORT_SYMBOL(tty_free_termios);
 
+void tty_shutdown(struct tty_struct *tty)
+{
+        tty_driver_remove_tty(tty->driver, tty);
+        tty_free_termios(tty);
+}
+EXPORT_SYMBOL(tty_shutdown);
 
 /**
  *      release_one_tty         -       release tty structure memory
@@ -1479,6 +1475,7 @@ EXPORT_SYMBOL(tty_free_termios);
  *      in use. It also gets called when setup of a device fails.
  *
  *      Locking:
+ *              tty_mutex - sometimes only
  *              takes the file list lock internally when working on the list
  *      of ttys that the driver keeps.
  *
@@ -1511,6 +1508,11 @@ static void queue_release_one_tty(struct kref *kref)
 {
         struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
 
+        if (tty->ops->shutdown)
+                tty->ops->shutdown(tty);
+        else
+                tty_shutdown(tty);
+
         /* The hangup queue is now free so we can reuse it rather than
            waste a chunk of memory for each port */
         INIT_WORK(&tty->hangup_work, release_one_tty);
@@ -1539,21 +1541,16 @@ EXPORT_SYMBOL(tty_kref_put);
  *      and decrement the refcount of the backing module.
  *
  *      Locking:
- *              tty_mutex
+ *              tty_mutex - sometimes only
  *              takes the file list lock internally when working on the list
  *      of ttys that the driver keeps.
+ *              FIXME: should we require tty_mutex is held here ??
  *
  */
 static void release_tty(struct tty_struct *tty, int idx)
 {
         /* This should always be true but check for the moment */
         WARN_ON(tty->index != idx);
-        WARN_ON(!mutex_is_locked(&tty_mutex));
-        if (tty->ops->shutdown)
-                tty->ops->shutdown(tty);
-        tty_free_termios(tty);
-        tty_driver_remove_tty(tty->driver, tty);
-        tty->port->itty = NULL;
 
         if (tty->link)
                 tty_kref_put(tty->link);
@@ -1561,49 +1558,6 @@ static void release_tty(struct tty_struct *tty, int idx)
 }
 
 /**
- *      tty_release_checks - check a tty before real release
- *      @tty: tty to check
- *      @o_tty: link of @tty (if any)
- *      @idx: index of the tty
- *
- *      Performs some paranoid checking before true release of the @tty.
- *      This is a no-op unless TTY_PARANOIA_CHECK is defined.
- */
-static int tty_release_checks(struct tty_struct *tty, struct tty_struct *o_tty,
-                int idx)
-{
-#ifdef TTY_PARANOIA_CHECK
-        if (idx < 0 || idx >= tty->driver->num) {
-                printk(KERN_DEBUG "%s: bad idx when trying to free (%s)\n",
-                                __func__, tty->name);
-                return -1;
-        }
-
-        /* not much to check for devpts */
-        if (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)
-                return 0;
-
-        if (tty != tty->driver->ttys[idx]) {
-                printk(KERN_DEBUG "%s: driver.table[%d] not tty for (%s)\n",
-                                __func__, idx, tty->name);
-                return -1;
-        }
-        if (tty->driver->other) {
-                if (o_tty != tty->driver->other->ttys[idx]) {
-                        printk(KERN_DEBUG "%s: other->table[%d] not o_tty for (%s)\n",
-                                        __func__, idx, tty->name);
-                        return -1;
-                }
-                if (o_tty->link != tty) {
-                        printk(KERN_DEBUG "%s: bad pty pointers\n", __func__);
-                        return -1;
-                }
-        }
-#endif
-        return 0;
-}
-
-/**
  *      tty_release             -       vfs callback for close
  *      @inode: inode of tty
  *      @filp: file pointer for handle to tty
@@ -1627,37 +1581,81 @@ int tty_release(struct inode *inode, struct file *filp)
         struct tty_struct *tty = file_tty(filp);
         struct tty_struct *o_tty;
         int     pty_master, tty_closing, o_tty_closing, do_sleep;
+        int     devpts;
         int     idx;
         char    buf[64];
 
-        if (tty_paranoia_check(tty, inode, __func__))
+        if (tty_paranoia_check(tty, inode, "tty_release_dev"))
                 return 0;
 
-        tty_lock(tty);
-        check_tty_count(tty, __func__);
+        tty_lock();
+        check_tty_count(tty, "tty_release_dev");
 
         __tty_fasync(-1, filp, 0);
 
         idx = tty->index;
         pty_master = (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
                       tty->driver->subtype == PTY_TYPE_MASTER);
-        /* Review: parallel close */
+        devpts = (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM) != 0;
         o_tty = tty->link;
 
-        if (tty_release_checks(tty, o_tty, idx)) {
-                tty_unlock(tty);
+#ifdef TTY_PARANOIA_CHECK
+        if (idx < 0 || idx >= tty->driver->num) {
+                printk(KERN_DEBUG "tty_release_dev: bad idx when trying to "
+                                  "free (%s)\n", tty->name);
+                tty_unlock();
                 return 0;
         }
+        if (!devpts) {
+                if (tty != tty->driver->ttys[idx]) {
+                        tty_unlock();
+                        printk(KERN_DEBUG "tty_release_dev: driver.table[%d] not tty "
+                               "for (%s)\n", idx, tty->name);
+                        return 0;
+                }
+                if (tty->termios != tty->driver->termios[idx]) {
+                        tty_unlock();
+                        printk(KERN_DEBUG "tty_release_dev: driver.termios[%d] not termios "
+                               "for (%s)\n",
+                               idx, tty->name);
+                        return 0;
+                }
+        }
+#endif
 
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "%s: %s (tty count=%d)...\n", __func__,
-                        tty_name(tty, buf), tty->count);
+        printk(KERN_DEBUG "tty_release_dev of %s (tty count=%d)...",
+               tty_name(tty, buf), tty->count);
 #endif
 
+#ifdef TTY_PARANOIA_CHECK
+        if (tty->driver->other &&
+             !(tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
+                if (o_tty != tty->driver->other->ttys[idx]) {
+                        tty_unlock();
+                        printk(KERN_DEBUG "tty_release_dev: other->table[%d] "
+                                          "not o_tty for (%s)\n",
+                               idx, tty->name);
+                        return 0 ;
+                }
+                if (o_tty->termios != tty->driver->other->termios[idx]) {
+                        tty_unlock();
+                        printk(KERN_DEBUG "tty_release_dev: other->termios[%d] "
+                                          "not o_termios for (%s)\n",
+                               idx, tty->name);
+                        return 0;
+                }
+                if (o_tty->link != tty) {
+                        tty_unlock();
+                        printk(KERN_DEBUG "tty_release_dev: bad pty pointers\n");
+                        return 0;
+                }
+        }
+#endif
         if (tty->ops->close)
                 tty->ops->close(tty, filp);
 
-        tty_unlock(tty);
+        tty_unlock();
         /*
          * Sanity check: if tty->count is going to zero, there shouldn't be
          * any waiters on tty->read_wait or tty->write_wait.  We test the
@@ -1680,7 +1678,7 @@ int tty_release(struct inode *inode, struct file *filp)
                    opens on /dev/tty */
 
                 mutex_lock(&tty_mutex);
-                tty_lock_pair(tty, o_tty);
+                tty_lock();
                 tty_closing = tty->count <= 1;
                 o_tty_closing = o_tty &&
                         (o_tty->count <= (pty_master ? 1 : 0));
@@ -1709,9 +1707,9 @@ int tty_release(struct inode *inode, struct file *filp)
                 if (!do_sleep)
                         break;
 
-                printk(KERN_WARNING "%s: %s: read/write wait queue active!\n",
-                                __func__, tty_name(tty, buf));
-                tty_unlock_pair(tty, o_tty);
+                printk(KERN_WARNING "tty_release_dev: %s: read/write wait queue "
+                                    "active!\n", tty_name(tty, buf));
+                tty_unlock();
                 mutex_unlock(&tty_mutex);
                 schedule();
         }
@@ -1720,20 +1718,18 @@ int tty_release(struct inode *inode, struct file *filp)
          * The closing flags are now consistent with the open counts on
          * both sides, and we've completed the last operation that could
          * block, so it's safe to proceed with closing.
-         *
-         * We must *not* drop the tty_mutex until we ensure that a further
-         * entry into tty_open can not pick up this tty.
          */
         if (pty_master) {
                 if (--o_tty->count < 0) {
-                        printk(KERN_WARNING "%s: bad pty slave count (%d) for %s\n",
-                                __func__, o_tty->count, tty_name(o_tty, buf));
+                        printk(KERN_WARNING "tty_release_dev: bad pty slave count "
+                                            "(%d) for %s\n",
+                               o_tty->count, tty_name(o_tty, buf));
                         o_tty->count = 0;
                 }
         }
         if (--tty->count < 0) {
-                printk(KERN_WARNING "%s: bad tty->count (%d) for %s\n",
-                                __func__, tty->count, tty_name(tty, buf));
+                printk(KERN_WARNING "tty_release_dev: bad tty->count (%d) for %s\n",
+                       tty->count, tty_name(tty, buf));
                 tty->count = 0;
         }
 
@@ -1774,16 +1770,15 @@ int tty_release(struct inode *inode, struct file *filp)
         }
 
         mutex_unlock(&tty_mutex);
-        tty_unlock_pair(tty, o_tty);
-        /* At this point the TTY_CLOSING flag should ensure a dead tty
-           cannot be re-opened by a racing opener */
 
         /* check whether both sides are closing ... */
-        if (!tty_closing || (o_tty && !o_tty_closing))
+        if (!tty_closing || (o_tty && !o_tty_closing)) {
+                tty_unlock();
                 return 0;
+        }
 
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "%s: freeing tty structure...\n", __func__);
+        printk(KERN_DEBUG "freeing tty structure...");
 #endif
         /*
          * Ask the line discipline code to release its structures
@@ -1791,99 +1786,18 @@ int tty_release(struct inode *inode, struct file *filp)
         tty_ldisc_release(tty, o_tty);
         /*
          * The release_tty function takes care of the details of clearing
-         * the slots and preserving the termios structure. The tty_unlock_pair
-         * should be safe as we keep a kref while the tty is locked (so the
-         * unlock never unlocks a freed tty).
+         * the slots and preserving the termios structure.
          */
-        mutex_lock(&tty_mutex);
         release_tty(tty, idx);
-        mutex_unlock(&tty_mutex);
 
+        /* Make this pty number available for reallocation */
+        if (devpts)
+                devpts_kill_index(inode, idx);
+        tty_unlock();
         return 0;
 }
 
 /**
- *      tty_open_current_tty - get tty of current task for open
- *      @device: device number
- *      @filp: file pointer to tty
- *      @return: tty of the current task iff @device is /dev/tty
- *
- *      We cannot return driver and index like for the other nodes because
- *      devpts will not work then. It expects inodes to be from devpts FS.
- *
- *      We need to move to returning a refcounted object from all the lookup
- *      paths including this one.
- */
-static struct tty_struct *tty_open_current_tty(dev_t device, struct file *filp)
-{
-        struct tty_struct *tty;
-
-        if (device != MKDEV(TTYAUX_MAJOR, 0))
-                return NULL;
-
-        tty = get_current_tty();
-        if (!tty)
-                return ERR_PTR(-ENXIO);
-
-        filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
-        /* noctty = 1; */
-        tty_kref_put(tty);
-        /* FIXME: we put a reference and return a TTY! */
-        /* This is only safe because the caller holds tty_mutex */
-        return tty;
-}
-
-/**
- *      tty_lookup_driver - lookup a tty driver for a given device file
- *      @device: device number
- *      @filp: file pointer to tty
- *      @noctty: set if the device should not become a controlling tty
- *      @index: index for the device in the @return driver
- *      @return: driver for this inode (with increased refcount)
- *
- *      If @return is not erroneous, the caller is responsible to decrement the
- *      refcount by tty_driver_kref_put.
- *
- *      Locking: tty_mutex protects get_tty_driver
- */
-static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
-                int *noctty, int *index)
-{
-        struct tty_driver *driver;
-
-        switch (device) {
-#ifdef CONFIG_VT
-        case MKDEV(TTY_MAJOR, 0): {
-                extern struct tty_driver *console_driver;
-                driver = tty_driver_kref_get(console_driver);
-                *index = fg_console;
-                *noctty = 1;
-                break;
-        }
-#endif
-        case MKDEV(TTYAUX_MAJOR, 1): {
-                struct tty_driver *console_driver = console_device(index);
-                if (console_driver) {
-                        driver = tty_driver_kref_get(console_driver);
-                        if (driver) {
-                                /* Don't let /dev/console block */
-                                filp->f_flags |= O_NONBLOCK;
-                                *noctty = 1;
-                                break;
-                        }
-                }
-                return ERR_PTR(-ENODEV);
-        }
-        default:
-                driver = get_tty_driver(device, index);
-                if (!driver)
-                        return ERR_PTR(-ENODEV);
-                break;
-        }
-        return driver;
-}
-
-/**
  *      tty_open                -       open a tty device
  *      @inode: inode of device file
  *      @filp: file pointer to tty
@@ -1899,19 +1813,16 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
  *      The termios state of a pty is reset on first open so that
  *      settings don't persist across reuse.
  *
- *      Locking: tty_mutex protects tty, tty_lookup_driver and tty_init_dev.
+ *      Locking: tty_mutex protects tty, get_tty_driver and tty_init_dev work.
  *               tty->count should protect the rest.
  *               ->siglock protects ->signal/->sighand
- *
- *      Note: the tty_unlock/lock cases without a ref are only safe due to
- *      tty_mutex
  */
 
 static int tty_open(struct inode *inode, struct file *filp)
 {
-        struct tty_struct *tty;
+        struct tty_struct *tty = NULL;
         int noctty, retval;
-        struct tty_driver *driver = NULL;
+        struct tty_driver *driver;
         int index;
         dev_t device = inode->i_rdev;
         unsigned saved_flags = filp->f_flags;
@@ -1928,52 +1839,94 @@ retry_open:
         retval = 0;
 
         mutex_lock(&tty_mutex);
-        /* This is protected by the tty_mutex */
-        tty = tty_open_current_tty(device, filp);
-        if (IS_ERR(tty)) {
-                retval = PTR_ERR(tty);
-                goto err_unlock;
-        } else if (!tty) {
-                driver = tty_lookup_driver(device, filp, &noctty, &index);
-                if (IS_ERR(driver)) {
-                        retval = PTR_ERR(driver);
-                        goto err_unlock;
+        tty_lock();
+
+        if (device == MKDEV(TTYAUX_MAJOR, 0)) {
+                tty = get_current_tty();
+                if (!tty) {
+                        tty_unlock();
+                        mutex_unlock(&tty_mutex);
+                        tty_free_file(filp);
+                        return -ENXIO;
                 }
+                driver = tty_driver_kref_get(tty->driver);
+                index = tty->index;
+                filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
+                /* noctty = 1; */
+                /* FIXME: Should we take a driver reference ? */
+                tty_kref_put(tty);
+                goto got_driver;
+        }
+#ifdef CONFIG_VT
+        if (device == MKDEV(TTY_MAJOR, 0)) {
+                extern struct tty_driver *console_driver;
+                driver = tty_driver_kref_get(console_driver);
+                index = fg_console;
+                noctty = 1;
+                goto got_driver;
+        }
+#endif
+        if (device == MKDEV(TTYAUX_MAJOR, 1)) {
+                struct tty_driver *console_driver = console_device(&index);
+                if (console_driver) {
+                        driver = tty_driver_kref_get(console_driver);
+                        if (driver) {
+                                /* Don't let /dev/console block */
+                                filp->f_flags |= O_NONBLOCK;
+                                noctty = 1;
+                                goto got_driver;
+                        }
+                }
+                tty_unlock();
+                mutex_unlock(&tty_mutex);
+                tty_free_file(filp);
+                return -ENODEV;
+        }
 
+        driver = get_tty_driver(device, &index);
+        if (!driver) {
+                tty_unlock();
+                mutex_unlock(&tty_mutex);
+                tty_free_file(filp);
+                return -ENODEV;
+        }
+got_driver:
+        if (!tty) {
                 /* check whether we're reopening an existing tty */
                 tty = tty_driver_lookup_tty(driver, inode, index);
+
                 if (IS_ERR(tty)) {
-                        retval = PTR_ERR(tty);
-                        goto err_unlock;
+                        tty_unlock();
+                        mutex_unlock(&tty_mutex);
+                        tty_driver_kref_put(driver);
+                        tty_free_file(filp);
+                        return PTR_ERR(tty);
                 }
         }
 
         if (tty) {
-                tty_lock(tty);
                 retval = tty_reopen(tty);
-                if (retval < 0) {
-                        tty_unlock(tty);
+                if (retval)
                         tty = ERR_PTR(retval);
-                }
-        } else  /* Returns with the tty_lock held for now */
-                tty = tty_init_dev(driver, index);
+        } else
+                tty = tty_init_dev(driver, index, 0);
 
         mutex_unlock(&tty_mutex);
-        if (driver)
-                tty_driver_kref_put(driver);
+        tty_driver_kref_put(driver);
         if (IS_ERR(tty)) {
-                retval = PTR_ERR(tty);
-                goto err_file;
+                tty_unlock();
+                tty_free_file(filp);
+                return PTR_ERR(tty);
         }
 
         tty_add_file(tty, filp);
 
-        check_tty_count(tty, __func__);
+        check_tty_count(tty, "tty_open");
         if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
             tty->driver->subtype == PTY_TYPE_MASTER)
                 noctty = 1;
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "%s: opening %s...\n", __func__, tty->name);
+        printk(KERN_DEBUG "opening %s...", tty->name);
 #endif
         if (tty->ops->open)
                 retval = tty->ops->open(tty, filp);
@@ -1987,10 +1940,10 @@ retry_open:
 
         if (retval) {
 #ifdef TTY_DEBUG_HANGUP
-                printk(KERN_DEBUG "%s: error %d in opening %s...\n", __func__,
-                                retval, tty->name);
+                printk(KERN_DEBUG "error %d in opening %s...", retval,
+                       tty->name);
 #endif
-                tty_unlock(tty); /* need to call tty_release without BTM */
+                tty_unlock(); /* need to call tty_release without BTM */
                 tty_release(inode, filp);
                 if (retval != -ERESTARTSYS)
                         return retval;
@@ -2002,15 +1955,17 @@ retry_open:
                 /*
                  * Need to reset f_op in case a hangup happened.
                  */
+                tty_lock();
                 if (filp->f_op == &hung_up_tty_fops)
                         filp->f_op = &tty_fops;
+                tty_unlock();
                 goto retry_open;
         }
-        tty_unlock(tty);
+        tty_unlock();
 
 
         mutex_lock(&tty_mutex);
-        tty_lock(tty);
+        tty_lock();
         spin_lock_irq(&current->sighand->siglock);
         if (!noctty &&
             current->signal->leader &&
@@ -2018,17 +1973,9 @@ retry_open:
             tty->session == NULL)
                 __proc_set_tty(current, tty);
         spin_unlock_irq(&current->sighand->siglock);
-        tty_unlock(tty);
+        tty_unlock();
         mutex_unlock(&tty_mutex);
         return 0;
-err_unlock:
-        mutex_unlock(&tty_mutex);
-        /* after locks to avoid deadlock */
-        if (!IS_ERR_OR_NULL(driver))
-                tty_driver_kref_put(driver);
-err_file:
-        tty_free_file(filp);
-        return retval;
 }
 
 
@@ -2104,13 +2051,10 @@ out:
 
 static int tty_fasync(int fd, struct file *filp, int on)
 {
-        struct tty_struct *tty = file_tty(filp);
         int retval;
-
-        tty_lock(tty);
+        tty_lock();
         retval = __tty_fasync(fd, filp, on);
-        tty_unlock(tty);
-
+        tty_unlock();
         return retval;
 }
 
@@ -2259,7 +2203,8 @@ static int tioccons(struct file *file)
                 spin_unlock(&redirect_lock);
                 return -EBUSY;
         }
-        redirect = get_file(file);
+        get_file(file);
+        redirect = file;
         spin_unlock(&redirect_lock);
         return 0;
 }
@@ -2687,11 +2632,6 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case TIOCNXCL:
                 clear_bit(TTY_EXCLUSIVE, &tty->flags);
                 return 0;
-        case TIOCGEXCL:
-        {
-                int excl = test_bit(TTY_EXCLUSIVE, &tty->flags);
-                return put_user(excl, (int __user *)p);
-        }
         case TIOCNOTTY:
                 if (current->signal->tty != tty)
                         return -ENOTTY;
@@ -2773,7 +2713,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (ld->ops->ioctl) {
                 retval = ld->ops->ioctl(tty, file, cmd, arg);
                 if (retval == -ENOIOCTLCMD)
-                        retval = -ENOTTY;
+                        retval = -EINVAL;
         }
         tty_ldisc_deref(ld);
         return retval;
@@ -2800,21 +2740,12 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
         ld = tty_ldisc_ref_wait(tty);
         if (ld->ops->compat_ioctl)
                 retval = ld->ops->compat_ioctl(tty, file, cmd, arg);
-        else
-                retval = n_tty_compat_ioctl_helper(tty, file, cmd, arg);
         tty_ldisc_deref(ld);
 
         return retval;
 }
 #endif
 
-static int this_tty(const void *t, struct file *file, unsigned fd)
-{
-        if (likely(file->f_op->read != tty_read))
-                return 0;
-        return file_tty(file) != t ? 0 : fd + 1;
-}
-        
 /*
  * This implements the "Secure Attention Key" ---  the idea is to
  * prevent trojan horses by killing all processes associated with this
@@ -2842,6 +2773,8 @@ void __do_SAK(struct tty_struct *tty)
         struct task_struct *g, *p;
         struct pid *session;
         int             i;
+        struct file     *filp;
+        struct fdtable *fdt;
 
         if (!tty)
                 return;
@@ -2871,12 +2804,27 @@ void __do_SAK(struct tty_struct *tty)
                         continue;
                 }
                 task_lock(p);
-                i = iterate_fd(p->files, 0, this_tty, tty);
-                if (i != 0) {
-                        printk(KERN_NOTICE "SAK: killed process %d"
-                            " (%s): fd#%d opened to the tty\n",
-                                    task_pid_nr(p), p->comm, i - 1);
-                        force_sig(SIGKILL, p);
+                if (p->files) {
+                        /*
+                         * We don't take a ref to the file, so we must
+                         * hold ->file_lock instead.
+                         */
+                        spin_lock(&p->files->file_lock);
+                        fdt = files_fdtable(p->files);
+                        for (i = 0; i < fdt->max_fds; i++) {
+                                filp = fcheck_files(p->files, i);
+                                if (!filp)
+                                        continue;
+                                if (filp->f_op->read == tty_read &&
+                                    file_tty(filp) == tty) {
+                                        printk(KERN_NOTICE "SAK: killed process %d"
+                                            " (%s): fd#%d opened to the tty\n",
+                                            task_pid_nr(p), p->comm, i);
+                                        force_sig(SIGKILL, p);
+                                        break;
+                                }
+                        }
+                        spin_unlock(&p->files->file_lock);
                 }
                 task_unlock(p);
         } while_each_thread(g, p);
@@ -2939,13 +2887,19 @@ void initialize_tty_struct(struct tty_struct *tty,
         tty_ldisc_init(tty);
         tty->session = NULL;
         tty->pgrp = NULL;
-        mutex_init(&tty->legacy_mutex);
+        tty->overrun_time = jiffies;
+        tty->buf.head = tty->buf.tail = NULL;
+        tty_buffer_init(tty);
         mutex_init(&tty->termios_mutex);
         mutex_init(&tty->ldisc_mutex);
         init_waitqueue_head(&tty->write_wait);
         init_waitqueue_head(&tty->read_wait);
         INIT_WORK(&tty->hangup_work, do_tty_hangup);
+        mutex_init(&tty->atomic_read_lock);
         mutex_init(&tty->atomic_write_lock);
+        mutex_init(&tty->output_lock);
+        mutex_init(&tty->echo_lock);
+        spin_lock_init(&tty->read_lock);
         spin_lock_init(&tty->ctrl_lock);
         INIT_LIST_HEAD(&tty->tty_files);
         INIT_WORK(&tty->SAK_work, do_SAK_work);
@@ -2993,15 +2947,6 @@ EXPORT_SYMBOL_GPL(tty_put_char);
 
 struct class *tty_class;
 
-static int tty_cdev_add(struct tty_driver *driver, dev_t dev,
-                unsigned int index, unsigned int count)
-{
-        /* init here, since reused cdevs cause crashes */
-        cdev_init(&driver->cdevs[index], &tty_fops);
-        driver->cdevs[index].owner = driver->owner;
-        return cdev_add(&driver->cdevs[index], dev, count);
-}
-
 /**
  *      tty_register_device - register a tty device
  *      @driver: the tty driver that describes the tty device
@@ -3024,46 +2969,8 @@ static int tty_cdev_add(struct tty_driver *driver, dev_t dev,
 struct device *tty_register_device(struct tty_driver *driver, unsigned index,
                                    struct device *device)
 {
-        return tty_register_device_attr(driver, index, device, NULL, NULL);
-}
-EXPORT_SYMBOL(tty_register_device);
-
-static void tty_device_create_release(struct device *dev)
-{
-        pr_debug("device: '%s': %s\n", dev_name(dev), __func__);
-        kfree(dev);
-}
-
-/**
- *      tty_register_device_attr - register a tty device
- *      @driver: the tty driver that describes the tty device
- *      @index: the index in the tty driver for this tty device
- *      @device: a struct device that is associated with this tty device.
- *              This field is optional, if there is no known struct device
- *              for this tty device it can be set to NULL safely.
- *      @drvdata: Driver data to be set to device.
- *      @attr_grp: Attribute group to be set on device.
- *
- *      Returns a pointer to the struct device for this tty device
- *      (or ERR_PTR(-EFOO) on error).
- *
- *      This call is required to be made to register an individual tty device
- *      if the tty driver's flags have the TTY_DRIVER_DYNAMIC_DEV bit set.  If
- *      that bit is not set, this function should not be called by a tty
- *      driver.
- *
- *      Locking: ??
- */
-struct device *tty_register_device_attr(struct tty_driver *driver,
-                                   unsigned index, struct device *device,
-                                   void *drvdata,
-                                   const struct attribute_group **attr_grp)
-{
         char name[64];
-        dev_t devt = MKDEV(driver->major, driver->minor_start) + index;
-        struct device *dev = NULL;
-        int retval = -ENODEV;
-        bool cdev = false;
+        dev_t dev = MKDEV(driver->major, driver->minor_start) + index;
 
         if (index >= driver->num) {
                 printk(KERN_ERR "Attempt to register invalid tty line number "
@@ -3076,40 +2983,9 @@ struct device *tty_register_device_attr(struct tty_driver *driver,
         else
                 tty_line_name(driver, index, name);
 
-        if (!(driver->flags & TTY_DRIVER_DYNAMIC_ALLOC)) {
-                retval = tty_cdev_add(driver, devt, index, 1);
-                if (retval)
-                        goto error;
-                cdev = true;
-        }
-
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev) {
-                retval = -ENOMEM;
-                goto error;
-        }
-
-        dev->devt = devt;
-        dev->class = tty_class;
-        dev->parent = device;
-        dev->release = tty_device_create_release;
-        dev_set_name(dev, "%s", name);
-        dev->groups = attr_grp;
-        dev_set_drvdata(dev, drvdata);
-
-        retval = device_register(dev);
-        if (retval)
-                goto error;
-
-        return dev;
-
-error:
-        put_device(dev);
-        if (cdev)
-                cdev_del(&driver->cdevs[index]);
-        return ERR_PTR(retval);
+        return device_create(tty_class, device, dev, NULL, name);
 }
-EXPORT_SYMBOL_GPL(tty_register_device_attr);
+EXPORT_SYMBOL(tty_register_device);
 
 /**
  *      tty_unregister_device - unregister a tty device
@@ -3126,82 +3002,30 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index)
 {
         device_destroy(tty_class,
                 MKDEV(driver->major, driver->minor_start) + index);
-        if (!(driver->flags & TTY_DRIVER_DYNAMIC_ALLOC))
-                cdev_del(&driver->cdevs[index]);
 }
 EXPORT_SYMBOL(tty_unregister_device);
 
-/**
- * __tty_alloc_driver -- allocate tty driver
- * @lines: count of lines this driver can handle at most
- * @owner: module which is repsonsible for this driver
- * @flags: some of TTY_DRIVER_* flags, will be set in driver->flags
- *
- * This should not be called directly, some of the provided macros should be
- * used instead. Use IS_ERR and friends on @retval.
- */
-struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner,
-                unsigned long flags)
+struct tty_driver *alloc_tty_driver(int lines)
 {
         struct tty_driver *driver;
-        unsigned int cdevs = 1;
-        int err;
-
-        if (!lines || (flags & TTY_DRIVER_UNNUMBERED_NODE && lines > 1))
-                return ERR_PTR(-EINVAL);
 
         driver = kzalloc(sizeof(struct tty_driver), GFP_KERNEL);
-        if (!driver)
-                return ERR_PTR(-ENOMEM);
-
-        kref_init(&driver->kref);
-        driver->magic = TTY_DRIVER_MAGIC;
-        driver->num = lines;
-        driver->owner = owner;
-        driver->flags = flags;
-
-        if (!(flags & TTY_DRIVER_DEVPTS_MEM)) {
-                driver->ttys = kcalloc(lines, sizeof(*driver->ttys),
-                                GFP_KERNEL);
-                driver->termios = kcalloc(lines, sizeof(*driver->termios),
-                                GFP_KERNEL);
-                if (!driver->ttys || !driver->termios) {
-                        err = -ENOMEM;
-                        goto err_free_all;
-                }
-        }
-
-        if (!(flags & TTY_DRIVER_DYNAMIC_ALLOC)) {
-                driver->ports = kcalloc(lines, sizeof(*driver->ports),
-                                GFP_KERNEL);
-                if (!driver->ports) {
-                        err = -ENOMEM;
-                        goto err_free_all;
-                }
-                cdevs = lines;
-        }
-
-        driver->cdevs = kcalloc(cdevs, sizeof(*driver->cdevs), GFP_KERNEL);
-        if (!driver->cdevs) {
-                err = -ENOMEM;
-                goto err_free_all;
+        if (driver) {
+                kref_init(&driver->kref);
+                driver->magic = TTY_DRIVER_MAGIC;
+                driver->num = lines;
+                /* later we'll move allocation of tables here */
         }
-
         return driver;
-err_free_all:
-        kfree(driver->ports);
-        kfree(driver->ttys);
-        kfree(driver->termios);
-        kfree(driver);
-        return ERR_PTR(err);
 }
-EXPORT_SYMBOL(__tty_alloc_driver);
+EXPORT_SYMBOL(alloc_tty_driver);
 
 static void destruct_tty_driver(struct kref *kref)
 {
         struct tty_driver *driver = container_of(kref, struct tty_driver, kref);
         int i;
         struct ktermios *tp;
+        void *p;
 
         if (driver->flags & TTY_DRIVER_INSTALLED) {
                 /*
@@ -3218,14 +3042,13 @@ static void destruct_tty_driver(struct kref *kref)
                         if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV))
                                 tty_unregister_device(driver, i);
                 }
+                p = driver->ttys;
                 proc_tty_unregister_driver(driver);
-                if (driver->flags & TTY_DRIVER_DYNAMIC_ALLOC)
-                        cdev_del(&driver->cdevs[0]);
+                driver->ttys = NULL;
+                driver->termios = NULL;
+                kfree(p);
+                cdev_del(&driver->cdev);
         }
-        kfree(driver->cdevs);
-        kfree(driver->ports);
-        kfree(driver->termios);
-        kfree(driver->ttys);
         kfree(driver);
 }
 
@@ -3256,8 +3079,15 @@ int tty_register_driver(struct tty_driver *driver)
         int error;
         int i;
         dev_t dev;
+        void **p = NULL;
         struct device *d;
 
+        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) {
+                p = kzalloc(driver->num * 2 * sizeof(void *), GFP_KERNEL);
+                if (!p)
+                        return -ENOMEM;
+        }
+
         if (!driver->major) {
                 error = alloc_chrdev_region(&dev, driver->minor_start,
                                                 driver->num, driver->name);
@@ -3269,13 +3099,28 @@ int tty_register_driver(struct tty_driver *driver)
                 dev = MKDEV(driver->major, driver->minor_start);
                 error = register_chrdev_region(dev, driver->num, driver->name);
         }
-        if (error < 0)
-                goto err;
+        if (error < 0) {
+                kfree(p);
+                return error;
+        }
 
-        if (driver->flags & TTY_DRIVER_DYNAMIC_ALLOC) {
-                error = tty_cdev_add(driver, dev, 0, driver->num);
-                if (error)
-                        goto err_unreg_char;
+        if (p) {
+                driver->ttys = (struct tty_struct **)p;
+                driver->termios = (struct ktermios **)(p + driver->num);
+        } else {
+                driver->ttys = NULL;
+                driver->termios = NULL;
+        }
+
+        cdev_init(&driver->cdev, &tty_fops);
+        driver->cdev.owner = driver->owner;
+        error = cdev_add(&driver->cdev, dev, driver->num);
+        if (error) {
+                unregister_chrdev_region(dev, driver->num);
+                driver->ttys = NULL;
+                driver->termios = NULL;
+                kfree(p);
+                return error;
         }
 
         mutex_lock(&tty_mutex);
@@ -3287,7 +3132,7 @@ int tty_register_driver(struct tty_driver *driver)
                         d = tty_register_device(driver, i, NULL);
                         if (IS_ERR(d)) {
                                 error = PTR_ERR(d);
-                                goto err_unreg_devs;
+                                goto err;
                         }
                 }
         }
@@ -3295,7 +3140,7 @@ int tty_register_driver(struct tty_driver *driver)
         driver->flags |= TTY_DRIVER_INSTALLED;
         return 0;
 
-err_unreg_devs:
+err:
         for (i--; i >= 0; i--)
                 tty_unregister_device(driver, i);
 
@@ -3303,11 +3148,13 @@ err_unreg_devs:
         list_del(&driver->tty_drivers);
         mutex_unlock(&tty_mutex);
 
-err_unreg_char:
         unregister_chrdev_region(dev, driver->num);
-err:
+        driver->ttys = NULL;
+        driver->termios = NULL;
+        kfree(p);
         return error;
 }
+
 EXPORT_SYMBOL(tty_register_driver);
 
 /*
@@ -3418,7 +3265,7 @@ void __init console_init(void)
         }
 }
 
-static char *tty_devnode(struct device *dev, umode_t *mode)
+static char *tty_devnode(struct device *dev, mode_t *mode)
 {
         if (!mode)
                 return NULL;
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 8481b29d5b3..53f2442c609 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -19,10 +19,10 @@
 #include <linux/module.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
-#include <linux/compat.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 
 #undef TTY_DEBUG_WAIT_UNTIL_SENT
 
@@ -410,7 +410,7 @@ EXPORT_SYMBOL_GPL(tty_termios_encode_baud_rate);
 
 void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud)
 {
-        tty_termios_encode_baud_rate(&tty->termios, ibaud, obaud);
+        tty_termios_encode_baud_rate(tty->termios, ibaud, obaud);
 }
 EXPORT_SYMBOL_GPL(tty_encode_baud_rate);
 
@@ -427,7 +427,7 @@ EXPORT_SYMBOL_GPL(tty_encode_baud_rate);
 
 speed_t tty_get_baud_rate(struct tty_struct *tty)
 {
-        speed_t baud = tty_termios_baud_rate(&tty->termios);
+        speed_t baud = tty_termios_baud_rate(tty->termios);
 
         if (baud == 38400 && tty->alt_speed) {
                 if (!tty->warned) {
@@ -509,14 +509,14 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
         /* FIXME: we need to decide on some locking/ordering semantics
            for the set_termios notification eventually */
         mutex_lock(&tty->termios_mutex);
-        old_termios = tty->termios;
-        tty->termios = *new_termios;
-        unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked);
+        old_termios = *tty->termios;
+        *tty->termios = *new_termios;
+        unset_locked_termios(tty->termios, &old_termios, tty->termios_locked);
 
         /* See if packet mode change of state. */
         if (tty->link && tty->link->packet) {
                 int extproc = (old_termios.c_lflag & EXTPROC) |
-                                (tty->termios.c_lflag & EXTPROC);
+                                (tty->termios->c_lflag & EXTPROC);
                 int old_flow = ((old_termios.c_iflag & IXON) &&
                                 (old_termios.c_cc[VSTOP] == '\023') &&
                                 (old_termios.c_cc[VSTART] == '\021'));
@@ -542,7 +542,7 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
         if (tty->ops->set_termios)
                 (*tty->ops->set_termios)(tty, &old_termios);
         else
-                tty_termios_copy_hw(&tty->termios, &old_termios);
+                tty_termios_copy_hw(tty->termios, &old_termios);
 
         ld = tty_ldisc_ref(tty);
         if (ld != NULL) {
@@ -578,7 +578,7 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
                 return retval;
 
         mutex_lock(&tty->termios_mutex);
-        tmp_termios = tty->termios;
+        memcpy(&tmp_termios, tty->termios, sizeof(struct ktermios));
         mutex_unlock(&tty->termios_mutex);
 
         if (opt & TERMIOS_TERMIO) {
@@ -632,14 +632,14 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
 static void copy_termios(struct tty_struct *tty, struct ktermios *kterm)
 {
         mutex_lock(&tty->termios_mutex);
-        *kterm = tty->termios;
+        memcpy(kterm, tty->termios, sizeof(struct ktermios));
         mutex_unlock(&tty->termios_mutex);
 }
 
 static void copy_termios_locked(struct tty_struct *tty, struct ktermios *kterm)
 {
         mutex_lock(&tty->termios_mutex);
-        *kterm = tty->termios_locked;
+        memcpy(kterm, tty->termios_locked, sizeof(struct ktermios));
         mutex_unlock(&tty->termios_mutex);
 }
 
@@ -707,16 +707,16 @@ static int get_sgflags(struct tty_struct *tty)
 {
         int flags = 0;
 
-        if (!(tty->termios.c_lflag & ICANON)) {
-                if (tty->termios.c_lflag & ISIG)
+        if (!(tty->termios->c_lflag & ICANON)) {
+                if (tty->termios->c_lflag & ISIG)
                         flags |= 0x02;          /* cbreak */
                 else
                         flags |= 0x20;          /* raw */
         }
-        if (tty->termios.c_lflag & ECHO)
+        if (tty->termios->c_lflag & ECHO)
                 flags |= 0x08;                  /* echo */
-        if (tty->termios.c_oflag & OPOST)
-                if (tty->termios.c_oflag & ONLCR)
+        if (tty->termios->c_oflag & OPOST)
+                if (tty->termios->c_oflag & ONLCR)
                         flags |= 0x10;          /* crmod */
         return flags;
 }
@@ -726,10 +726,10 @@ static int get_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
         struct sgttyb tmp;
 
         mutex_lock(&tty->termios_mutex);
-        tmp.sg_ispeed = tty->termios.c_ispeed;
-        tmp.sg_ospeed = tty->termios.c_ospeed;
-        tmp.sg_erase = tty->termios.c_cc[VERASE];
-        tmp.sg_kill = tty->termios.c_cc[VKILL];
+        tmp.sg_ispeed = tty->termios->c_ispeed;
+        tmp.sg_ospeed = tty->termios->c_ospeed;
+        tmp.sg_erase = tty->termios->c_cc[VERASE];
+        tmp.sg_kill = tty->termios->c_cc[VKILL];
         tmp.sg_flags = get_sgflags(tty);
         mutex_unlock(&tty->termios_mutex);
 
@@ -787,7 +787,7 @@ static int set_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
                 return -EFAULT;
 
         mutex_lock(&tty->termios_mutex);
-        termios = tty->termios;
+        termios = *tty->termios;
         termios.c_cc[VERASE] = tmp.sg_erase;
         termios.c_cc[VKILL] = tmp.sg_kill;
         set_sgflags(&termios, tmp.sg_flags);
@@ -808,12 +808,12 @@ static int get_tchars(struct tty_struct *tty, struct tchars __user *tchars)
         struct tchars tmp;
 
         mutex_lock(&tty->termios_mutex);
-        tmp.t_intrc = tty->termios.c_cc[VINTR];
-        tmp.t_quitc = tty->termios.c_cc[VQUIT];
-        tmp.t_startc = tty->termios.c_cc[VSTART];
-        tmp.t_stopc = tty->termios.c_cc[VSTOP];
-        tmp.t_eofc = tty->termios.c_cc[VEOF];
-        tmp.t_brkc = tty->termios.c_cc[VEOL2];  /* what is brkc anyway? */
+        tmp.t_intrc = tty->termios->c_cc[VINTR];
+        tmp.t_quitc = tty->termios->c_cc[VQUIT];
+        tmp.t_startc = tty->termios->c_cc[VSTART];
+        tmp.t_stopc = tty->termios->c_cc[VSTOP];
+        tmp.t_eofc = tty->termios->c_cc[VEOF];
+        tmp.t_brkc = tty->termios->c_cc[VEOL2]; /* what is brkc anyway? */
         mutex_unlock(&tty->termios_mutex);
         return copy_to_user(tchars, &tmp, sizeof(tmp)) ? -EFAULT : 0;
 }
@@ -825,12 +825,12 @@ static int set_tchars(struct tty_struct *tty, struct tchars __user *tchars)
         if (copy_from_user(&tmp, tchars, sizeof(tmp)))
                 return -EFAULT;
         mutex_lock(&tty->termios_mutex);
-        tty->termios.c_cc[VINTR] = tmp.t_intrc;
-        tty->termios.c_cc[VQUIT] = tmp.t_quitc;
-        tty->termios.c_cc[VSTART] = tmp.t_startc;
-        tty->termios.c_cc[VSTOP] = tmp.t_stopc;
-        tty->termios.c_cc[VEOF] = tmp.t_eofc;
-        tty->termios.c_cc[VEOL2] = tmp.t_brkc;  /* what is brkc anyway? */
+        tty->termios->c_cc[VINTR] = tmp.t_intrc;
+        tty->termios->c_cc[VQUIT] = tmp.t_quitc;
+        tty->termios->c_cc[VSTART] = tmp.t_startc;
+        tty->termios->c_cc[VSTOP] = tmp.t_stopc;
+        tty->termios->c_cc[VEOF] = tmp.t_eofc;
+        tty->termios->c_cc[VEOL2] = tmp.t_brkc; /* what is brkc anyway? */
         mutex_unlock(&tty->termios_mutex);
         return 0;
 }
@@ -842,14 +842,14 @@ static int get_ltchars(struct tty_struct *tty, struct ltchars __user *ltchars)
         struct ltchars tmp;
 
         mutex_lock(&tty->termios_mutex);
-        tmp.t_suspc = tty->termios.c_cc[VSUSP];
+        tmp.t_suspc = tty->termios->c_cc[VSUSP];
         /* what is dsuspc anyway? */
-        tmp.t_dsuspc = tty->termios.c_cc[VSUSP];
-        tmp.t_rprntc = tty->termios.c_cc[VREPRINT];
+        tmp.t_dsuspc = tty->termios->c_cc[VSUSP];
+        tmp.t_rprntc = tty->termios->c_cc[VREPRINT];
         /* what is flushc anyway? */
-        tmp.t_flushc = tty->termios.c_cc[VEOL2];
-        tmp.t_werasc = tty->termios.c_cc[VWERASE];
-        tmp.t_lnextc = tty->termios.c_cc[VLNEXT];
+        tmp.t_flushc = tty->termios->c_cc[VEOL2];
+        tmp.t_werasc = tty->termios->c_cc[VWERASE];
+        tmp.t_lnextc = tty->termios->c_cc[VLNEXT];
         mutex_unlock(&tty->termios_mutex);
         return copy_to_user(ltchars, &tmp, sizeof(tmp)) ? -EFAULT : 0;
 }
@@ -862,14 +862,14 @@ static int set_ltchars(struct tty_struct *tty, struct ltchars __user *ltchars)
                 return -EFAULT;
 
         mutex_lock(&tty->termios_mutex);
-        tty->termios.c_cc[VSUSP] = tmp.t_suspc;
+        tty->termios->c_cc[VSUSP] = tmp.t_suspc;
         /* what is dsuspc anyway? */
-        tty->termios.c_cc[VEOL2] = tmp.t_dsuspc;
-        tty->termios.c_cc[VREPRINT] = tmp.t_rprntc;
+        tty->termios->c_cc[VEOL2] = tmp.t_dsuspc;
+        tty->termios->c_cc[VREPRINT] = tmp.t_rprntc;
         /* what is flushc anyway? */
-        tty->termios.c_cc[VEOL2] = tmp.t_flushc;
-        tty->termios.c_cc[VWERASE] = tmp.t_werasc;
-        tty->termios.c_cc[VLNEXT] = tmp.t_lnextc;
+        tty->termios->c_cc[VEOL2] = tmp.t_flushc;
+        tty->termios->c_cc[VWERASE] = tmp.t_werasc;
+        tty->termios->c_cc[VLNEXT] = tmp.t_lnextc;
         mutex_unlock(&tty->termios_mutex);
         return 0;
 }
@@ -920,12 +920,12 @@ static int tty_change_softcar(struct tty_struct *tty, int arg)
         struct ktermios old;
 
         mutex_lock(&tty->termios_mutex);
-        old = tty->termios;
-        tty->termios.c_cflag &= ~CLOCAL;
-        tty->termios.c_cflag |= bit;
+        old = *tty->termios;
+        tty->termios->c_cflag &= ~CLOCAL;
+        tty->termios->c_cflag |= bit;
         if (tty->ops->set_termios)
                 tty->ops->set_termios(tty, &old);
-        if ((tty->termios.c_cflag & CLOCAL) != bit)
+        if ((tty->termios->c_cflag & CLOCAL) != bit)
                 ret = -EINVAL;
         mutex_unlock(&tty->termios_mutex);
         return ret;
@@ -1031,7 +1031,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                                                (struct termios __user *) arg))
                         return -EFAULT;
                 mutex_lock(&real_tty->termios_mutex);
-                real_tty->termios_locked = kterm;
+                memcpy(real_tty->termios_locked, &kterm, sizeof(struct ktermios));
                 mutex_unlock(&real_tty->termios_mutex);
                 return 0;
 #else
@@ -1048,7 +1048,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                                                (struct termios __user *) arg))
                         return -EFAULT;
                 mutex_lock(&real_tty->termios_mutex);
-                real_tty->termios_locked = kterm;
+                memcpy(real_tty->termios_locked, &kterm, sizeof(struct ktermios));
                 mutex_unlock(&real_tty->termios_mutex);
                 return ret;
 #endif
@@ -1118,6 +1118,7 @@ EXPORT_SYMBOL_GPL(tty_perform_flush);
 int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
+        unsigned long flags;
         int retval;
 
         switch (cmd) {
@@ -1152,25 +1153,29 @@ int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
                 return 0;
         case TCFLSH:
                 return tty_perform_flush(tty, arg);
+        case TIOCPKT:
+        {
+                int pktmode;
+
+                if (tty->driver->type != TTY_DRIVER_TYPE_PTY ||
+                    tty->driver->subtype != PTY_TYPE_MASTER)
+                        return -ENOTTY;
+                if (get_user(pktmode, (int __user *) arg))
+                        return -EFAULT;
+                spin_lock_irqsave(&tty->ctrl_lock, flags);
+                if (pktmode) {
+                        if (!tty->packet) {
+                                tty->packet = 1;
+                                tty->link->ctrl_status = 0;
+                        }
+                } else
+                        tty->packet = 0;
+                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
+                return 0;
+        }
         default:
                 /* Try the mode commands */
                 return tty_mode_ioctl(tty, file, cmd, arg);
         }
 }
 EXPORT_SYMBOL(n_tty_ioctl_helper);
-
-#ifdef CONFIG_COMPAT
-long n_tty_compat_ioctl_helper(struct tty_struct *tty, struct file *file,
-                                        unsigned int cmd, unsigned long arg)
-{
-        switch (cmd) {
-        case TIOCGLCKTRMIOS:
-        case TIOCSLCKTRMIOS:
-                return tty_mode_ioctl(tty, file, cmd, (unsigned long) compat_ptr(arg));
-        default:
-                return -ENOIOCTLCMD;
-        }
-}
-EXPORT_SYMBOL(n_tty_compat_ioctl_helper);
-#endif
-
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index c5782294e53..a76c808afad 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -1,11 +1,19 @@
 #include <linux/types.h>
+#include <linux/major.h>
 #include <linux/errno.h>
-#include <linux/kmod.h>
+#include <linux/signal.h>
+#include <linux/fcntl.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/devpts_fs.h>
 #include <linux/file.h>
+#include <linux/console.h>
+#include <linux/timer.h>
+#include <linux/ctype.h>
+#include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -16,8 +24,18 @@
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <linux/seq_file.h>
+
 #include <linux/uaccess.h>
+#include <asm/system.h>
+
+#include <linux/kbd_kern.h>
+#include <linux/vt_kern.h>
+#include <linux/selection.h>
+
+#include <linux/kmod.h>
+#include <linux/nsproxy.h>
 #include <linux/ratelimit.h>
 
 /*
@@ -26,8 +44,9 @@
  *      callers who will do ldisc lookups and cannot sleep.
  */
 
-static DEFINE_RAW_SPINLOCK(tty_ldisc_lock);
+static DEFINE_SPINLOCK(tty_ldisc_lock);
 static DECLARE_WAIT_QUEUE_HEAD(tty_ldisc_wait);
+static DECLARE_WAIT_QUEUE_HEAD(tty_ldisc_idle);
 /* Line disc dispatch table */
 static struct tty_ldisc_ops *tty_ldiscs[NR_LDISCS];
 
@@ -49,22 +68,22 @@ static void put_ldisc(struct tty_ldisc *ld)
          * If this is the last user, free the ldisc, and
          * release the ldisc ops.
          *
-         * We really want an "atomic_dec_and_raw_lock_irqsave()",
+         * We really want an "atomic_dec_and_lock_irqsave()",
          * but we don't have it, so this does it by hand.
          */
-        raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
-        if (atomic_dec_and_test(&ld->users)) {
+        local_irq_save(flags);
+        if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
                 struct tty_ldisc_ops *ldo = ld->ops;
 
                 ldo->refcount--;
                 module_put(ldo->owner);
-                raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+                spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 
                 kfree(ld);
                 return;
         }
-        raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-        wake_up(&ld->wq_idle);
+        local_irq_restore(flags);
+        wake_up(&tty_ldisc_idle);
 }
 
 /**
@@ -88,11 +107,11 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
         if (disc < N_TTY || disc >= NR_LDISCS)
                 return -EINVAL;
 
-        raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+        spin_lock_irqsave(&tty_ldisc_lock, flags);
         tty_ldiscs[disc] = new_ldisc;
         new_ldisc->num = disc;
         new_ldisc->refcount = 0;
-        raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 
         return ret;
 }
@@ -118,12 +137,12 @@ int tty_unregister_ldisc(int disc)
         if (disc < N_TTY || disc >= NR_LDISCS)
                 return -EINVAL;
 
-        raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+        spin_lock_irqsave(&tty_ldisc_lock, flags);
         if (tty_ldiscs[disc]->refcount)
                 ret = -EBUSY;
         else
                 tty_ldiscs[disc] = NULL;
-        raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 
         return ret;
 }
@@ -134,7 +153,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
         unsigned long flags;
         struct tty_ldisc_ops *ldops, *ret;
 
-        raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+        spin_lock_irqsave(&tty_ldisc_lock, flags);
         ret = ERR_PTR(-EINVAL);
         ldops = tty_ldiscs[disc];
         if (ldops) {
@@ -144,7 +163,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
                         ret = ldops;
                 }
         }
-        raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
         return ret;
 }
 
@@ -152,10 +171,10 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
 {
         unsigned long flags;
 
-        raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+        spin_lock_irqsave(&tty_ldisc_lock, flags);
         ldops->refcount--;
         module_put(ldops->owner);
-        raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
 
 /**
@@ -199,8 +218,6 @@ static struct tty_ldisc *tty_ldisc_get(int disc)
 
         ld->ops = ldops;
         atomic_set(&ld->users, 1);
-        init_waitqueue_head(&ld->wq_idle);
-
         return ld;
 }
 
@@ -287,11 +304,11 @@ static struct tty_ldisc *tty_ldisc_try(struct tty_struct *tty)
         unsigned long flags;
         struct tty_ldisc *ld;
 
-        raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+        spin_lock_irqsave(&tty_ldisc_lock, flags);
         ld = NULL;
         if (test_bit(TTY_LDISC, &tty->flags))
                 ld = get_ldisc(tty->ldisc);
-        raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
         return ld;
 }
 
@@ -413,7 +430,7 @@ EXPORT_SYMBOL_GPL(tty_ldisc_flush);
 static void tty_set_termios_ldisc(struct tty_struct *tty, int num)
 {
         mutex_lock(&tty->termios_mutex);
-        tty->termios.c_line = num;
+        tty->termios->c_line = num;
         mutex_unlock(&tty->termios_mutex);
 }
 
@@ -434,6 +451,7 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)
         if (ld->ops->open) {
                 int ret;
                 /* BTM here locks versus a hangup event */
+                WARN_ON(!tty_locked());
                 ret = ld->ops->open(tty);
                 if (ret)
                         clear_bit(TTY_LDISC_OPEN, &tty->flags);
@@ -512,7 +530,7 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
 static int tty_ldisc_halt(struct tty_struct *tty)
 {
         clear_bit(TTY_LDISC, &tty->flags);
-        return cancel_work_sync(&tty->port->buf.work);
+        return cancel_work_sync(&tty->buf.work);
 }
 
 /**
@@ -523,9 +541,9 @@ static int tty_ldisc_halt(struct tty_struct *tty)
  */
 static void tty_ldisc_flush_works(struct tty_struct *tty)
 {
-        flush_work(&tty->hangup_work);
-        flush_work(&tty->SAK_work);
-        flush_work(&tty->port->buf.work);
+        flush_work_sync(&tty->hangup_work);
+        flush_work_sync(&tty->SAK_work);
+        flush_work_sync(&tty->buf.work);
 }
 
 /**
@@ -539,8 +557,10 @@ static void tty_ldisc_flush_works(struct tty_struct *tty)
 static int tty_ldisc_wait_idle(struct tty_struct *tty, long timeout)
 {
         long ret;
-        ret = wait_event_timeout(tty->ldisc->wq_idle,
+        ret = wait_event_timeout(tty_ldisc_idle,
                         atomic_read(&tty->ldisc->users) == 1, timeout);
+        if (ret < 0)
+                return ret;
         return ret > 0 ? 0 : -EBUSY;
 }
 
@@ -568,7 +588,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
         if (IS_ERR(new_ldisc))
                 return PTR_ERR(new_ldisc);
 
-        tty_lock(tty);
+        tty_lock();
         /*
          *      We need to look at the tty locking here for pty/tty pairs
          *      when both sides try to change in parallel.
@@ -582,12 +602,12 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
          */
 
         if (tty->ldisc->ops->num == ldisc) {
-                tty_unlock(tty);
+                tty_unlock();
                 tty_ldisc_put(new_ldisc);
                 return 0;
         }
 
-        tty_unlock(tty);
+        tty_unlock();
         /*
          *      Problem: What do we do if this blocks ?
          *      We could deadlock here
@@ -595,7 +615,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         tty_wait_until_sent(tty, 0);
 
-        tty_lock(tty);
+        tty_lock();
         mutex_lock(&tty->ldisc_mutex);
 
         /*
@@ -605,10 +625,10 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         while (test_bit(TTY_LDISC_CHANGING, &tty->flags)) {
                 mutex_unlock(&tty->ldisc_mutex);
-                tty_unlock(tty);
+                tty_unlock();
                 wait_event(tty_ldisc_wait,
                         test_bit(TTY_LDISC_CHANGING, &tty->flags) == 0);
-                tty_lock(tty);
+                tty_lock();
                 mutex_lock(&tty->ldisc_mutex);
         }
 
@@ -623,7 +643,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         o_ldisc = tty->ldisc;
 
-        tty_unlock(tty);
+        tty_unlock();
         /*
          *      Make sure we don't change while someone holds a
          *      reference to the line discipline. The TTY_LDISC bit
@@ -650,7 +670,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         retval = tty_ldisc_wait_idle(tty, 5 * HZ);
 
-        tty_lock(tty);
+        tty_lock();
         mutex_lock(&tty->ldisc_mutex);
 
         /* handle wait idle failure locked */
@@ -659,13 +679,13 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
                 goto enable;
         }
 
-        if (test_bit(TTY_HUPPING, &tty->flags)) {
+        if (test_bit(TTY_HUPPED, &tty->flags)) {
                 /* We were raced by the hangup method. It will have stomped
                    the ldisc data and closed the ldisc down */
                 clear_bit(TTY_LDISC_CHANGING, &tty->flags);
                 mutex_unlock(&tty->ldisc_mutex);
                 tty_ldisc_put(new_ldisc);
-                tty_unlock(tty);
+                tty_unlock();
                 return -EIO;
         }
 
@@ -704,11 +724,11 @@ enable:
         /* Restart the work queue in case no characters kick it off. Safe if
            already running */
         if (work)
-                schedule_work(&tty->port->buf.work);
+                schedule_work(&tty->buf.work);
         if (o_work)
-                schedule_work(&o_tty->port->buf.work);
+                schedule_work(&o_tty->buf.work);
         mutex_unlock(&tty->ldisc_mutex);
-        tty_unlock(tty);
+        tty_unlock();
         return retval;
 }
 
@@ -722,9 +742,9 @@ enable:
 static void tty_reset_termios(struct tty_struct *tty)
 {
         mutex_lock(&tty->termios_mutex);
-        tty->termios = tty->driver->init_termios;
-        tty->termios.c_ispeed = tty_termios_input_baud_rate(&tty->termios);
-        tty->termios.c_ospeed = tty_termios_baud_rate(&tty->termios);
+        *tty->termios = tty->driver->init_termios;
+        tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios);
+        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
         mutex_unlock(&tty->termios_mutex);
 }
 
@@ -816,11 +836,11 @@ void tty_ldisc_hangup(struct tty_struct *tty)
          * need to wait for another function taking the BTM
          */
         clear_bit(TTY_LDISC, &tty->flags);
-        tty_unlock(tty);
-        cancel_work_sync(&tty->port->buf.work);
+        tty_unlock();
+        cancel_work_sync(&tty->buf.work);
         mutex_unlock(&tty->ldisc_mutex);
 retry:
-        tty_lock(tty);
+        tty_lock();
         mutex_lock(&tty->ldisc_mutex);
 
         /* At this point we have a closed ldisc and we want to
@@ -831,7 +851,7 @@ retry:
                 if (atomic_read(&tty->ldisc->users) != 1) {
                         char cur_n[TASK_COMM_LEN], tty_n[64];
                         long timeout = 3 * HZ;
-                        tty_unlock(tty);
+                        tty_unlock();
 
                         while (tty_ldisc_wait_idle(tty, timeout) == -EBUSY) {
                                 timeout = MAX_SCHEDULE_TIMEOUT;
@@ -846,7 +866,7 @@ retry:
 
                 if (reset == 0) {
 
-                        if (!tty_ldisc_reinit(tty, tty->termios.c_line))
+                        if (!tty_ldisc_reinit(tty, tty->termios->c_line))
                                 err = tty_ldisc_open(tty, tty->ldisc);
                         else
                                 err = 1;
@@ -894,28 +914,6 @@ int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty)
         tty_ldisc_enable(tty);
         return 0;
 }
-
-static void tty_ldisc_kill(struct tty_struct *tty)
-{
-        /* There cannot be users from userspace now. But there still might be
-         * drivers holding a reference via tty_ldisc_ref. Do not steal them the
-         * ldisc until they are done. */
-        tty_ldisc_wait_idle(tty, MAX_SCHEDULE_TIMEOUT);
-
-        mutex_lock(&tty->ldisc_mutex);
-        /*
-         * Now kill off the ldisc
-         */
-        tty_ldisc_close(tty, tty->ldisc);
-        tty_ldisc_put(tty->ldisc);
-        /* Force an oops if we mess this up */
-        tty->ldisc = NULL;
-
-        /* Ensure the next open requests the N_TTY ldisc */
-        tty_set_termios_ldisc(tty, N_TTY);
-        mutex_unlock(&tty->ldisc_mutex);
-}
-
 /**
  *      tty_ldisc_release               -       release line discipline
  *      @tty: tty being shut down
@@ -934,21 +932,28 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
          * race with the set_ldisc code path.
          */
 
-        tty_lock_pair(tty, o_tty);
+        tty_unlock();
         tty_ldisc_halt(tty);
         tty_ldisc_flush_works(tty);
-        if (o_tty) {
-                tty_ldisc_halt(o_tty);
-                tty_ldisc_flush_works(o_tty);
-        }
+        tty_lock();
 
-        /* This will need doing differently if we need to lock */
-        tty_ldisc_kill(tty);
+        mutex_lock(&tty->ldisc_mutex);
+        /*
+         * Now kill off the ldisc
+         */
+        tty_ldisc_close(tty, tty->ldisc);
+        tty_ldisc_put(tty->ldisc);
+        /* Force an oops if we mess this up */
+        tty->ldisc = NULL;
 
+        /* Ensure the next open requests the N_TTY ldisc */
+        tty_set_termios_ldisc(tty, N_TTY);
+        mutex_unlock(&tty->ldisc_mutex);
+
+        /* This will need doing differently if we need to lock */
         if (o_tty)
-                tty_ldisc_kill(o_tty);
+                tty_ldisc_release(o_tty, NULL);
 
-        tty_unlock_pair(tty, o_tty);
         /* And the memory resources remaining (buffers, termios) will be
            disposed of when the kref hits zero */
 }
diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index 2e41abebbcb..3b2bb771944 100644
--- a/drivers/tty/tty_mutex.c
+++ b/drivers/tty/tty_mutex.c
@@ -4,70 +4,41 @@
 #include <linux/semaphore.h>
 #include <linux/sched.h>
 
-/* Legacy tty mutex glue */
-
-enum {
-        TTY_MUTEX_NORMAL,
-        TTY_MUTEX_NESTED,
-};
+/*
+ * The 'big tty mutex'
+ *
+ * This mutex is taken and released by tty_lock() and tty_unlock(),
+ * replacing the older big kernel lock.
+ * It can no longer be taken recursively, and does not get
+ * released implicitly while sleeping.
+ *
+ * Don't use in new code.
+ */
+static DEFINE_MUTEX(big_tty_mutex);
+struct task_struct *__big_tty_mutex_owner;
+EXPORT_SYMBOL_GPL(__big_tty_mutex_owner);
 
 /*
  * Getting the big tty mutex.
  */
-
-static void __lockfunc tty_lock_nested(struct tty_struct *tty,
-                                       unsigned int subclass)
+void __lockfunc tty_lock(void)
 {
-        if (tty->magic != TTY_MAGIC) {
-                pr_err("L Bad %p\n", tty);
-                WARN_ON(1);
-                return;
-        }
-        tty_kref_get(tty);
-        mutex_lock_nested(&tty->legacy_mutex, subclass);
-}
+        struct task_struct *task = current;
 
-void __lockfunc tty_lock(struct tty_struct *tty)
-{
-        return tty_lock_nested(tty, TTY_MUTEX_NORMAL);
+        WARN_ON(__big_tty_mutex_owner == task);
+
+        mutex_lock(&big_tty_mutex);
+        __big_tty_mutex_owner = task;
 }
 EXPORT_SYMBOL(tty_lock);
 
-void __lockfunc tty_unlock(struct tty_struct *tty)
+void __lockfunc tty_unlock(void)
 {
-        if (tty->magic != TTY_MAGIC) {
-                pr_err("U Bad %p\n", tty);
-                WARN_ON(1);
-                return;
-        }
-        mutex_unlock(&tty->legacy_mutex);
-        tty_kref_put(tty);
-}
-EXPORT_SYMBOL(tty_unlock);
+        struct task_struct *task = current;
 
-/*
- * Getting the big tty mutex for a pair of ttys with lock ordering
- * On a non pty/tty pair tty2 can be NULL which is just fine.
- */
-void __lockfunc tty_lock_pair(struct tty_struct *tty,
-                                        struct tty_struct *tty2)
-{
-        if (tty < tty2) {
-                tty_lock(tty);
-                tty_lock_nested(tty2, TTY_MUTEX_NESTED);
-        } else {
-                if (tty2 && tty2 != tty)
-                        tty_lock(tty2);
-                tty_lock_nested(tty, TTY_MUTEX_NESTED);
-        }
-}
-EXPORT_SYMBOL(tty_lock_pair);
+        WARN_ON(__big_tty_mutex_owner != task);
+        __big_tty_mutex_owner = NULL;
 
-void __lockfunc tty_unlock_pair(struct tty_struct *tty,
-                                                struct tty_struct *tty2)
-{
-        tty_unlock(tty);
-        if (tty2 && tty2 != tty)
-                tty_unlock(tty2);
+        mutex_unlock(&big_tty_mutex);
 }
-EXPORT_SYMBOL(tty_unlock_pair);
+EXPORT_SYMBOL(tty_unlock);
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index b7ff59d3db8..a4aaca0e014 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -21,7 +21,6 @@
 void tty_port_init(struct tty_port *port)
 {
         memset(port, 0, sizeof(*port));
-        tty_buffer_init(port);
         init_waitqueue_head(&port->open_wait);
         init_waitqueue_head(&port->close_wait);
         init_waitqueue_head(&port->delta_msr_wait);
@@ -34,70 +33,6 @@ void tty_port_init(struct tty_port *port)
 }
 EXPORT_SYMBOL(tty_port_init);
 
-/**
- * tty_port_link_device - link tty and tty_port
- * @port: tty_port of the device
- * @driver: tty_driver for this device
- * @index: index of the tty
- *
- * Provide the tty layer wit ha link from a tty (specified by @index) to a
- * tty_port (@port). Use this only if neither tty_port_register_device nor
- * tty_port_install is used in the driver. If used, this has to be called before
- * tty_register_driver.
- */
-void tty_port_link_device(struct tty_port *port,
-                struct tty_driver *driver, unsigned index)
-{
-        if (WARN_ON(index >= driver->num))
-                return;
-        driver->ports[index] = port;
-}
-EXPORT_SYMBOL_GPL(tty_port_link_device);
-
-/**
- * tty_port_register_device - register tty device
- * @port: tty_port of the device
- * @driver: tty_driver for this device
- * @index: index of the tty
- * @device: parent if exists, otherwise NULL
- *
- * It is the same as tty_register_device except the provided @port is linked to
- * a concrete tty specified by @index. Use this or tty_port_install (or both).
- * Call tty_port_link_device as a last resort.
- */
-struct device *tty_port_register_device(struct tty_port *port,
-                struct tty_driver *driver, unsigned index,
-                struct device *device)
-{
-        tty_port_link_device(port, driver, index);
-        return tty_register_device(driver, index, device);
-}
-EXPORT_SYMBOL_GPL(tty_port_register_device);
-
-/**
- * tty_port_register_device_attr - register tty device
- * @port: tty_port of the device
- * @driver: tty_driver for this device
- * @index: index of the tty
- * @device: parent if exists, otherwise NULL
- * @drvdata: Driver data to be set to device.
- * @attr_grp: Attribute group to be set on device.
- *
- * It is the same as tty_register_device_attr except the provided @port is
- * linked to a concrete tty specified by @index. Use this or tty_port_install
- * (or both). Call tty_port_link_device as a last resort.
- */
-struct device *tty_port_register_device_attr(struct tty_port *port,
-                struct tty_driver *driver, unsigned index,
-                struct device *device, void *drvdata,
-                const struct attribute_group **attr_grp)
-{
-        tty_port_link_device(port, driver, index);
-        return tty_register_device_attr(driver, index, device, drvdata,
-                        attr_grp);
-}
-EXPORT_SYMBOL_GPL(tty_port_register_device_attr);
-
 int tty_port_alloc_xmit_buf(struct tty_port *port)
 {
         /* We may sleep in get_zeroed_page() */
@@ -122,27 +57,12 @@ void tty_port_free_xmit_buf(struct tty_port *port)
 }
 EXPORT_SYMBOL(tty_port_free_xmit_buf);
 
-/**
- * tty_port_destroy -- destroy inited port
- * @port: tty port to be doestroyed
- *
- * When a port was initialized using tty_port_init, one has to destroy the
- * port by this function. Either indirectly by using tty_port refcounting
- * (tty_port_put) or directly if refcounting is not used.
- */
-void tty_port_destroy(struct tty_port *port)
-{
-        tty_buffer_free_all(port);
-}
-EXPORT_SYMBOL(tty_port_destroy);
-
 static void tty_port_destructor(struct kref *kref)
 {
         struct tty_port *port = container_of(kref, struct tty_port, kref);
         if (port->xmit_buf)
                 free_page((unsigned long)port->xmit_buf);
-        tty_port_destroy(port);
-        if (port->ops && port->ops->destruct)
+        if (port->ops->destruct)
                 port->ops->destruct(port);
         else
                 kfree(port);
@@ -310,7 +230,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 
         /* block if port is in the process of being closed */
         if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                wait_event_interruptible_tty(tty, port->close_wait,
+                wait_event_interruptible_tty(port->close_wait,
                                 !(port->flags & ASYNC_CLOSING));
                 if (port->flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
@@ -326,7 +246,7 @@ int tty_port_block_til_ready(struct tty_port *port,
         }
         if (filp->f_flags & O_NONBLOCK) {
                 /* Indicate we are open */
-                if (tty->termios.c_cflag & CBAUD)
+                if (tty->termios->c_cflag & CBAUD)
                         tty_port_raise_dtr_rts(port);
                 port->flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
@@ -350,7 +270,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 
         while (1) {
                 /* Indicate we are open */
-                if (tty->termios.c_cflag & CBAUD)
+                if (tty->termios->c_cflag & CBAUD)
                         tty_port_raise_dtr_rts(port);
 
                 prepare_to_wait(&port->open_wait, &wait, TASK_INTERRUPTIBLE);
@@ -376,9 +296,9 @@ int tty_port_block_til_ready(struct tty_port *port,
                         retval = -ERESTARTSYS;
                         break;
                 }
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
         finish_wait(&port->open_wait, &wait);
 
@@ -432,7 +352,7 @@ int tty_port_close_start(struct tty_port *port,
                 tty_driver_flush_buffer(tty);
         if (test_bit(ASYNCB_INITIALIZED, &port->flags) &&
                         port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent_from_close(tty, port->closing_wait);
+                tty_wait_until_sent(tty, port->closing_wait);
         if (port->drain_delay) {
                 unsigned int bps = tty_get_baud_rate(tty);
                 long timeout;
@@ -449,7 +369,7 @@ int tty_port_close_start(struct tty_port *port,
 
         /* Drop DTR/RTS if HUPCL is set. This causes any attached modem to
            hang up the line */
-        if (tty->termios.c_cflag & HUPCL)
+        if (tty->termios->c_cflag & HUPCL)
                 tty_port_lower_dtr_rts(port);
 
         /* Don't call port->drop for the last reference. Callers will want
@@ -493,24 +413,6 @@ void tty_port_close(struct tty_port *port, struct tty_struct *tty,
 }
 EXPORT_SYMBOL(tty_port_close);
 
-/**
- * tty_port_install - generic tty->ops->install handler
- * @port: tty_port of the device
- * @driver: tty_driver for this device
- * @tty: tty to be installed
- *
- * It is the same as tty_standard_install except the provided @port is linked
- * to a concrete tty specified by @tty. Use this or tty_port_register_device
- * (or both). Call tty_port_link_device as a last resort.
- */
-int tty_port_install(struct tty_port *port, struct tty_driver *driver,
-                struct tty_struct *tty)
-{
-        tty->port = port;
-        return tty_standard_install(driver, tty);
-}
-EXPORT_SYMBOL_GPL(tty_port_install);
-
 int tty_port_open(struct tty_port *port, struct tty_struct *tty,
                                                         struct file *filp)
 {
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 248381b3072..45d3e80156d 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -19,7 +19,6 @@
 #include <linux/init.h>
 #include <linux/tty.h>
 #include <asm/uaccess.h>
-#include <linux/console.h>
 #include <linux/consolemap.h>
 #include <linux/vt_kern.h>
 
@@ -313,7 +312,6 @@ int con_set_trans_old(unsigned char __user * arg)
         if (!access_ok(VERIFY_READ, arg, E_TABSZ))
                 return -EFAULT;
 
-        console_lock();
         for (i=0; i<E_TABSZ ; i++) {
                 unsigned char uc;
                 __get_user(uc, arg+i);
@@ -321,7 +319,6 @@ int con_set_trans_old(unsigned char __user * arg)
         }
 
         update_user_maps();
-        console_unlock();
         return 0;
 }
 
@@ -333,13 +330,11 @@ int con_get_trans_old(unsigned char __user * arg)
         if (!access_ok(VERIFY_WRITE, arg, E_TABSZ))
                 return -EFAULT;
 
-        console_lock();
         for (i=0; i<E_TABSZ ; i++)
-        {
-                ch = conv_uni_to_pc(vc_cons[fg_console].d, p[i]);
-                __put_user((ch & ~0xff) ? 0 : ch, arg+i);
-        }
-        console_unlock();
+          {
+            ch = conv_uni_to_pc(vc_cons[fg_console].d, p[i]);
+            __put_user((ch & ~0xff) ? 0 : ch, arg+i);
+          }
         return 0;
 }
 
@@ -351,7 +346,6 @@ int con_set_trans_new(ushort __user * arg)
         if (!access_ok(VERIFY_READ, arg, E_TABSZ*sizeof(unsigned short)))
                 return -EFAULT;
 
-        console_lock();
         for (i=0; i<E_TABSZ ; i++) {
                 unsigned short us;
                 __get_user(us, arg+i);
@@ -359,7 +353,6 @@ int con_set_trans_new(ushort __user * arg)
         }
 
         update_user_maps();
-        console_unlock();
         return 0;
 }
 
@@ -371,10 +364,8 @@ int con_get_trans_new(ushort __user * arg)
         if (!access_ok(VERIFY_WRITE, arg, E_TABSZ*sizeof(unsigned short)))
                 return -EFAULT;
 
-        console_lock();
         for (i=0; i<E_TABSZ ; i++)
           __put_user(p[i], arg+i);
-        console_unlock();
         
         return 0;
 }
@@ -410,11 +401,12 @@ static void con_release_unimap(struct uni_pagedir *p)
                 kfree(p->inverse_translations[i]);
                 p->inverse_translations[i] = NULL;
         }
-        kfree(p->inverse_trans_unicode);
-        p->inverse_trans_unicode = NULL;
+        if (p->inverse_trans_unicode) {
+                kfree(p->inverse_trans_unicode);
+                p->inverse_trans_unicode = NULL;
+        }
 }
 
-/* Caller must hold the console lock */
 void con_free_unimap(struct vc_data *vc)
 {
         struct uni_pagedir *p;
@@ -495,21 +487,17 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
         return 0;
 }
 
-/* ui is a leftover from using a hashtable, but might be used again
-   Caller must hold the lock */
-static int con_do_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
+/* ui is a leftover from using a hashtable, but might be used again */
+int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
 {
         struct uni_pagedir *p, *q;
-
+  
         p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        if (p && p->readonly)
-                return -EIO;
-
+        if (p && p->readonly) return -EIO;
         if (!p || --p->refcount) {
                 q = kzalloc(sizeof(*p), GFP_KERNEL);
                 if (!q) {
-                        if (p)
-                                p->refcount++;
+                        if (p) p->refcount++;
                         return -ENOMEM;
                 }
                 q->refcount=1;
@@ -523,96 +511,43 @@ static int con_do_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
         return 0;
 }
 
-int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
-{
-        int ret;
-        console_lock();
-        ret = con_do_clear_unimap(vc, ui);
-        console_unlock();
-        return ret;
-}
-        
 int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
 {
         int err = 0, err1, i;
         struct uni_pagedir *p, *q;
 
-        console_lock();
-
-        /* Save original vc_unipagdir_loc in case we allocate a new one */
         p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-        if (p->readonly) {
-                console_unlock();
-                return -EIO;
-        }
+        if (p->readonly) return -EIO;
         
-        if (!ct) {
-                console_unlock();
-                return 0;
-        }
+        if (!ct) return 0;
         
         if (p->refcount > 1) {
                 int j, k;
                 u16 **p1, *p2, l;
                 
-                err1 = con_do_clear_unimap(vc, NULL);
-                if (err1) {
-                        console_unlock();
-                        return err1;
-                }
+                err1 = con_clear_unimap(vc, NULL);
+                if (err1) return err1;
                 
-                /*
-                 * Since refcount was > 1, con_clear_unimap() allocated a
-                 * a new uni_pagedir for this vc.  Re: p != q
-                 */
                 q = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-
-                /*
-                 * uni_pgdir is a 32*32*64 table with rows allocated
-                 * when its first entry is added.  The unicode value must
-                 * still be incremented for empty rows.  We are copying
-                 * entries from "p" (old) to "q" (new).
-                 */
-                l = 0;          /* unicode value */
-                for (i = 0; i < 32; i++)
+                for (i = 0, l = 0; i < 32; i++)
                 if ((p1 = p->uni_pgdir[i]))
                         for (j = 0; j < 32; j++)
-                        if ((p2 = p1[j])) {
+                        if ((p2 = p1[j]))
                                 for (k = 0; k < 64; k++, l++)
                                 if (p2[k] != 0xffff) {
-                                        /*
-                                         * Found one, copy entry for unicode
-                                         * l with fontpos value p2[k].
-                                         */
                                         err1 = con_insert_unipair(q, l, p2[k]);
                                         if (err1) {
                                                 p->refcount++;
                                                 *vc->vc_uni_pagedir_loc = (unsigned long)p;
                                                 con_release_unimap(q);
                                                 kfree(q);
-                                                console_unlock();
                                                 return err1; 
                                         }
-                                }
-                        } else {
-                                /* Account for row of 64 empty entries */
-                                l += 64;
-                        }
-                else
-                        /* Account for empty table */
-                        l += 32 * 64;
-
-                /*
-                 * Finished copying font table, set vc_uni_pagedir to new table
-                 */
-                p = q;
-        } else if (p == dflt) {
+                                }
+                p = q;
+        } else if (p == dflt)
                 dflt = NULL;
-        }
-
-        /*
-         * Insert user specified unicode pairs into new table.
-         */
+        
         while (ct--) {
                 unsigned short unicode, fontpos;
                 __get_user(unicode, &list->unicode);
@@ -622,33 +557,21 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
                 list++;
         }
         
-        /*
-         * Merge with fontmaps of any other virtual consoles.
-         */
-        if (con_unify_unimap(vc, p)) {
-                console_unlock();
+        if (con_unify_unimap(vc, p))
                 return err;
-        }
 
         for (i = 0; i <= 3; i++)
-                set_inverse_transl(vc, p, i); /* Update inverse translations */
+                set_inverse_transl(vc, p, i); /* Update all inverse translations */
         set_inverse_trans_unicode(vc, p);
-
-        console_unlock();
+  
         return err;
 }
 
-/**
- *      con_set_default_unimap  -       set default unicode map
- *      @vc: the console we are updating
- *
- *      Loads the unimap for the hardware font, as defined in uni_hash.tbl.
- *      The representation used was the most compact I could come up
- *      with.  This routine is executed at video setup, and when the
- *      PIO_FONTRESET ioctl is called. 
- *
- *      The caller must hold the console lock
- */
+/* Loads the unimap for the hardware font, as defined in uni_hash.tbl.
+   The representation used was the most compact I could come up
+   with.  This routine is executed at sys_setup time, and when the
+   PIO_FONTRESET ioctl is called. */
+
 int con_set_default_unimap(struct vc_data *vc)
 {
         int i, j, err = 0, err1;
@@ -659,10 +582,9 @@ int con_set_default_unimap(struct vc_data *vc)
                 p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
                 if (p == dflt)
                         return 0;
-
                 dflt->refcount++;
                 *vc->vc_uni_pagedir_loc = (unsigned long)dflt;
-                if (p && !--p->refcount) {
+                if (p && --p->refcount) {
                         con_release_unimap(p);
                         kfree(p);
                 }
@@ -671,9 +593,8 @@ int con_set_default_unimap(struct vc_data *vc)
         
         /* The default font is always 256 characters */
 
-        err = con_do_clear_unimap(vc, NULL);
-        if (err)
-                return err;
+        err = con_clear_unimap(vc, NULL);
+        if (err) return err;
     
         p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
         q = dfont_unitable;
@@ -698,13 +619,6 @@ int con_set_default_unimap(struct vc_data *vc)
 }
 EXPORT_SYMBOL(con_set_default_unimap);
 
-/**
- *      con_copy_unimap         -       copy unimap between two vts
- *      @dst_vc: target
- *      @src_vt: source
- *
- *      The caller must hold the console lock when invoking this method
- */
 int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc)
 {
         struct uni_pagedir *q;
@@ -719,23 +633,13 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc)
         *dst_vc->vc_uni_pagedir_loc = (long)q;
         return 0;
 }
-EXPORT_SYMBOL(con_copy_unimap);
 
-/**
- *      con_get_unimap          -       get the unicode map
- *      @vc: the console to read from
- *
- *      Read the console unicode data for this console. Called from the ioctl
- *      handlers.
- */
 int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct unipair __user *list)
 {
         int i, j, k, ect;
         u16 **p1, *p2;
         struct uni_pagedir *p;
 
-        console_lock();
-
         ect = 0;
         if (*vc->vc_uni_pagedir_loc) {
                 p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
@@ -755,19 +659,22 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni
                                 }
         }
         __put_user(ect, uct);
-        console_unlock();
         return ((ect <= ct) ? 0 : -ENOMEM);
 }
 
+void con_protect_unimap(struct vc_data *vc, int rdonly)
+{
+        struct uni_pagedir *p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
+        
+        if (p)
+                p->readonly = rdonly;
+}
+
 /*
  * Always use USER_MAP. These functions are used by the keyboard,
  * which shouldn't be affected by G0/G1 switching, etc.
  * If the user map still contains default values, i.e. the
  * direct-to-font mapping, then assume user is using Latin1.
- *
- * FIXME: at some point we need to decide if we want to lock the table
- * update element itself via the keyboard_event_lock for consistency with the
- * keyboard driver as well as the consoles
  */
 /* may be called during an interrupt */
 u32 conv_8bit_to_uni(unsigned char c)
@@ -835,3 +742,4 @@ console_map_init(void)
                         con_set_default_unimap(vc_cons[i].d);
 }
 
+EXPORT_SYMBOL(con_copy_unimap);
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 681765baef6..3761ccf0f34 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -33,6 +33,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/irq.h>
 
 #include <linux/kbd_kern.h>
 #include <linux/kbd_diacr.h>
@@ -41,9 +42,6 @@
 #include <linux/reboot.h>
 #include <linux/notifier.h>
 #include <linux/jiffies.h>
-#include <linux/uaccess.h>
-
-#include <asm/irq_regs.h>
 
 extern void ctrl_alt_del(void);
 
@@ -53,17 +51,23 @@ extern void ctrl_alt_del(void);
 
 #define KBD_DEFMODE ((1 << VC_REPEAT) | (1 << VC_META))
 
-#if defined(CONFIG_X86) || defined(CONFIG_PARISC)
-#include <asm/kbdleds.h>
+/*
+ * Some laptops take the 789uiojklm,. keys as number pad when NumLock is on.
+ * This seems a good reason to start with NumLock off. On HIL keyboards
+ * of PARISC machines however there is no NumLock key and everyone expects the keypad
+ * to be used for numbers.
+ */
+
+#if defined(CONFIG_PARISC) && (defined(CONFIG_KEYBOARD_HIL) || defined(CONFIG_KEYBOARD_HIL_OLD))
+#define KBD_DEFLEDS (1 << VC_NUMLOCK)
 #else
-static inline int kbd_defleds(void)
-{
-        return 0;
-}
+#define KBD_DEFLEDS 0
 #endif
 
 #define KBD_DEFLOCK 0
 
+void compute_shiftstate(void);
+
 /*
  * Handler Tables.
  */
@@ -94,32 +98,37 @@ static fn_handler_fn *fn_handler[] = { FN_HANDLERS };
  * Variables exported for vt_ioctl.c
  */
 
+/* maximum values each key_handler can handle */
+const int max_vals[] = {
+        255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
+        NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
+        255, NR_LOCK - 1, 255, NR_BRL - 1
+};
+
+const int NR_TYPES = ARRAY_SIZE(max_vals);
+
+struct kbd_struct kbd_table[MAX_NR_CONSOLES];
+EXPORT_SYMBOL_GPL(kbd_table);
+static struct kbd_struct *kbd = kbd_table;
+
 struct vt_spawn_console vt_spawn_con = {
         .lock = __SPIN_LOCK_UNLOCKED(vt_spawn_con.lock),
         .pid  = NULL,
         .sig  = 0,
 };
 
-
 /*
- * Internal Data.
+ * Variables exported for vt.c
  */
 
-static struct kbd_struct kbd_table[MAX_NR_CONSOLES];
-static struct kbd_struct *kbd = kbd_table;
+int shift_state = 0;
 
-/* maximum values each key_handler can handle */
-static const int max_vals[] = {
-        255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
-        NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
-        255, NR_LOCK - 1, 255, NR_BRL - 1
-};
-
-static const int NR_TYPES = ARRAY_SIZE(max_vals);
+/*
+ * Internal Data.
+ */
 
 static struct input_handler kbd_handler;
 static DEFINE_SPINLOCK(kbd_event_lock);
-static DEFINE_SPINLOCK(led_lock);
 static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)];  /* keyboard key bitmap */
 static unsigned char shift_down[NR_SHIFT];              /* shift state counters.. */
 static bool dead_key_next;
@@ -127,8 +136,6 @@ static int npadch = -1;					/* -1 or number assembled on pad */
 static unsigned int diacr;
 static char rep;                                        /* flag telling character repeat */
 
-static int shift_state = 0;
-
 static unsigned char ledstate = 0xff;                   /* undefined */
 static unsigned char ledioctl;
 
@@ -179,7 +186,7 @@ static int getkeycode_helper(struct input_handle *handle, void *data)
         return d->error == 0; /* stop as soon as we successfully get one */
 }
 
-static int getkeycode(unsigned int scancode)
+int getkeycode(unsigned int scancode)
 {
         struct getset_keycode_data d = {
                 .ke     = {
@@ -206,7 +213,7 @@ static int setkeycode_helper(struct input_handle *handle, void *data)
         return d->error == 0; /* stop as soon as we successfully set one */
 }
 
-static int setkeycode(unsigned int scancode, unsigned int keycode)
+int setkeycode(unsigned int scancode, unsigned int keycode)
 {
         struct getset_keycode_data d = {
                 .ke     = {
@@ -311,7 +318,7 @@ static void put_queue(struct vc_data *vc, int ch)
 
         if (tty) {
                 tty_insert_flip_char(tty, ch, 0);
-                tty_schedule_flip(tty);
+                con_schedule_flip(tty);
         }
 }
 
@@ -326,7 +333,7 @@ static void puts_queue(struct vc_data *vc, char *cp)
                 tty_insert_flip_char(tty, *cp, 0);
                 cp++;
         }
-        tty_schedule_flip(tty);
+        con_schedule_flip(tty);
 }
 
 static void applkey(struct vc_data *vc, int key, char mode)
@@ -374,11 +381,9 @@ static void to_utf8(struct vc_data *vc, uint c)
 /*
  * Called after returning from RAW mode or when changing consoles - recompute
  * shift_down[] and shift_state from key_down[] maybe called when keymap is
- * undefined, so that shiftkey release is seen. The caller must hold the
- * kbd_event_lock.
+ * undefined, so that shiftkey release is seen
  */
-
-static void do_compute_shiftstate(void)
+void compute_shiftstate(void)
 {
         unsigned int i, j, k, sym, val;
 
@@ -411,15 +416,6 @@ static void do_compute_shiftstate(void)
         }
 }
 
-/* We still have to export this method to vt.c */
-void compute_shiftstate(void)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        do_compute_shiftstate();
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-}
-
 /*
  * We have a combining character DIACR here, followed by the character CH.
  * If the combination occurs in the table, return the corresponding value.
@@ -587,7 +583,7 @@ static void fn_send_intr(struct vc_data *vc)
         if (!tty)
                 return;
         tty_insert_flip_char(tty, 0, TTY_BREAK);
-        tty_schedule_flip(tty);
+        con_schedule_flip(tty);
 }
 
 static void fn_scroll_forw(struct vc_data *vc)
@@ -639,7 +635,7 @@ static void fn_SAK(struct vc_data *vc)
 
 static void fn_null(struct vc_data *vc)
 {
-        do_compute_shiftstate();
+        compute_shiftstate();
 }
 
 /*
@@ -985,15 +981,13 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
  * or (ii) whatever pattern of lights people want to show using KDSETLED,
  * or (iii) specified bits of specified words in kernel memory.
  */
-static unsigned char getledstate(void)
+unsigned char getledstate(void)
 {
         return ledstate;
 }
 
 void setledstate(struct kbd_struct *kbd, unsigned int led)
 {
-        unsigned long flags;
-        spin_lock_irqsave(&led_lock, flags);
         if (!(led & ~7)) {
                 ledioctl = led;
                 kbd->ledmode = LED_SHOW_IOCTL;
@@ -1001,7 +995,6 @@ void setledstate(struct kbd_struct *kbd, unsigned int led)
                 kbd->ledmode = LED_SHOW_FLAGS;
 
         set_leds();
-        spin_unlock_irqrestore(&led_lock, flags);
 }
 
 static inline unsigned char getleds(void)
@@ -1041,96 +1034,16 @@ static int kbd_update_leds_helper(struct input_handle *handle, void *data)
         return 0;
 }
 
-/**
- *      vt_get_leds     -       helper for braille console
- *      @console: console to read
- *      @flag: flag we want to check
- *
- *      Check the status of a keyboard led flag and report it back
- */
-int vt_get_leds(int console, int flag)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        int ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&led_lock, flags);
-        ret = vc_kbd_led(kbd, flag);
-        spin_unlock_irqrestore(&led_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(vt_get_leds);
-
-/**
- *      vt_set_led_state        -       set LED state of a console
- *      @console: console to set
- *      @leds: LED bits
- *
- *      Set the LEDs on a console. This is a wrapper for the VT layer
- *      so that we can keep kbd knowledge internal
- */
-void vt_set_led_state(int console, int leds)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        setledstate(kbd, leds);
-}
-
-/**
- *      vt_kbd_con_start        -       Keyboard side of console start
- *      @console: console
- *
- *      Handle console start. This is a wrapper for the VT layer
- *      so that we can keep kbd knowledge internal
- *
- *      FIXME: We eventually need to hold the kbd lock here to protect
- *      the LED updating. We can't do it yet because fn_hold calls stop_tty
- *      and start_tty under the kbd_event_lock, while normal tty paths
- *      don't hold the lock. We probably need to split out an LED lock
- *      but not during an -rc release!
- */
-void vt_kbd_con_start(int console)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-        spin_lock_irqsave(&led_lock, flags);
-        clr_vc_kbd_led(kbd, VC_SCROLLOCK);
-        set_leds();
-        spin_unlock_irqrestore(&led_lock, flags);
-}
-
-/**
- *      vt_kbd_con_stop         -       Keyboard side of console stop
- *      @console: console
- *
- *      Handle console stop. This is a wrapper for the VT layer
- *      so that we can keep kbd knowledge internal
- */
-void vt_kbd_con_stop(int console)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-        spin_lock_irqsave(&led_lock, flags);
-        set_vc_kbd_led(kbd, VC_SCROLLOCK);
-        set_leds();
-        spin_unlock_irqrestore(&led_lock, flags);
-}
-
 /*
  * This is the tasklet that updates LED state on all keyboards
  * attached to the box. The reason we use tasklet is that we
  * need to handle the scenario when keyboard handler is not
- * registered yet but we already getting updates from the VT to
+ * registered yet but we already getting updates form VT to
  * update led state.
  */
 static void kbd_bh(unsigned long dummy)
 {
-        unsigned char leds;
-        unsigned long flags;
-        
-        spin_lock_irqsave(&led_lock, flags);
-        leds = getleds();
-        spin_unlock_irqrestore(&led_lock, flags);
+        unsigned char leds = getleds();
 
         if (leds != ledstate) {
                 input_handler_for_each_handle(&kbd_handler, &leds,
@@ -1340,7 +1253,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
         if (rc == NOTIFY_STOP || !key_map) {
                 atomic_notifier_call_chain(&keyboard_notifier_list,
                                            KBD_UNBOUND_KEYCODE, &param);
-                do_compute_shiftstate();
+                compute_shiftstate();
                 kbd->slockstate = 0;
                 return;
         }
@@ -1490,14 +1403,14 @@ static void kbd_start(struct input_handle *handle)
 
 static const struct input_device_id kbd_ids[] = {
         {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT_MASK(EV_KEY) },
-        },
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
+                .evbit = { BIT_MASK(EV_KEY) },
+        },
 
         {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT_MASK(EV_SND) },
-        },
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
+                .evbit = { BIT_MASK(EV_SND) },
+        },
 
         { },    /* Terminating entry */
 };
@@ -1519,9 +1432,9 @@ int __init kbd_init(void)
         int i;
         int error;
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                kbd_table[i].ledflagstate = kbd_defleds();
-                kbd_table[i].default_ledflagstate = kbd_defleds();
+        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+                kbd_table[i].ledflagstate = KBD_DEFLEDS;
+                kbd_table[i].default_ledflagstate = KBD_DEFLEDS;
                 kbd_table[i].ledmode = LED_SHOW_FLAGS;
                 kbd_table[i].lockstate = KBD_DEFLOCK;
                 kbd_table[i].slockstate = 0;
@@ -1538,660 +1451,3 @@ int __init kbd_init(void)
 
         return 0;
 }
-
-/* Ioctl support code */
-
-/**
- *      vt_do_diacrit           -       diacritical table updates
- *      @cmd: ioctl request
- *      @up: pointer to user data for ioctl
- *      @perm: permissions check computed by caller
- *
- *      Update the diacritical tables atomically and safely. Lock them
- *      against simultaneous keypresses
- */
-int vt_do_diacrit(unsigned int cmd, void __user *up, int perm)
-{
-        struct kbdiacrs __user *a = up;
-        unsigned long flags;
-        int asize;
-        int ret = 0;
-
-        switch (cmd) {
-        case KDGKBDIACR:
-        {
-                struct kbdiacr *diacr;
-                int i;
-
-                diacr = kmalloc(MAX_DIACR * sizeof(struct kbdiacr),
-                                                                GFP_KERNEL);
-                if (diacr == NULL)
-                        return -ENOMEM;
-
-                /* Lock the diacriticals table, make a copy and then
-                   copy it after we unlock */
-                spin_lock_irqsave(&kbd_event_lock, flags);
-
-                asize = accent_table_size;
-                for (i = 0; i < asize; i++) {
-                        diacr[i].diacr = conv_uni_to_8bit(
-                                                accent_table[i].diacr);
-                        diacr[i].base = conv_uni_to_8bit(
-                                                accent_table[i].base);
-                        diacr[i].result = conv_uni_to_8bit(
-                                                accent_table[i].result);
-                }
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-
-                if (put_user(asize, &a->kb_cnt))
-                        ret = -EFAULT;
-                else  if (copy_to_user(a->kbdiacr, diacr,
-                                asize * sizeof(struct kbdiacr)))
-                        ret = -EFAULT;
-                kfree(diacr);
-                return ret;
-        }
-        case KDGKBDIACRUC:
-        {
-                struct kbdiacrsuc __user *a = up;
-                void *buf;
-
-                buf = kmalloc(MAX_DIACR * sizeof(struct kbdiacruc),
-                                                                GFP_KERNEL);
-                if (buf == NULL)
-                        return -ENOMEM;
-
-                /* Lock the diacriticals table, make a copy and then
-                   copy it after we unlock */
-                spin_lock_irqsave(&kbd_event_lock, flags);
-
-                asize = accent_table_size;
-                memcpy(buf, accent_table, asize * sizeof(struct kbdiacruc));
-
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-
-                if (put_user(asize, &a->kb_cnt))
-                        ret = -EFAULT;
-                else if (copy_to_user(a->kbdiacruc, buf,
-                                asize*sizeof(struct kbdiacruc)))
-                        ret = -EFAULT;
-                kfree(buf);
-                return ret;
-        }
-
-        case KDSKBDIACR:
-        {
-                struct kbdiacrs __user *a = up;
-                struct kbdiacr *diacr = NULL;
-                unsigned int ct;
-                int i;
-
-                if (!perm)
-                        return -EPERM;
-                if (get_user(ct, &a->kb_cnt))
-                        return -EFAULT;
-                if (ct >= MAX_DIACR)
-                        return -EINVAL;
-
-                if (ct) {
-                        diacr = kmalloc(sizeof(struct kbdiacr) * ct,
-                                                                GFP_KERNEL);
-                        if (diacr == NULL)
-                                return -ENOMEM;
-
-                        if (copy_from_user(diacr, a->kbdiacr,
-                                        sizeof(struct kbdiacr) * ct)) {
-                                kfree(diacr);
-                                return -EFAULT;
-                        }
-                }
-
-                spin_lock_irqsave(&kbd_event_lock, flags);
-                accent_table_size = ct;
-                for (i = 0; i < ct; i++) {
-                        accent_table[i].diacr =
-                                        conv_8bit_to_uni(diacr[i].diacr);
-                        accent_table[i].base =
-                                        conv_8bit_to_uni(diacr[i].base);
-                        accent_table[i].result =
-                                        conv_8bit_to_uni(diacr[i].result);
-                }
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-                kfree(diacr);
-                return 0;
-        }
-
-        case KDSKBDIACRUC:
-        {
-                struct kbdiacrsuc __user *a = up;
-                unsigned int ct;
-                void *buf = NULL;
-
-                if (!perm)
-                        return -EPERM;
-
-                if (get_user(ct, &a->kb_cnt))
-                        return -EFAULT;
-
-                if (ct >= MAX_DIACR)
-                        return -EINVAL;
-
-                if (ct) {
-                        buf = kmalloc(ct * sizeof(struct kbdiacruc),
-                                                                GFP_KERNEL);
-                        if (buf == NULL)
-                                return -ENOMEM;
-
-                        if (copy_from_user(buf, a->kbdiacruc,
-                                        ct * sizeof(struct kbdiacruc))) {
-                                kfree(buf);
-                                return -EFAULT;
-                        }
-                } 
-                spin_lock_irqsave(&kbd_event_lock, flags);
-                if (ct)
-                        memcpy(accent_table, buf,
-                                        ct * sizeof(struct kbdiacruc));
-                accent_table_size = ct;
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-                kfree(buf);
-                return 0;
-        }
-        }
-        return ret;
-}
-
-/**
- *      vt_do_kdskbmode         -       set keyboard mode ioctl
- *      @console: the console to use
- *      @arg: the requested mode
- *
- *      Update the keyboard mode bits while holding the correct locks.
- *      Return 0 for success or an error code.
- */
-int vt_do_kdskbmode(int console, unsigned int arg)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        int ret = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        switch(arg) {
-        case K_RAW:
-                kbd->kbdmode = VC_RAW;
-                break;
-        case K_MEDIUMRAW:
-                kbd->kbdmode = VC_MEDIUMRAW;
-                break;
-        case K_XLATE:
-                kbd->kbdmode = VC_XLATE;
-                do_compute_shiftstate();
-                break;
-        case K_UNICODE:
-                kbd->kbdmode = VC_UNICODE;
-                do_compute_shiftstate();
-                break;
-        case K_OFF:
-                kbd->kbdmode = VC_OFF;
-                break;
-        default:
-                ret = -EINVAL;
-        }
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-        return ret;
-}
-
-/**
- *      vt_do_kdskbmeta         -       set keyboard meta state
- *      @console: the console to use
- *      @arg: the requested meta state
- *
- *      Update the keyboard meta bits while holding the correct locks.
- *      Return 0 for success or an error code.
- */
-int vt_do_kdskbmeta(int console, unsigned int arg)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        int ret = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        switch(arg) {
-        case K_METABIT:
-                clr_vc_kbd_mode(kbd, VC_META);
-                break;
-        case K_ESCPREFIX:
-                set_vc_kbd_mode(kbd, VC_META);
-                break;
-        default:
-                ret = -EINVAL;
-        }
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-        return ret;
-}
-
-int vt_do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc,
-                                                                int perm)
-{
-        struct kbkeycode tmp;
-        int kc = 0;
-
-        if (copy_from_user(&tmp, user_kbkc, sizeof(struct kbkeycode)))
-                return -EFAULT;
-        switch (cmd) {
-        case KDGETKEYCODE:
-                kc = getkeycode(tmp.scancode);
-                if (kc >= 0)
-                        kc = put_user(kc, &user_kbkc->keycode);
-                break;
-        case KDSETKEYCODE:
-                if (!perm)
-                        return -EPERM;
-                kc = setkeycode(tmp.scancode, tmp.keycode);
-                break;
-        }
-        return kc;
-}
-
-#define i (tmp.kb_index)
-#define s (tmp.kb_table)
-#define v (tmp.kb_value)
-
-int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
-                                                int console)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        struct kbentry tmp;
-        ushort *key_map, *new_map, val, ov;
-        unsigned long flags;
-
-        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
-                return -EFAULT;
-
-        if (!capable(CAP_SYS_TTY_CONFIG))
-                perm = 0;
-
-        switch (cmd) {
-        case KDGKBENT:
-                /* Ensure another thread doesn't free it under us */
-                spin_lock_irqsave(&kbd_event_lock, flags);
-                key_map = key_maps[s];
-                if (key_map) {
-                    val = U(key_map[i]);
-                    if (kbd->kbdmode != VC_UNICODE && KTYP(val) >= NR_TYPES)
-                        val = K_HOLE;
-                } else
-                    val = (i ? K_HOLE : K_NOSUCHMAP);
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-                return put_user(val, &user_kbe->kb_value);
-        case KDSKBENT:
-                if (!perm)
-                        return -EPERM;
-                if (!i && v == K_NOSUCHMAP) {
-                        spin_lock_irqsave(&kbd_event_lock, flags);
-                        /* deallocate map */
-                        key_map = key_maps[s];
-                        if (s && key_map) {
-                            key_maps[s] = NULL;
-                            if (key_map[0] == U(K_ALLOCATED)) {
-                                        kfree(key_map);
-                                        keymap_count--;
-                            }
-                        }
-                        spin_unlock_irqrestore(&kbd_event_lock, flags);
-                        break;
-                }
-
-                if (KTYP(v) < NR_TYPES) {
-                    if (KVAL(v) > max_vals[KTYP(v)])
-                                return -EINVAL;
-                } else
-                    if (kbd->kbdmode != VC_UNICODE)
-                                return -EINVAL;
-
-                /* ++Geert: non-PC keyboards may generate keycode zero */
-#if !defined(__mc68000__) && !defined(__powerpc__)
-                /* assignment to entry 0 only tests validity of args */
-                if (!i)
-                        break;
-#endif
-
-                new_map = kmalloc(sizeof(plain_map), GFP_KERNEL);
-                if (!new_map)
-                        return -ENOMEM;
-                spin_lock_irqsave(&kbd_event_lock, flags);
-                key_map = key_maps[s];
-                if (key_map == NULL) {
-                        int j;
-
-                        if (keymap_count >= MAX_NR_OF_USER_KEYMAPS &&
-                            !capable(CAP_SYS_RESOURCE)) {
-                                spin_unlock_irqrestore(&kbd_event_lock, flags);
-                                kfree(new_map);
-                                return -EPERM;
-                        }
-                        key_maps[s] = new_map;
-                        key_map = new_map;
-                        key_map[0] = U(K_ALLOCATED);
-                        for (j = 1; j < NR_KEYS; j++)
-                                key_map[j] = U(K_HOLE);
-                        keymap_count++;
-                } else
-                        kfree(new_map);
-
-                ov = U(key_map[i]);
-                if (v == ov)
-                        goto out;
-                /*
-                 * Attention Key.
-                 */
-                if (((ov == K_SAK) || (v == K_SAK)) && !capable(CAP_SYS_ADMIN)) {
-                        spin_unlock_irqrestore(&kbd_event_lock, flags);
-                        return -EPERM;
-                }
-                key_map[i] = U(v);
-                if (!s && (KTYP(ov) == KT_SHIFT || KTYP(v) == KT_SHIFT))
-                        do_compute_shiftstate();
-out:
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-                break;
-        }
-        return 0;
-}
-#undef i
-#undef s
-#undef v
-
-/* FIXME: This one needs untangling and locking */
-int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
-{
-        struct kbsentry *kbs;
-        char *p;
-        u_char *q;
-        u_char __user *up;
-        int sz;
-        int delta;
-        char *first_free, *fj, *fnw;
-        int i, j, k;
-        int ret;
-
-        if (!capable(CAP_SYS_TTY_CONFIG))
-                perm = 0;
-
-        kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
-        if (!kbs) {
-                ret = -ENOMEM;
-                goto reterr;
-        }
-
-        /* we mostly copy too much here (512bytes), but who cares ;) */
-        if (copy_from_user(kbs, user_kdgkb, sizeof(struct kbsentry))) {
-                ret = -EFAULT;
-                goto reterr;
-        }
-        kbs->kb_string[sizeof(kbs->kb_string)-1] = '\0';
-        i = kbs->kb_func;
-
-        switch (cmd) {
-        case KDGKBSENT:
-                sz = sizeof(kbs->kb_string) - 1; /* sz should have been
-                                                  a struct member */
-                up = user_kdgkb->kb_string;
-                p = func_table[i];
-                if(p)
-                        for ( ; *p && sz; p++, sz--)
-                                if (put_user(*p, up++)) {
-                                        ret = -EFAULT;
-                                        goto reterr;
-                                }
-                if (put_user('\0', up)) {
-                        ret = -EFAULT;
-                        goto reterr;
-                }
-                kfree(kbs);
-                return ((p && *p) ? -EOVERFLOW : 0);
-        case KDSKBSENT:
-                if (!perm) {
-                        ret = -EPERM;
-                        goto reterr;
-                }
-
-                q = func_table[i];
-                first_free = funcbufptr + (funcbufsize - funcbufleft);
-                for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
-                        ;
-                if (j < MAX_NR_FUNC)
-                        fj = func_table[j];
-                else
-                        fj = first_free;
-
-                delta = (q ? -strlen(q) : 1) + strlen(kbs->kb_string);
-                if (delta <= funcbufleft) {     /* it fits in current buf */
-                    if (j < MAX_NR_FUNC) {
-                        memmove(fj + delta, fj, first_free - fj);
-                        for (k = j; k < MAX_NR_FUNC; k++)
-                            if (func_table[k])
-                                func_table[k] += delta;
-                    }
-                    if (!q)
-                      func_table[i] = fj;
-                    funcbufleft -= delta;
-                } else {                        /* allocate a larger buffer */
-                    sz = 256;
-                    while (sz < funcbufsize - funcbufleft + delta)
-                      sz <<= 1;
-                    fnw = kmalloc(sz, GFP_KERNEL);
-                    if(!fnw) {
-                      ret = -ENOMEM;
-                      goto reterr;
-                    }
-
-                    if (!q)
-                      func_table[i] = fj;
-                    if (fj > funcbufptr)
-                        memmove(fnw, funcbufptr, fj - funcbufptr);
-                    for (k = 0; k < j; k++)
-                      if (func_table[k])
-                        func_table[k] = fnw + (func_table[k] - funcbufptr);
-
-                    if (first_free > fj) {
-                        memmove(fnw + (fj - funcbufptr) + delta, fj, first_free - fj);
-                        for (k = j; k < MAX_NR_FUNC; k++)
-                          if (func_table[k])
-                            func_table[k] = fnw + (func_table[k] - funcbufptr) + delta;
-                    }
-                    if (funcbufptr != func_buf)
-                      kfree(funcbufptr);
-                    funcbufptr = fnw;
-                    funcbufleft = funcbufleft - delta + sz - funcbufsize;
-                    funcbufsize = sz;
-                }
-                strcpy(func_table[i], kbs->kb_string);
-                break;
-        }
-        ret = 0;
-reterr:
-        kfree(kbs);
-        return ret;
-}
-
-int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-        unsigned char ucval;
-
-        switch(cmd) {
-        /* the ioctls below read/set the flags usually shown in the leds */
-        /* don't use them - they will go away without warning */
-        case KDGKBLED:
-                spin_lock_irqsave(&kbd_event_lock, flags);
-                ucval = kbd->ledflagstate | (kbd->default_ledflagstate << 4);
-                spin_unlock_irqrestore(&kbd_event_lock, flags);
-                return put_user(ucval, (char __user *)arg);
-
-        case KDSKBLED:
-                if (!perm)
-                        return -EPERM;
-                if (arg & ~0x77)
-                        return -EINVAL;
-                spin_lock_irqsave(&led_lock, flags);
-                kbd->ledflagstate = (arg & 7);
-                kbd->default_ledflagstate = ((arg >> 4) & 7);
-                set_leds();
-                spin_unlock_irqrestore(&led_lock, flags);
-                return 0;
-
-        /* the ioctls below only set the lights, not the functions */
-        /* for those, see KDGKBLED and KDSKBLED above */
-        case KDGETLED:
-                ucval = getledstate();
-                return put_user(ucval, (char __user *)arg);
-
-        case KDSETLED:
-                if (!perm)
-                        return -EPERM;
-                setledstate(kbd, arg);
-                return 0;
-        }
-        return -ENOIOCTLCMD;
-}
-
-int vt_do_kdgkbmode(int console)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        /* This is a spot read so needs no locking */
-        switch (kbd->kbdmode) {
-        case VC_RAW:
-                return K_RAW;
-        case VC_MEDIUMRAW:
-                return K_MEDIUMRAW;
-        case VC_UNICODE:
-                return K_UNICODE;
-        case VC_OFF:
-                return K_OFF;
-        default:
-                return K_XLATE;
-        }
-}
-
-/**
- *      vt_do_kdgkbmeta         -       report meta status
- *      @console: console to report
- *
- *      Report the meta flag status of this console
- */
-int vt_do_kdgkbmeta(int console)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        /* Again a spot read so no locking */
-        return vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT;
-}
-
-/**
- *      vt_reset_unicode        -       reset the unicode status
- *      @console: console being reset
- *
- *      Restore the unicode console state to its default
- */
-void vt_reset_unicode(int console)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        kbd_table[console].kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-}
-
-/**
- *      vt_get_shiftstate       -       shift bit state
- *
- *      Report the shift bits from the keyboard state. We have to export
- *      this to support some oddities in the vt layer.
- */
-int vt_get_shift_state(void)
-{
-        /* Don't lock as this is a transient report */
-        return shift_state;
-}
-
-/**
- *      vt_reset_keyboard       -       reset keyboard state
- *      @console: console to reset
- *
- *      Reset the keyboard bits for a console as part of a general console
- *      reset event
- */
-void vt_reset_keyboard(int console)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        set_vc_kbd_mode(kbd, VC_REPEAT);
-        clr_vc_kbd_mode(kbd, VC_CKMODE);
-        clr_vc_kbd_mode(kbd, VC_APPLIC);
-        clr_vc_kbd_mode(kbd, VC_CRLF);
-        kbd->lockstate = 0;
-        kbd->slockstate = 0;
-        spin_lock(&led_lock);
-        kbd->ledmode = LED_SHOW_FLAGS;
-        kbd->ledflagstate = kbd->default_ledflagstate;
-        spin_unlock(&led_lock);
-        /* do not do set_leds here because this causes an endless tasklet loop
-           when the keyboard hasn't been initialized yet */
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-}
-
-/**
- *      vt_get_kbd_mode_bit     -       read keyboard status bits
- *      @console: console to read from
- *      @bit: mode bit to read
- *
- *      Report back a vt mode bit. We do this without locking so the
- *      caller must be sure that there are no synchronization needs
- */
-
-int vt_get_kbd_mode_bit(int console, int bit)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        return vc_kbd_mode(kbd, bit);
-}
-
-/**
- *      vt_set_kbd_mode_bit     -       read keyboard status bits
- *      @console: console to read from
- *      @bit: mode bit to read
- *
- *      Set a vt mode bit. We do this without locking so the
- *      caller must be sure that there are no synchronization needs
- */
-
-void vt_set_kbd_mode_bit(int console, int bit)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        set_vc_kbd_mode(kbd, bit);
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-}
-
-/**
- *      vt_clr_kbd_mode_bit     -       read keyboard status bits
- *      @console: console to read from
- *      @bit: mode bit to read
- *
- *      Report back a vt mode bit. We do this without locking so the
- *      caller must be sure that there are no synchronization needs
- */
-
-void vt_clr_kbd_mode_bit(int console, int bit)
-{
-        struct kbd_struct * kbd = kbd_table + console;
-        unsigned long flags;
-
-        spin_lock_irqsave(&kbd_event_lock, flags);
-        clr_vc_kbd_mode(kbd, bit);
-        spin_unlock_irqrestore(&kbd_event_lock, flags);
-}
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index 60b7b692605..fb864e7fcd1 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -30,7 +30,6 @@
 
 extern void poke_blanked_console(void);
 
-/* FIXME: all this needs locking */
 /* Variables for selection control. */
 /* Use a dynamic buffer, instead of static (Dec 1994) */
 struct vc_data *sel_cons;               /* must not be deallocated */
@@ -62,14 +61,10 @@ sel_pos(int n)
                                 use_unicode);
 }
 
-/**
- *      clear_selection         -       remove current selection
- *
- *      Remove the current selection highlight, if any from the console
- *      holding the selection. The caller must hold the console lock.
- */
-void clear_selection(void)
-{
+/* remove the current selection highlight, if any,
+   from the console holding the selection. */
+void
+clear_selection(void) {
         highlight_pointer(-1); /* hide the pointer */
         if (sel_start != -1) {
                 highlight(sel_start, sel_end);
@@ -79,7 +74,7 @@ void clear_selection(void)
 
 /*
  * User settable table: what characters are to be considered alphabetic?
- * 256 bits. Locked by the console lock.
+ * 256 bits
  */
 static u32 inwordLut[8]={
   0x00000000, /* control chars     */
@@ -96,20 +91,10 @@ static inline int inword(const u16 c) {
         return c > 0xff || (( inwordLut[c>>5] >> (c & 0x1F) ) & 1);
 }
 
-/**
- *      set loadlut             -       load the LUT table
- *      @p: user table
- *
- *      Load the LUT table from user space. The caller must hold the console
- *      lock. Make a temporary copy so a partial update doesn't make a mess.
- */
+/* set inwordLut contents. Invoked by ioctl(). */
 int sel_loadlut(char __user *p)
 {
-        u32 tmplut[8];
-        if (copy_from_user(tmplut, (u32 __user *)(p+4), 32))
-                return -EFAULT;
-        memcpy(inwordLut, tmplut, 32);
-        return 0;
+        return copy_from_user(inwordLut, (u32 __user *)(p+4), 32) ? -EFAULT : 0;
 }
 
 /* does screen address p correspond to character at LH/RH edge of screen? */
@@ -145,16 +130,7 @@ static int store_utf8(u16 c, char *p)
         }
 }
 
-/**
- *      set_selection           -       set the current selection.
- *      @sel: user selection info
- *      @tty: the console tty
- *
- *      Invoked by the ioctl handle for the vt layer.
- *
- *      The entire selection process is managed under the console_lock. It's
- *       a lot under the lock but its hardly a performance path
- */
+/* set the current selection. Invoked by ioctl() or by kernel code. */
 int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty)
 {
         struct vc_data *vc = vc_cons[fg_console].d;
@@ -162,7 +138,7 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
         char *bp, *obp;
         int i, ps, pe, multiplier;
         u16 c;
-        int mode;
+        struct kbd_struct *kbd = kbd_table + fg_console;
 
         poke_blanked_console();
 
@@ -206,11 +182,7 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
                 clear_selection();
                 sel_cons = vc_cons[fg_console].d;
         }
-        mode = vt_do_kdgkbmode(fg_console);
-        if (mode == K_UNICODE)
-                use_unicode = 1;
-        else
-                use_unicode = 0;
+        use_unicode = kbd && kbd->kbdmode == VC_UNICODE;
 
         switch (sel_mode)
         {
@@ -329,9 +301,6 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
 /* Insert the contents of the selection buffer into the
  * queue of the tty associated with the current console.
  * Invoked by ioctl().
- *
- * Locking: called without locks. Calls the ldisc wrongly with
- * unsafe methods,
  */
 int paste_selection(struct tty_struct *tty)
 {
@@ -341,13 +310,20 @@ int paste_selection(struct tty_struct *tty)
         struct  tty_ldisc *ld;
         DECLARE_WAITQUEUE(wait, current);
 
+        /* always called with BTM from vt_ioctl */
+        WARN_ON(!tty_locked());
+
         console_lock();
         poke_blanked_console();
         console_unlock();
 
-        ld = tty_ldisc_ref_wait(tty);
+        ld = tty_ldisc_ref(tty);
+        if (!ld) {
+                tty_unlock();
+                ld = tty_ldisc_ref_wait(tty);
+                tty_lock();
+        }
 
-        /* FIXME: this is completely unsafe */
         add_wait_queue(&vc->paste_wait, &wait);
         while (sel_buffer && sel_buffer_lth > pasted) {
                 set_current_state(TASK_INTERRUPTIBLE);
@@ -357,7 +333,8 @@ int paste_selection(struct tty_struct *tty)
                 }
                 count = sel_buffer_lth - pasted;
                 count = min(count, tty->receive_room);
-                ld->ops->receive_buf(tty, sel_buffer + pasted, NULL, count);
+                tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,
+                                                                NULL, count);
                 pasted += count;
         }
         remove_wait_queue(&vc->paste_wait, &wait);
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index fa7268a93c0..66825c9f516 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/errno.h>
-#include <linux/export.h>
 #include <linux/tty.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
@@ -608,10 +607,10 @@ vcs_open(struct inode *inode, struct file *filp)
         unsigned int currcons = iminor(inode) & 127;
         int ret = 0;
         
-        console_lock();
+        tty_lock();
         if(currcons && !vc_cons_allocated(currcons-1))
                 ret = -ENXIO;
-        console_unlock();
+        tty_unlock();
         return ret;
 }
 
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 8fd89687d06..b3915b7ad3e 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -99,6 +99,7 @@
 #include <linux/notifier.h>
 #include <linux/device.h>
 #include <linux/io.h>
+#include <asm/system.h>
 #include <linux/uaccess.h>
 #include <linux/kdb.h>
 #include <linux/ctype.h>
@@ -258,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier);
 
 static void notify_write(struct vc_data *vc, unsigned int unicode)
 {
-        struct vt_notifier_param param = { .vc = vc, .c = unicode };
+        struct vt_notifier_param param = { .vc = vc, unicode = unicode };
         atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
 }
 
@@ -537,27 +538,45 @@ void complement_pos(struct vc_data *vc, int offset)
 
 static void insert_char(struct vc_data *vc, unsigned int nr)
 {
-        unsigned short *p = (unsigned short *) vc->vc_pos;
+        unsigned short *p, *q = (unsigned short *)vc->vc_pos;
 
-        scr_memmovew(p + nr, p, (vc->vc_cols - vc->vc_x) * 2);
-        scr_memsetw(p, vc->vc_video_erase_char, nr * 2);
+        p = q + vc->vc_cols - nr - vc->vc_x;
+        while (--p >= q)
+                scr_writew(scr_readw(p), p + nr);
+        scr_memsetw(q, vc->vc_video_erase_char, nr * 2);
         vc->vc_need_wrap = 0;
-        if (DO_UPDATE(vc))
-                do_update_region(vc, (unsigned long) p,
-                        vc->vc_cols - vc->vc_x);
+        if (DO_UPDATE(vc)) {
+                unsigned short oldattr = vc->vc_attr;
+                vc->vc_sw->con_bmove(vc, vc->vc_y, vc->vc_x, vc->vc_y, vc->vc_x + nr, 1,
+                                     vc->vc_cols - vc->vc_x - nr);
+                vc->vc_attr = vc->vc_video_erase_char >> 8;
+                while (nr--)
+                        vc->vc_sw->con_putc(vc, vc->vc_video_erase_char, vc->vc_y, vc->vc_x + nr);
+                vc->vc_attr = oldattr;
+        }
 }
 
 static void delete_char(struct vc_data *vc, unsigned int nr)
 {
-        unsigned short *p = (unsigned short *) vc->vc_pos;
+        unsigned int i = vc->vc_x;
+        unsigned short *p = (unsigned short *)vc->vc_pos;
 
-        scr_memcpyw(p, p + nr, (vc->vc_cols - vc->vc_x - nr) * 2);
-        scr_memsetw(p + vc->vc_cols - vc->vc_x - nr, vc->vc_video_erase_char,
-                        nr * 2);
+        while (++i <= vc->vc_cols - nr) {
+                scr_writew(scr_readw(p+nr), p);
+                p++;
+        }
+        scr_memsetw(p, vc->vc_video_erase_char, nr * 2);
         vc->vc_need_wrap = 0;
-        if (DO_UPDATE(vc))
-                do_update_region(vc, (unsigned long) p,
-                        vc->vc_cols - vc->vc_x);
+        if (DO_UPDATE(vc)) {
+                unsigned short oldattr = vc->vc_attr;
+                vc->vc_sw->con_bmove(vc, vc->vc_y, vc->vc_x + nr, vc->vc_y, vc->vc_x, 1,
+                                     vc->vc_cols - vc->vc_x - nr);
+                vc->vc_attr = vc->vc_video_erase_char >> 8;
+                while (nr--)
+                        vc->vc_sw->con_putc(vc, vc->vc_video_erase_char, vc->vc_y,
+                                     vc->vc_cols - 1 - nr);
+                vc->vc_attr = oldattr;
+        }
 }
 
 static int softcursor_original;
@@ -779,7 +798,6 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
                 con_set_default_unimap(vc);
             vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
             if (!vc->vc_screenbuf) {
-                tty_port_destroy(&vc->port);
                 kfree(vc);
                 vc_cons[currcons].d = NULL;
                 return -ENOMEM;
@@ -1000,10 +1018,8 @@ void vc_deallocate(unsigned int currcons)
                 put_pid(vc->vt_pid);
                 module_put(vc->vc_sw->owner);
                 kfree(vc->vc_screenbuf);
-                if (currcons >= MIN_NR_CONSOLES) {
-                        tty_port_destroy(&vc->port);
+                if (currcons >= MIN_NR_CONSOLES)
                         kfree(vc);
-                }
                 vc_cons[currcons].d = NULL;
         }
 }
@@ -1012,9 +1028,9 @@ void vc_deallocate(unsigned int currcons)
  *      VT102 emulator
  */
 
-#define set_kbd(vc, x)  vt_set_kbd_mode_bit((vc)->vc_num, (x))
-#define clr_kbd(vc, x)  vt_clr_kbd_mode_bit((vc)->vc_num, (x))
-#define is_kbd(vc, x)   vt_get_kbd_mode_bit((vc)->vc_num, (x))
+#define set_kbd(vc, x)  set_vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
+#define clr_kbd(vc, x)  clr_vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
+#define is_kbd(vc, x)   vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
 
 #define decarm          VC_REPEAT
 #define decckm          VC_CKMODE
@@ -1157,26 +1173,45 @@ static void csi_J(struct vc_data *vc, int vpar)
                 case 0: /* erase from cursor to end of display */
                         count = (vc->vc_scr_end - vc->vc_pos) >> 1;
                         start = (unsigned short *)vc->vc_pos;
+                        if (DO_UPDATE(vc)) {
+                                /* do in two stages */
+                                vc->vc_sw->con_clear(vc, vc->vc_y, vc->vc_x, 1,
+                                              vc->vc_cols - vc->vc_x);
+                                vc->vc_sw->con_clear(vc, vc->vc_y + 1, 0,
+                                              vc->vc_rows - vc->vc_y - 1,
+                                              vc->vc_cols);
+                        }
                         break;
                 case 1: /* erase from start to cursor */
                         count = ((vc->vc_pos - vc->vc_origin) >> 1) + 1;
                         start = (unsigned short *)vc->vc_origin;
+                        if (DO_UPDATE(vc)) {
+                                /* do in two stages */
+                                vc->vc_sw->con_clear(vc, 0, 0, vc->vc_y,
+                                              vc->vc_cols);
+                                vc->vc_sw->con_clear(vc, vc->vc_y, 0, 1,
+                                              vc->vc_x + 1);
+                        }
                         break;
                 case 3: /* erase scroll-back buffer (and whole display) */
                         scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
                                     vc->vc_screenbuf_size >> 1);
                         set_origin(vc);
+                        if (CON_IS_VISIBLE(vc))
+                                update_screen(vc);
                         /* fall through */
                 case 2: /* erase whole display */
                         count = vc->vc_cols * vc->vc_rows;
                         start = (unsigned short *)vc->vc_origin;
+                        if (DO_UPDATE(vc))
+                                vc->vc_sw->con_clear(vc, 0, 0,
+                                              vc->vc_rows,
+                                              vc->vc_cols);
                         break;
                 default:
                         return;
         }
         scr_memsetw(start, vc->vc_video_erase_char, 2 * count);
-        if (DO_UPDATE(vc))
-                do_update_region(vc, (unsigned long) start, count);
         vc->vc_need_wrap = 0;
 }
 
@@ -1189,22 +1224,29 @@ static void csi_K(struct vc_data *vc, int vpar)
                 case 0: /* erase from cursor to end of line */
                         count = vc->vc_cols - vc->vc_x;
                         start = (unsigned short *)vc->vc_pos;
+                        if (DO_UPDATE(vc))
+                                vc->vc_sw->con_clear(vc, vc->vc_y, vc->vc_x, 1,
+                                                     vc->vc_cols - vc->vc_x);
                         break;
                 case 1: /* erase from start of line to cursor */
                         start = (unsigned short *)(vc->vc_pos - (vc->vc_x << 1));
                         count = vc->vc_x + 1;
+                        if (DO_UPDATE(vc))
+                                vc->vc_sw->con_clear(vc, vc->vc_y, 0, 1,
+                                                     vc->vc_x + 1);
                         break;
                 case 2: /* erase whole line */
                         start = (unsigned short *)(vc->vc_pos - (vc->vc_x << 1));
                         count = vc->vc_cols;
+                        if (DO_UPDATE(vc))
+                                vc->vc_sw->con_clear(vc, vc->vc_y, 0, 1,
+                                              vc->vc_cols);
                         break;
                 default:
                         return;
         }
         scr_memsetw(start, vc->vc_video_erase_char, 2 * count);
         vc->vc_need_wrap = 0;
-        if (DO_UPDATE(vc))
-                do_update_region(vc, (unsigned long) start, count);
 }
 
 static void csi_X(struct vc_data *vc, int vpar) /* erase the following vpar positions */
@@ -1339,7 +1381,7 @@ static void respond_string(const char *p, struct tty_struct *tty)
                 tty_insert_flip_char(tty, *p, 0);
                 p++;
         }
-        tty_schedule_flip(tty);
+        con_schedule_flip(tty);
 }
 
 static void cursor_report(struct vc_data *vc, struct tty_struct *tty)
@@ -1610,7 +1652,16 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
         vc->vc_deccm            = global_cursor_default;
         vc->vc_decim            = 0;
 
-        vt_reset_keyboard(vc->vc_num);
+        set_kbd(vc, decarm);
+        clr_kbd(vc, decckm);
+        clr_kbd(vc, kbdapplic);
+        clr_kbd(vc, lnm);
+        kbd_table[vc->vc_num].lockstate = 0;
+        kbd_table[vc->vc_num].slockstate = 0;
+        kbd_table[vc->vc_num].ledmode = LED_SHOW_FLAGS;
+        kbd_table[vc->vc_num].ledflagstate = kbd_table[vc->vc_num].default_ledflagstate;
+        /* do not do set_leds here because this causes an endless tasklet loop
+           when the keyboard hasn't been initialized yet */
 
         vc->vc_cursor_type = cur_default;
         vc->vc_complement_mask = vc->vc_s_complement_mask;
@@ -1928,7 +1979,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                 case 'q': /* DECLL - but only 3 leds */
                         /* map 0,1,2,3 to 0,1,2,4 */
                         if (vc->vc_par[0] < 4)
-                                vt_set_led_state(vc->vc_num,
+                                setledstate(kbd_table + vc->vc_num,
                                             (vc->vc_par[0] < 3) ? vc->vc_par[0] : 4);
                         return;
                 case 'r':
@@ -2581,9 +2632,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         console_unlock();
                         break;
                 case TIOCL_SELLOADLUT:
-                        console_lock();
                         ret = sel_loadlut(p);
-                        console_unlock();
                         break;
                 case TIOCL_GETSHIFTSTATE:
 
@@ -2593,19 +2642,15 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
          * kernel-internal variable; programs not closely
          * related to the kernel should not use this.
          */
-                        data = vt_get_shift_state();
+                        data = shift_state;
                         ret = __put_user(data, p);
                         break;
                 case TIOCL_GETMOUSEREPORTING:
-                        console_lock(); /* May be overkill */
                         data = mouse_reporting();
-                        console_unlock();
                         ret = __put_user(data, p);
                         break;
                 case TIOCL_SETVESABLANK:
-                        console_lock();
                         ret = set_vesa_blanking(p);
-                        console_unlock();
                         break;
                 case TIOCL_GETKMSGREDIRECT:
                         data = vt_get_kmsg_redirect();
@@ -2622,21 +2667,13 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         }
                         break;
                 case TIOCL_GETFGCONSOLE:
-                        /* No locking needed as this is a transiently
-                           correct return anyway if the caller hasn't
-                           disabled switching */
                         ret = fg_console;
                         break;
                 case TIOCL_SCROLLCONSOLE:
                         if (get_user(lines, (s32 __user *)(p+4))) {
                                 ret = -EFAULT;
                         } else {
-                                /* Need the console lock here. Note that lots
-                                   of other calls need fixing before the lock
-                                   is actually useful ! */
-                                console_lock();
                                 scrollfront(vc_cons[fg_console].d, lines);
-                                console_unlock();
                                 ret = 0;
                         }
                         break;
@@ -2716,7 +2753,8 @@ static void con_stop(struct tty_struct *tty)
         console_num = tty->index;
         if (!vc_cons_allocated(console_num))
                 return;
-        vt_kbd_con_stop(console_num);
+        set_vc_kbd_led(kbd_table + console_num, VC_SCROLLOCK);
+        set_leds();
 }
 
 /*
@@ -2730,7 +2768,8 @@ static void con_start(struct tty_struct *tty)
         console_num = tty->index;
         if (!vc_cons_allocated(console_num))
                 return;
-        vt_kbd_con_start(console_num);
+        clr_vc_kbd_led(kbd_table + console_num, VC_SCROLLOCK);
+        set_leds();
 }
 
 static void con_flush_chars(struct tty_struct *tty)
@@ -2751,52 +2790,41 @@ static void con_flush_chars(struct tty_struct *tty)
 /*
  * Allocate the console screen memory.
  */
-static int con_install(struct tty_driver *driver, struct tty_struct *tty)
+static int con_open(struct tty_struct *tty, struct file *filp)
 {
         unsigned int currcons = tty->index;
-        struct vc_data *vc;
-        int ret;
+        int ret = 0;
 
         console_lock();
-        ret = vc_allocate(currcons);
-        if (ret)
-                goto unlock;
-
-        vc = vc_cons[currcons].d;
-
-        /* Still being freed */
-        if (vc->port.tty) {
-                ret = -ERESTARTSYS;
-                goto unlock;
-        }
-
-        ret = tty_port_install(&vc->port, driver, tty);
-        if (ret)
-                goto unlock;
+        if (tty->driver_data == NULL) {
+                ret = vc_allocate(currcons);
+                if (ret == 0) {
+                        struct vc_data *vc = vc_cons[currcons].d;
 
-        tty->driver_data = vc;
-        vc->port.tty = tty;
+                        /* Still being freed */
+                        if (vc->port.tty) {
+                                console_unlock();
+                                return -ERESTARTSYS;
+                        }
+                        tty->driver_data = vc;
+                        vc->port.tty = tty;
 
-        if (!tty->winsize.ws_row && !tty->winsize.ws_col) {
-                tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
-                tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
+                        if (!tty->winsize.ws_row && !tty->winsize.ws_col) {
+                                tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
+                                tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
+                        }
+                        if (vc->vc_utf)
+                                tty->termios->c_iflag |= IUTF8;
+                        else
+                                tty->termios->c_iflag &= ~IUTF8;
+                        console_unlock();
+                        return ret;
+                }
         }
-        if (vc->vc_utf)
-                tty->termios.c_iflag |= IUTF8;
-        else
-                tty->termios.c_iflag &= ~IUTF8;
-unlock:
         console_unlock();
         return ret;
 }
 
-static int con_open(struct tty_struct *tty, struct file *filp)
-{
-        /* everything done in install */
-        return 0;
-}
-
-
 static void con_close(struct tty_struct *tty, struct file *filp)
 {
         /* Nothing to do - we defer to shutdown */
@@ -2809,6 +2837,7 @@ static void con_shutdown(struct tty_struct *tty)
         console_lock();
         vc->port.tty = NULL;
         console_unlock();
+        tty_shutdown(tty);
 }
 
 static int default_italic_color    = 2; // green (ASCII)
@@ -2901,10 +2930,11 @@ static int __init con_init(void)
         gotoxy(vc, vc->vc_x, vc->vc_y);
         csi_J(vc, 0);
         update_screen(vc);
-        pr_info("Console: %s %s %dx%d\n",
+        pr_info("Console: %s %s %dx%d",
                 vc->vc_can_do_color ? "colour" : "mono",
                 display_desc, vc->vc_cols, vc->vc_rows);
         printable = 1;
+        printk("\n");
 
         console_unlock();
 
@@ -2916,7 +2946,6 @@ static int __init con_init(void)
 console_initcall(con_init);
 
 static const struct tty_operations con_ops = {
-        .install = con_install,
         .open = con_open,
         .close = con_close,
         .write = con_write,
@@ -2962,7 +2991,7 @@ int __init vty_init(const struct file_operations *console_fops)
         console_driver = alloc_tty_driver(MAX_NR_CONSOLES);
         if (!console_driver)
                 panic("Couldn't allocate console driver\n");
-
+        console_driver->owner = THIS_MODULE;
         console_driver->name = "tty";
         console_driver->name_base = 1;
         console_driver->major = TTY_MAJOR;
@@ -3445,19 +3474,6 @@ int con_debug_enter(struct vc_data *vc)
                         kdb_set(2, setargs);
                 }
         }
-        if (vc->vc_cols < 999) {
-                int colcount;
-                char cols[4];
-                const char *setargs[3] = {
-                        "set",
-                        "COLUMNS",
-                        cols,
-                };
-                if (kdbgetintenv(setargs[0], &colcount)) {
-                        snprintf(cols, 4, "%i", vc->vc_cols);
-                        kdb_set(2, setargs);
-                }
-        }
 #endif /* CONFIG_KGDB_KDB */
         return ret;
 }
@@ -3875,6 +3891,36 @@ static void set_palette(struct vc_data *vc)
                 vc->vc_sw->con_set_palette(vc, color_table);
 }
 
+static int set_get_cmap(unsigned char __user *arg, int set)
+{
+    int i, j, k;
+
+    WARN_CONSOLE_UNLOCKED();
+
+    for (i = 0; i < 16; i++)
+        if (set) {
+            get_user(default_red[i], arg++);
+            get_user(default_grn[i], arg++);
+            get_user(default_blu[i], arg++);
+        } else {
+            put_user(default_red[i], arg++);
+            put_user(default_grn[i], arg++);
+            put_user(default_blu[i], arg++);
+        }
+    if (set) {
+        for (i = 0; i < MAX_NR_CONSOLES; i++)
+            if (vc_cons_allocated(i)) {
+                for (j = k = 0; j < 16; j++) {
+                    vc_cons[i].d->vc_palette[k++] = default_red[j];
+                    vc_cons[i].d->vc_palette[k++] = default_grn[j];
+                    vc_cons[i].d->vc_palette[k++] = default_blu[j];
+                }
+                set_palette(vc_cons[i].d);
+            }
+    }
+    return 0;
+}
+
 /*
  * Load palette into the DAC registers. arg points to a colour
  * map, 3 bytes per colour, 16 colours, range from 0 to 255.
@@ -3882,50 +3928,24 @@ static void set_palette(struct vc_data *vc)
 
 int con_set_cmap(unsigned char __user *arg)
 {
-        int i, j, k;
-        unsigned char colormap[3*16];
-
-        if (copy_from_user(colormap, arg, sizeof(colormap)))
-                return -EFAULT;
+        int rc;
 
         console_lock();
-        for (i = k = 0; i < 16; i++) {
-                default_red[i] = colormap[k++];
-                default_grn[i] = colormap[k++];
-                default_blu[i] = colormap[k++];
-        }
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                if (!vc_cons_allocated(i))
-                        continue;
-                for (j = k = 0; j < 16; j++) {
-                        vc_cons[i].d->vc_palette[k++] = default_red[j];
-                        vc_cons[i].d->vc_palette[k++] = default_grn[j];
-                        vc_cons[i].d->vc_palette[k++] = default_blu[j];
-                }
-                set_palette(vc_cons[i].d);
-        }
+        rc = set_get_cmap (arg,1);
         console_unlock();
 
-        return 0;
+        return rc;
 }
 
 int con_get_cmap(unsigned char __user *arg)
 {
-        int i, k;
-        unsigned char colormap[3*16];
+        int rc;
 
         console_lock();
-        for (i = k = 0; i < 16; i++) {
-                colormap[k++] = default_red[i];
-                colormap[k++] = default_grn[i];
-                colormap[k++] = default_blu[i];
-        }
+        rc = set_get_cmap (arg,0);
         console_unlock();
 
-        if (copy_to_user(arg, colormap, sizeof(colormap)))
-                return -EFAULT;
-
-        return 0;
+        return rc;
 }
 
 void reset_palette(struct vc_data *vc)
@@ -3960,6 +3980,9 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
         int rc = -EINVAL;
         int c;
 
+        if (vc->vc_mode != KD_TEXT)
+                return -EINVAL;
+
         if (op->data) {
                 font.data = kmalloc(max_font_size, GFP_KERNEL);
                 if (!font.data)
@@ -3968,9 +3991,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
                 font.data = NULL;
 
         console_lock();
-        if (vc->vc_mode != KD_TEXT)
-                rc = -EINVAL;
-        else if (vc->vc_sw->con_font_get)
+        if (vc->vc_sw->con_font_get)
                 rc = vc->vc_sw->con_font_get(vc, &font);
         else
                 rc = -ENOSYS;
@@ -4052,9 +4073,7 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
         if (IS_ERR(font.data))
                 return PTR_ERR(font.data);
         console_lock();
-        if (vc->vc_mode != KD_TEXT)
-                rc = -EINVAL;
-        else if (vc->vc_sw->con_font_set)
+        if (vc->vc_sw->con_font_set)
                 rc = vc->vc_sw->con_font_set(vc, &font, op->flags);
         else
                 rc = -ENOSYS;
@@ -4070,6 +4089,8 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
         char *s = name;
         int rc;
 
+        if (vc->vc_mode != KD_TEXT)
+                return -EINVAL;
 
         if (!op->data)
                 s = NULL;
@@ -4079,10 +4100,6 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
                 name[MAX_FONT_NAME - 1] = 0;
 
         console_lock();
-        if (vc->vc_mode != KD_TEXT) {
-                console_unlock();
-                return -EINVAL;
-        }
         if (vc->vc_sw->con_font_default)
                 rc = vc->vc_sw->con_font_default(vc, &font, s);
         else
@@ -4100,11 +4117,11 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
         int con = op->height;
         int rc;
 
+        if (vc->vc_mode != KD_TEXT)
+                return -EINVAL;
 
         console_lock();
-        if (vc->vc_mode != KD_TEXT)
-                rc = -EINVAL;
-        else if (!vc->vc_sw->con_font_copy)
+        if (!vc->vc_sw->con_font_copy)
                 rc = -ENOSYS;
         else if (con < 0 || !vc_cons_allocated(con))
                 rc = -ENOTTY;
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 98ff1735eaf..5e096f43bce 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -25,7 +25,6 @@
 #include <linux/console.h>
 #include <linux/consolemap.h>
 #include <linux/signal.h>
-#include <linux/suspend.h>
 #include <linux/timex.h>
 
 #include <asm/io.h>
@@ -111,7 +110,16 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new)
                 wake_up_interruptible(&vt_event_waitqueue);
 }
 
-static void __vt_event_queue(struct vt_event_wait *vw)
+/**
+ *      vt_event_wait           -       wait for an event
+ *      @vw: our event
+ *
+ *      Waits for an event to occur which completes our vt_event_wait
+ *      structure. On return the structure has wv->done set to 1 for success
+ *      or 0 if some event such as a signal ended the wait.
+ */
+
+static void vt_event_wait(struct vt_event_wait *vw)
 {
         unsigned long flags;
         /* Prepare the event */
@@ -121,18 +129,8 @@ static void __vt_event_queue(struct vt_event_wait *vw)
         spin_lock_irqsave(&vt_event_lock, flags);
         list_add(&vw->list, &vt_events);
         spin_unlock_irqrestore(&vt_event_lock, flags);
-}
-
-static void __vt_event_wait(struct vt_event_wait *vw)
-{
         /* Wait for it to pass */
-        wait_event_interruptible(vt_event_waitqueue, vw->done);
-}
-
-static void __vt_event_dequeue(struct vt_event_wait *vw)
-{
-        unsigned long flags;
-
+        wait_event_interruptible_tty(vt_event_waitqueue, vw->done);
         /* Dequeue it */
         spin_lock_irqsave(&vt_event_lock, flags);
         list_del(&vw->list);
@@ -140,22 +138,6 @@ static void __vt_event_dequeue(struct vt_event_wait *vw)
 }
 
 /**
- *      vt_event_wait           -       wait for an event
- *      @vw: our event
- *
- *      Waits for an event to occur which completes our vt_event_wait
- *      structure. On return the structure has wv->done set to 1 for success
- *      or 0 if some event such as a signal ended the wait.
- */
-
-static void vt_event_wait(struct vt_event_wait *vw)
-{
-        __vt_event_queue(vw);
-        __vt_event_wait(vw);
-        __vt_event_dequeue(vw);
-}
-
-/**
  *      vt_event_wait_ioctl     -       event ioctl handler
  *      @arg: argument to ioctl
  *
@@ -195,14 +177,10 @@ int vt_waitactive(int n)
 {
         struct vt_event_wait vw;
         do {
-                vw.event.event = VT_EVENT_SWITCH;
-                __vt_event_queue(&vw);
-                if (n == fg_console + 1) {
-                        __vt_event_dequeue(&vw);
+                if (n == fg_console + 1)
                         break;
-                }
-                __vt_event_wait(&vw);
-                __vt_event_dequeue(&vw);
+                vw.event.event = VT_EVENT_SWITCH;
+                vt_event_wait(&vw);
                 if (vw.done == 0)
                         return -EINTR;
         } while (vw.event.newev != n);
@@ -217,7 +195,232 @@ int vt_waitactive(int n)
 #define GPLAST 0x3df
 #define GPNUM (GPLAST - GPFIRST + 1)
 
+#define i (tmp.kb_index)
+#define s (tmp.kb_table)
+#define v (tmp.kb_value)
+static inline int
+do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_struct *kbd)
+{
+        struct kbentry tmp;
+        ushort *key_map, val, ov;
+
+        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
+                return -EFAULT;
+
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                perm = 0;
+
+        switch (cmd) {
+        case KDGKBENT:
+                key_map = key_maps[s];
+                if (key_map) {
+                    val = U(key_map[i]);
+                    if (kbd->kbdmode != VC_UNICODE && KTYP(val) >= NR_TYPES)
+                        val = K_HOLE;
+                } else
+                    val = (i ? K_HOLE : K_NOSUCHMAP);
+                return put_user(val, &user_kbe->kb_value);
+        case KDSKBENT:
+                if (!perm)
+                        return -EPERM;
+                if (!i && v == K_NOSUCHMAP) {
+                        /* deallocate map */
+                        key_map = key_maps[s];
+                        if (s && key_map) {
+                            key_maps[s] = NULL;
+                            if (key_map[0] == U(K_ALLOCATED)) {
+                                        kfree(key_map);
+                                        keymap_count--;
+                            }
+                        }
+                        break;
+                }
+
+                if (KTYP(v) < NR_TYPES) {
+                    if (KVAL(v) > max_vals[KTYP(v)])
+                                return -EINVAL;
+                } else
+                    if (kbd->kbdmode != VC_UNICODE)
+                                return -EINVAL;
+
+                /* ++Geert: non-PC keyboards may generate keycode zero */
+#if !defined(__mc68000__) && !defined(__powerpc__)
+                /* assignment to entry 0 only tests validity of args */
+                if (!i)
+                        break;
+#endif
+
+                if (!(key_map = key_maps[s])) {
+                        int j;
+
+                        if (keymap_count >= MAX_NR_OF_USER_KEYMAPS &&
+                            !capable(CAP_SYS_RESOURCE))
+                                return -EPERM;
+
+                        key_map = kmalloc(sizeof(plain_map),
+                                                     GFP_KERNEL);
+                        if (!key_map)
+                                return -ENOMEM;
+                        key_maps[s] = key_map;
+                        key_map[0] = U(K_ALLOCATED);
+                        for (j = 1; j < NR_KEYS; j++)
+                                key_map[j] = U(K_HOLE);
+                        keymap_count++;
+                }
+                ov = U(key_map[i]);
+                if (v == ov)
+                        break;  /* nothing to do */
+                /*
+                 * Attention Key.
+                 */
+                if (((ov == K_SAK) || (v == K_SAK)) && !capable(CAP_SYS_ADMIN))
+                        return -EPERM;
+                key_map[i] = U(v);
+                if (!s && (KTYP(ov) == KT_SHIFT || KTYP(v) == KT_SHIFT))
+                        compute_shiftstate();
+                break;
+        }
+        return 0;
+}
+#undef i
+#undef s
+#undef v
+
+static inline int 
+do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc, int perm)
+{
+        struct kbkeycode tmp;
+        int kc = 0;
+
+        if (copy_from_user(&tmp, user_kbkc, sizeof(struct kbkeycode)))
+                return -EFAULT;
+        switch (cmd) {
+        case KDGETKEYCODE:
+                kc = getkeycode(tmp.scancode);
+                if (kc >= 0)
+                        kc = put_user(kc, &user_kbkc->keycode);
+                break;
+        case KDSETKEYCODE:
+                if (!perm)
+                        return -EPERM;
+                kc = setkeycode(tmp.scancode, tmp.keycode);
+                break;
+        }
+        return kc;
+}
+
+static inline int
+do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+{
+        struct kbsentry *kbs;
+        char *p;
+        u_char *q;
+        u_char __user *up;
+        int sz;
+        int delta;
+        char *first_free, *fj, *fnw;
+        int i, j, k;
+        int ret;
+
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                perm = 0;
+
+        kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
+        if (!kbs) {
+                ret = -ENOMEM;
+                goto reterr;
+        }
 
+        /* we mostly copy too much here (512bytes), but who cares ;) */
+        if (copy_from_user(kbs, user_kdgkb, sizeof(struct kbsentry))) {
+                ret = -EFAULT;
+                goto reterr;
+        }
+        kbs->kb_string[sizeof(kbs->kb_string)-1] = '\0';
+        i = kbs->kb_func;
+
+        switch (cmd) {
+        case KDGKBSENT:
+                sz = sizeof(kbs->kb_string) - 1; /* sz should have been
+                                                  a struct member */
+                up = user_kdgkb->kb_string;
+                p = func_table[i];
+                if(p)
+                        for ( ; *p && sz; p++, sz--)
+                                if (put_user(*p, up++)) {
+                                        ret = -EFAULT;
+                                        goto reterr;
+                                }
+                if (put_user('\0', up)) {
+                        ret = -EFAULT;
+                        goto reterr;
+                }
+                kfree(kbs);
+                return ((p && *p) ? -EOVERFLOW : 0);
+        case KDSKBSENT:
+                if (!perm) {
+                        ret = -EPERM;
+                        goto reterr;
+                }
+
+                q = func_table[i];
+                first_free = funcbufptr + (funcbufsize - funcbufleft);
+                for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
+                        ;
+                if (j < MAX_NR_FUNC)
+                        fj = func_table[j];
+                else
+                        fj = first_free;
+
+                delta = (q ? -strlen(q) : 1) + strlen(kbs->kb_string);
+                if (delta <= funcbufleft) {     /* it fits in current buf */
+                    if (j < MAX_NR_FUNC) {
+                        memmove(fj + delta, fj, first_free - fj);
+                        for (k = j; k < MAX_NR_FUNC; k++)
+                            if (func_table[k])
+                                func_table[k] += delta;
+                    }
+                    if (!q)
+                      func_table[i] = fj;
+                    funcbufleft -= delta;
+                } else {                        /* allocate a larger buffer */
+                    sz = 256;
+                    while (sz < funcbufsize - funcbufleft + delta)
+                      sz <<= 1;
+                    fnw = kmalloc(sz, GFP_KERNEL);
+                    if(!fnw) {
+                      ret = -ENOMEM;
+                      goto reterr;
+                    }
+
+                    if (!q)
+                      func_table[i] = fj;
+                    if (fj > funcbufptr)
+                        memmove(fnw, funcbufptr, fj - funcbufptr);
+                    for (k = 0; k < j; k++)
+                      if (func_table[k])
+                        func_table[k] = fnw + (func_table[k] - funcbufptr);
+
+                    if (first_free > fj) {
+                        memmove(fnw + (fj - funcbufptr) + delta, fj, first_free - fj);
+                        for (k = j; k < MAX_NR_FUNC; k++)
+                          if (func_table[k])
+                            func_table[k] = fnw + (func_table[k] - funcbufptr) + delta;
+                    }
+                    if (funcbufptr != func_buf)
+                      kfree(funcbufptr);
+                    funcbufptr = fnw;
+                    funcbufleft = funcbufleft - delta + sz - funcbufsize;
+                    funcbufsize = sz;
+                }
+                strcpy(func_table[i], kbs->kb_string);
+                break;
+        }
+        ret = 0;
+reterr:
+        kfree(kbs);
+        return ret;
+}
 
 static inline int 
 do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op)
@@ -294,6 +497,7 @@ int vt_ioctl(struct tty_struct *tty,
 {
         struct vc_data *vc = tty->driver_data;
         struct console_font_op op;      /* used in multiple places here */
+        struct kbd_struct * kbd;
         unsigned int console;
         unsigned char ucval;
         unsigned int uival;
@@ -303,6 +507,7 @@ int vt_ioctl(struct tty_struct *tty,
 
         console = vc->vc_num;
 
+        tty_lock();
 
         if (!vc_cons_allocated(console)) {      /* impossible? */
                 ret = -ENOIOCTLCMD;
@@ -318,18 +523,19 @@ int vt_ioctl(struct tty_struct *tty,
         if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
                 perm = 1;
  
+        kbd = kbd_table + console;
         switch (cmd) {
         case TIOCLINUX:
                 ret = tioclinux(tty, arg);
                 break;
         case KIOCSOUND:
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 /*
                  * The use of PIT_TICK_RATE is historic, it used to be
                  * the platform-dependent CLOCK_TICK_RATE between 2.6.12
                  * and 2.6.36, which was a minor but unfortunate ABI
-                 * change. kd_mksound is locked by the input layer.
+                 * change.
                  */
                 if (arg)
                         arg = PIT_TICK_RATE / arg;
@@ -338,7 +544,7 @@ int vt_ioctl(struct tty_struct *tty,
 
         case KDMKTONE:
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
         {
                 unsigned int ticks, count;
                 
@@ -356,11 +562,10 @@ int vt_ioctl(struct tty_struct *tty,
 
         case KDGKBTYPE:
                 /*
-                 * this is naïve.
+                 * this is naive.
                  */
                 ucval = KB_101;
-                ret = put_user(ucval, (char __user *)arg);
-                break;
+                goto setchar;
 
                 /*
                  * These cannot be implemented on any machine that implements
@@ -374,8 +579,6 @@ int vt_ioctl(struct tty_struct *tty,
                 /*
                  * KDADDIO and KDDELIO may be able to add ports beyond what
                  * we reject here, but to be safe...
-                 *
-                 * These are locked internally via sys_ioperm
                  */
                 if (arg < GPFIRST || arg > GPLAST) {
                         ret = -EINVAL;
@@ -398,7 +601,7 @@ int vt_ioctl(struct tty_struct *tty,
                 struct kbd_repeat kbrep;
                 
                 if (!capable(CAP_SYS_TTY_CONFIG))
-                        return -EPERM;
+                        goto eperm;
 
                 if (copy_from_user(&kbrep, up, sizeof(struct kbd_repeat))) {
                         ret =  -EFAULT;
@@ -422,7 +625,7 @@ int vt_ioctl(struct tty_struct *tty,
                  * need to restore their engine state. --BenH
                  */
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 switch (arg) {
                 case KD_GRAPHICS:
                         break;
@@ -435,7 +638,6 @@ int vt_ioctl(struct tty_struct *tty,
                         ret = -EINVAL;
                         goto out;
                 }
-                /* FIXME: this needs the console lock extending */
                 if (vc->vc_mode == (unsigned char) arg)
                         break;
                 vc->vc_mode = (unsigned char) arg;
@@ -467,26 +669,69 @@ int vt_ioctl(struct tty_struct *tty,
 
         case KDSKBMODE:
                 if (!perm)
-                        return -EPERM;
-                ret = vt_do_kdskbmode(console, arg);
-                if (ret == 0)
-                        tty_ldisc_flush(tty);
+                        goto eperm;
+                switch(arg) {
+                  case K_RAW:
+                        kbd->kbdmode = VC_RAW;
+                        break;
+                  case K_MEDIUMRAW:
+                        kbd->kbdmode = VC_MEDIUMRAW;
+                        break;
+                  case K_XLATE:
+                        kbd->kbdmode = VC_XLATE;
+                        compute_shiftstate();
+                        break;
+                  case K_UNICODE:
+                        kbd->kbdmode = VC_UNICODE;
+                        compute_shiftstate();
+                        break;
+                  case K_OFF:
+                        kbd->kbdmode = VC_OFF;
+                        break;
+                  default:
+                        ret = -EINVAL;
+                        goto out;
+                }
+                tty_ldisc_flush(tty);
                 break;
 
         case KDGKBMODE:
-                uival = vt_do_kdgkbmode(console);
-                ret = put_user(uival, (int __user *)arg);
-                break;
+                switch (kbd->kbdmode) {
+                case VC_RAW:
+                        uival = K_RAW;
+                        break;
+                case VC_MEDIUMRAW:
+                        uival = K_MEDIUMRAW;
+                        break;
+                case VC_UNICODE:
+                        uival = K_UNICODE;
+                        break;
+                case VC_OFF:
+                        uival = K_OFF;
+                        break;
+                default:
+                        uival = K_XLATE;
+                        break;
+                }
+                goto setint;
 
         /* this could be folded into KDSKBMODE, but for compatibility
            reasons it is not so easy to fold KDGKBMETA into KDGKBMODE */
         case KDSKBMETA:
-                ret = vt_do_kdskbmeta(console, arg);
+                switch(arg) {
+                  case K_METABIT:
+                        clr_vc_kbd_mode(kbd, VC_META);
+                        break;
+                  case K_ESCPREFIX:
+                        set_vc_kbd_mode(kbd, VC_META);
+                        break;
+                  default:
+                        ret = -EINVAL;
+                }
                 break;
 
         case KDGKBMETA:
-                /* FIXME: should review whether this is worth locking */
-                uival = vt_do_kdgkbmeta(console);
+                uival = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
         setint:
                 ret = put_user(uival, (int __user *)arg);
                 break;
@@ -495,35 +740,133 @@ int vt_ioctl(struct tty_struct *tty,
         case KDSETKEYCODE:
                 if(!capable(CAP_SYS_TTY_CONFIG))
                         perm = 0;
-                ret = vt_do_kbkeycode_ioctl(cmd, up, perm);
+                ret = do_kbkeycode_ioctl(cmd, up, perm);
                 break;
 
         case KDGKBENT:
         case KDSKBENT:
-                ret = vt_do_kdsk_ioctl(cmd, up, perm, console);
+                ret = do_kdsk_ioctl(cmd, up, perm, kbd);
                 break;
 
         case KDGKBSENT:
         case KDSKBSENT:
-                ret = vt_do_kdgkb_ioctl(cmd, up, perm);
+                ret = do_kdgkb_ioctl(cmd, up, perm);
                 break;
 
-        /* Diacritical processing. Handled in keyboard.c as it has
-           to operate on the keyboard locks and structures */
         case KDGKBDIACR:
+        {
+                struct kbdiacrs __user *a = up;
+                struct kbdiacr diacr;
+                int i;
+
+                if (put_user(accent_table_size, &a->kb_cnt)) {
+                        ret = -EFAULT;
+                        break;
+                }
+                for (i = 0; i < accent_table_size; i++) {
+                        diacr.diacr = conv_uni_to_8bit(accent_table[i].diacr);
+                        diacr.base = conv_uni_to_8bit(accent_table[i].base);
+                        diacr.result = conv_uni_to_8bit(accent_table[i].result);
+                        if (copy_to_user(a->kbdiacr + i, &diacr, sizeof(struct kbdiacr))) {
+                                ret = -EFAULT;
+                                break;
+                        }
+                }
+                break;
+        }
         case KDGKBDIACRUC:
+        {
+                struct kbdiacrsuc __user *a = up;
+
+                if (put_user(accent_table_size, &a->kb_cnt))
+                        ret = -EFAULT;
+                else if (copy_to_user(a->kbdiacruc, accent_table,
+                                accent_table_size*sizeof(struct kbdiacruc)))
+                        ret = -EFAULT;
+                break;
+        }
+
         case KDSKBDIACR:
+        {
+                struct kbdiacrs __user *a = up;
+                struct kbdiacr diacr;
+                unsigned int ct;
+                int i;
+
+                if (!perm)
+                        goto eperm;
+                if (get_user(ct,&a->kb_cnt)) {
+                        ret = -EFAULT;
+                        break;
+                }
+                if (ct >= MAX_DIACR) {
+                        ret = -EINVAL;
+                        break;
+                }
+                accent_table_size = ct;
+                for (i = 0; i < ct; i++) {
+                        if (copy_from_user(&diacr, a->kbdiacr + i, sizeof(struct kbdiacr))) {
+                                ret = -EFAULT;
+                                break;
+                        }
+                        accent_table[i].diacr = conv_8bit_to_uni(diacr.diacr);
+                        accent_table[i].base = conv_8bit_to_uni(diacr.base);
+                        accent_table[i].result = conv_8bit_to_uni(diacr.result);
+                }
+                break;
+        }
+
         case KDSKBDIACRUC:
-                ret = vt_do_diacrit(cmd, up, perm);
+        {
+                struct kbdiacrsuc __user *a = up;
+                unsigned int ct;
+
+                if (!perm)
+                        goto eperm;
+                if (get_user(ct,&a->kb_cnt)) {
+                        ret = -EFAULT;
+                        break;
+                }
+                if (ct >= MAX_DIACR) {
+                        ret = -EINVAL;
+                        break;
+                }
+                accent_table_size = ct;
+                if (copy_from_user(accent_table, a->kbdiacruc, ct*sizeof(struct kbdiacruc)))
+                        ret = -EFAULT;
                 break;
+        }
 
         /* the ioctls below read/set the flags usually shown in the leds */
         /* don't use them - they will go away without warning */
         case KDGKBLED:
+                ucval = kbd->ledflagstate | (kbd->default_ledflagstate << 4);
+                goto setchar;
+
         case KDSKBLED:
+                if (!perm)
+                        goto eperm;
+                if (arg & ~0x77) {
+                        ret = -EINVAL;
+                        break;
+                }
+                kbd->ledflagstate = (arg & 7);
+                kbd->default_ledflagstate = ((arg >> 4) & 7);
+                set_leds();
+                break;
+
+        /* the ioctls below only set the lights, not the functions */
+        /* for those, see KDGKBLED and KDSKBLED above */
         case KDGETLED:
+                ucval = getledstate();
+        setchar:
+                ret = put_user(ucval, (char __user *)arg);
+                break;
+
         case KDSETLED:
-                ret = vt_do_kdskled(console, cmd, arg, perm);
+                if (!perm)
+                        goto eperm;
+                setledstate(kbd, arg);
                 break;
 
         /*
@@ -536,7 +879,7 @@ int vt_ioctl(struct tty_struct *tty,
         case KDSIGACCEPT:
         {
                 if (!perm || !capable(CAP_KILL))
-                        return -EPERM;
+                        goto eperm;
                 if (!valid_signal(arg) || arg < 1 || arg == SIGKILL)
                         ret = -EINVAL;
                 else {
@@ -554,7 +897,7 @@ int vt_ioctl(struct tty_struct *tty,
                 struct vt_mode tmp;
 
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 if (copy_from_user(&tmp, up, sizeof(struct vt_mode))) {
                         ret = -EFAULT;
                         goto out;
@@ -600,7 +943,6 @@ int vt_ioctl(struct tty_struct *tty,
                 struct vt_stat __user *vtstat = up;
                 unsigned short state, mask;
 
-                /* Review: FIXME: Console lock ? */
                 if (put_user(fg_console + 1, &vtstat->v_active))
                         ret = -EFAULT;
                 else {
@@ -618,7 +960,6 @@ int vt_ioctl(struct tty_struct *tty,
          * Returns the first available (non-opened) console.
          */
         case VT_OPENQRY:
-                /* FIXME: locking ? - but then this is a stupid API */
                 for (i = 0; i < MAX_NR_CONSOLES; ++i)
                         if (! VT_IS_IN_USE(i))
                                 break;
@@ -632,7 +973,7 @@ int vt_ioctl(struct tty_struct *tty,
          */
         case VT_ACTIVATE:
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 if (arg == 0 || arg > MAX_NR_CONSOLES)
                         ret =  -ENXIO;
                 else {
@@ -651,7 +992,7 @@ int vt_ioctl(struct tty_struct *tty,
                 struct vt_setactivate vsa;
 
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
 
                 if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
                                         sizeof(struct vt_setactivate))) {
@@ -679,7 +1020,6 @@ int vt_ioctl(struct tty_struct *tty,
                         if (ret)
                                 break;
                         /* Commence switch and lock */
-                        /* Review set_console locks */
                         set_console(vsa.console);
                 }
                 break;
@@ -690,7 +1030,7 @@ int vt_ioctl(struct tty_struct *tty,
          */
         case VT_WAITACTIVE:
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 if (arg == 0 || arg > MAX_NR_CONSOLES)
                         ret = -ENXIO;
                 else
@@ -709,17 +1049,16 @@ int vt_ioctl(struct tty_struct *tty,
          */
         case VT_RELDISP:
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
 
-                console_lock();
                 if (vc->vt_mode.mode != VT_PROCESS) {
-                        console_unlock();
                         ret = -EINVAL;
                         break;
                 }
                 /*
                  * Switching-from response
                  */
+                console_lock();
                 if (vc->vt_newvt >= 0) {
                         if (arg == 0)
                                 /*
@@ -796,7 +1135,7 @@ int vt_ioctl(struct tty_struct *tty,
 
                 ushort ll,cc;
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 if (get_user(ll, &vtsizes->v_rows) ||
                     get_user(cc, &vtsizes->v_cols))
                         ret = -EFAULT;
@@ -807,7 +1146,6 @@ int vt_ioctl(struct tty_struct *tty,
 
                                 if (vc) {
                                         vc->vc_resize_user = 1;
-                                        /* FIXME: review v tty lock */
                                         vc_resize(vc_cons[i].d, cc, ll);
                                 }
                         }
@@ -821,7 +1159,7 @@ int vt_ioctl(struct tty_struct *tty,
                 struct vt_consize __user *vtconsize = up;
                 ushort ll,cc,vlin,clin,vcol,ccol;
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 if (!access_ok(VERIFY_READ, vtconsize,
                                 sizeof(struct vt_consize))) {
                         ret = -EFAULT;
@@ -877,7 +1215,7 @@ int vt_ioctl(struct tty_struct *tty,
 
         case PIO_FONT: {
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 op.op = KD_FONT_OP_SET;
                 op.flags = KD_FONT_FLAG_OLD | KD_FONT_FLAG_DONT_RECALC; /* Compatibility */
                 op.width = 8;
@@ -918,7 +1256,7 @@ int vt_ioctl(struct tty_struct *tty,
         case PIO_FONTRESET:
         {
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
 
 #ifdef BROKEN_GRAPHICS_PROGRAMS
                 /* With BROKEN_GRAPHICS_PROGRAMS defined, the default
@@ -932,9 +1270,7 @@ int vt_ioctl(struct tty_struct *tty,
                 ret = con_font_op(vc_cons[fg_console].d, &op);
                 if (ret)
                         break;
-                console_lock();
                 con_set_default_unimap(vc_cons[fg_console].d);
-                console_unlock();
                 break;
                 }
 #endif
@@ -946,7 +1282,7 @@ int vt_ioctl(struct tty_struct *tty,
                         break;
                 }
                 if (!perm && op.op != KD_FONT_OP_GET)
-                        return -EPERM;
+                        goto eperm;
                 ret = con_font_op(vc, &op);
                 if (ret)
                         break;
@@ -980,7 +1316,7 @@ int vt_ioctl(struct tty_struct *tty,
         case PIO_UNIMAPCLR:
               { struct unimapinit ui;
                 if (!perm)
-                        return -EPERM;
+                        goto eperm;
                 ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
                 if (ret)
                         ret = -EFAULT;
@@ -996,12 +1332,12 @@ int vt_ioctl(struct tty_struct *tty,
 
         case VT_LOCKSWITCH:
                 if (!capable(CAP_SYS_TTY_CONFIG))
-                        return -EPERM;
+                        goto eperm;
                 vt_dont_switch = 1;
                 break;
         case VT_UNLOCKSWITCH:
                 if (!capable(CAP_SYS_TTY_CONFIG))
-                        return -EPERM;
+                        goto eperm;
                 vt_dont_switch = 0;
                 break;
         case VT_GETHIFONTMASK:
@@ -1015,13 +1351,17 @@ int vt_ioctl(struct tty_struct *tty,
                 ret = -ENOIOCTLCMD;
         }
 out:
+        tty_unlock();
         return ret;
+eperm:
+        ret = -EPERM;
+        goto out;
 }
 
 void reset_vc(struct vc_data *vc)
 {
         vc->vc_mode = KD_TEXT;
-        vt_reset_unicode(vc->vc_num);
+        kbd_table[vc->vc_num].kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
         vc->vt_mode.mode = VT_AUTO;
         vc->vt_mode.waitv = 0;
         vc->vt_mode.relsig = 0;
@@ -1044,7 +1384,6 @@ void vc_SAK(struct work_struct *work)
         console_lock();
         vc = vc_con->d;
         if (vc) {
-                /* FIXME: review tty ref counting */
                 tty = vc->port.tty;
                 /*
                  * SAK should also work in all raw modes and reset
@@ -1124,6 +1463,7 @@ compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
         if (!perm && op->op != KD_FONT_OP_GET)
                 return -EPERM;
         op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
+        op->flags |= KD_FONT_FLAG_OLD;
         i = con_font_op(vc, op);
         if (i)
                 return i;
@@ -1177,6 +1517,8 @@ long vt_compat_ioctl(struct tty_struct *tty,
 
         console = vc->vc_num;
 
+        tty_lock();
+
         if (!vc_cons_allocated(console)) {      /* impossible? */
                 ret = -ENOIOCTLCMD;
                 goto out;
@@ -1242,9 +1584,11 @@ long vt_compat_ioctl(struct tty_struct *tty,
                 goto fallback;
         }
 out:
+        tty_unlock();
         return ret;
 
 fallback:
+        tty_unlock();
         return vt_ioctl(tty, cmd, arg);
 }
 
@@ -1430,10 +1774,13 @@ int vt_move_to_console(unsigned int vt, int alloc)
                 return -EIO;
         }
         console_unlock();
+        tty_lock();
         if (vt_waitactive(vt + 1)) {
                 pr_debug("Suspend: Can't switch VCs.");
+                tty_unlock();
                 return -EINTR;
         }
+        tty_unlock();
         return prev;
 }