8 files changed, 181 insertions, 35 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index f94109cbb46e..b8a4bd94f51d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2047,7 +2047,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
          * Oxford Semi 952 rev B workaround
          */
         if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
-                quot ++;
+                quot++;
 
         if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
                 if (baud < 2400)
@@ -2662,16 +2662,17 @@ static int __devinit serial8250_probe(struct platform_device *dev)
         memset(&port, 0, sizeof(struct uart_port));
 
         for (i = 0; p && p->flags != 0; p++, i++) {
-                port.iobase     = p->iobase;
-                port.membase    = p->membase;
-                port.irq        = p->irq;
-                port.uartclk    = p->uartclk;
-                port.regshift   = p->regshift;
-                port.iotype     = p->iotype;
-                port.flags      = p->flags;
-                port.mapbase    = p->mapbase;
-                port.hub6       = p->hub6;
-                port.dev        = &dev->dev;
+                port.iobase             = p->iobase;
+                port.membase            = p->membase;
+                port.irq                = p->irq;
+                port.uartclk            = p->uartclk;
+                port.regshift           = p->regshift;
+                port.iotype             = p->iotype;
+                port.flags              = p->flags;
+                port.mapbase            = p->mapbase;
+                port.hub6               = p->hub6;
+                port.private_data       = p->private_data;
+                port.dev                = &dev->dev;
                 if (share_irqs)
                         port.flags |= UPF_SHARE_IRQ;
                 ret = serial8250_register_port(&port);
@@ -2812,15 +2813,16 @@ int serial8250_register_port(struct uart_port *port)
         if (uart) {
                 uart_remove_one_port(&serial8250_reg, &uart->port);
 
-                uart->port.iobase   = port->iobase;
-                uart->port.membase  = port->membase;
-                uart->port.irq      = port->irq;
-                uart->port.uartclk  = port->uartclk;
-                uart->port.fifosize = port->fifosize;
-                uart->port.regshift = port->regshift;
-                uart->port.iotype   = port->iotype;
-                uart->port.flags    = port->flags | UPF_BOOT_AUTOCONF;
-                uart->port.mapbase  = port->mapbase;
+                uart->port.iobase       = port->iobase;
+                uart->port.membase      = port->membase;
+                uart->port.irq          = port->irq;
+                uart->port.uartclk      = port->uartclk;
+                uart->port.fifosize     = port->fifosize;
+                uart->port.regshift     = port->regshift;
+                uart->port.iotype       = port->iotype;
+                uart->port.flags        = port->flags | UPF_BOOT_AUTOCONF;
+                uart->port.mapbase      = port->mapbase;
+                uart->port.private_data = port->private_data;
                 if (port->dev)
                         uart->port.dev = port->dev;
 
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index ceb03c9e749f..0a4ac2b6eb5a 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -106,6 +106,32 @@ setup_port(struct serial_private *priv, struct uart_port *port,
 }
 
 /*
+ * ADDI-DATA GmbH communication cards <info@addi-data.com>
+ */
+static int addidata_apci7800_setup(struct serial_private *priv,
+                                struct pciserial_board *board,
+                                struct uart_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
  */
@@ -752,6 +778,16 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
  */
 static struct pci_serial_quirk pci_serial_quirks[] = {
         /*
+        * 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.
          */
@@ -1179,6 +1215,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                 .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,
@@ -2697,6 +2739,97 @@ static struct pci_device_id serial_pci_tbl[] = {
                 pbn_pasemi_1682M },
 
         /*
+        * 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 },
+
+        /*
          * These entries match devices with class COMMUNICATION_SERIAL,
          * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
          */
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 1de098e75497..6f09cbd7fc48 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -414,8 +414,9 @@ static int __devinit check_resources(struct pnp_option *option)
  */
 static int __devinit serial_pnp_guess_board(struct pnp_dev *dev, int *flags)
 {
-        if (!(check_name(pnp_dev_name(dev)) || (dev->card && check_name(dev->card->name))))
-                return -ENODEV;
+        if (!(check_name(pnp_dev_name(dev)) ||
+                (dev->card && check_name(dev->card->name))))
+                        return -ENODEV;
 
         if (check_resources(dev->independent))
                 return 0;
@@ -452,8 +453,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
                 return -ENODEV;
 
 #ifdef SERIAL_DEBUG_PNP
-        printk("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
-               port.iobase, port.mapbase, port.irq, port.iotype);
+        printk(KERN_DEBUG
+                "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
+                       port.iobase, port.mapbase, port.irq, port.iotype);
 #endif
 
         port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
diff --git a/drivers/serial/mcf.c b/drivers/serial/mcf.c
index 051fcc2f5ba8..e76fc72c9b36 100644
--- a/drivers/serial/mcf.c
+++ b/drivers/serial/mcf.c
@@ -434,7 +434,7 @@ static struct uart_ops mcf_uart_ops = {
 
 static struct mcf_uart mcf_ports[3];
 
-#define MCF_MAXPORTS    (sizeof(mcf_ports) / sizeof(struct mcf_uart))
+#define MCF_MAXPORTS    ARRAY_SIZE(mcf_ports)
 
 /****************************************************************************/
 #if defined(CONFIG_SERIAL_MCF_CONSOLE)
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 4d643c926657..cb3a91967742 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -612,6 +612,7 @@ static void mpsc_hw_init(struct mpsc_port_info *pi)
 
         /* No preamble, 16x divider, low-latency, */
         writel(0x04400400, pi->mpsc_base + MPSC_MMCRH);
+        mpsc_set_baudrate(pi, pi->default_baud);
 
         if (pi->mirror_regs) {
                 pi->MPSC_CHR_1_m = 0;
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index e773c8e14962..45de19366030 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1527,7 +1527,7 @@ static inline void s3c2440_serial_exit(void)
 #define s3c2440_uart_inf_at NULL
 #endif /* CONFIG_CPU_S3C2440 */
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 
 static int s3c2412_serial_setsource(struct uart_port *port,
                                      struct s3c24xx_uart_clksrc *clk)
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 3bb5d241dd40..276da148c57e 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -371,7 +371,8 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                  */
                 termios->c_cflag &= ~CBAUD;
                 if (old) {
-                        termios->c_cflag |= old->c_cflag & CBAUD;
+                        baud = tty_termios_baud_rate(old);
+                        tty_termios_encode_baud_rate(termios, baud, baud);
                         old = NULL;
                         continue;
                 }
@@ -380,7 +381,7 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                  * As a last resort, if the quotient is zero,
                  * default to 9600 bps
                  */
-                termios->c_cflag |= B9600;
+                tty_termios_encode_baud_rate(termios, 9600, 9600);
         }
 
         return 0;
@@ -1977,6 +1978,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
 
         if (state->info && state->info->flags & UIF_INITIALIZED) {
                 const struct uart_ops *ops = port->ops;
+                int tries;
 
                 state->info->flags = (state->info->flags & ~UIF_INITIALIZED)
                                      | UIF_SUSPENDED;
@@ -1990,9 +1992,14 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
                 /*
                  * Wait for the transmitter to empty.
                  */
-                while (!ops->tx_empty(port)) {
+                for (tries = 3; !ops->tx_empty(port) && tries; tries--) {
                         msleep(10);
                 }
+                if (!tries)
+                        printk(KERN_ERR "%s%s%s%d: Unable to drain transmitter\n",
+                               port->dev ? port->dev->bus_id : "",
+                               port->dev ? ": " : "",
+                               drv->dev_name, port->line);
 
                 ops->shutdown(port);
         }
@@ -2029,8 +2036,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
         }
         port->suspended = 0;
 
-        uart_change_pm(state, 0);
-
         /*
          * Re-enable the console device after suspending.
          */
@@ -2049,6 +2054,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                 if (state->info && state->info->tty && termios.c_cflag == 0)
                         termios = *state->info->tty->termios;
 
+                uart_change_pm(state, 0);
                 port->ops->set_termios(port, &termios, NULL);
                 console_start(port->cons);
         }
@@ -2057,6 +2063,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                 const struct uart_ops *ops = port->ops;
                 int ret;
 
+                uart_change_pm(state, 0);
                 ops->set_mctrl(port, 0);
                 ret = ops->startup(port);
                 if (ret == 0) {
@@ -2150,10 +2157,11 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
 
                 /*
                  * Ensure that the modem control lines are de-activated.
+                 * keep the DTR setting that is set in uart_set_options()
                  * We probably don't need a spinlock around this, but
                  */
                 spin_lock_irqsave(&port->lock, flags);
-                port->ops->set_mctrl(port, 0);
+                port->ops->set_mctrl(port, port->mctrl & TIOCM_DTR);
                 spin_unlock_irqrestore(&port->lock, flags);
 
                 /*
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index d8b660061c13..164d2a42eb59 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -389,7 +389,7 @@ static void serial_detach(struct pcmcia_device *link)
 /*====================================================================*/
 
 static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
-                        kio_addr_t iobase, int irq)
+                        unsigned int iobase, int irq)
 {
         struct uart_port port;
         int line;
@@ -456,7 +456,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
 
 static int simple_config(struct pcmcia_device *link)
 {
-        static const kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+        static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
         static const int size_table[2] = { 8, 16 };
         struct serial_info *info = link->priv;
         struct serial_cfg_mem *cfg_mem;
@@ -480,7 +480,7 @@ static int simple_config(struct pcmcia_device *link)
         /* If the card is already configured, look up the port and irq */
         i = pcmcia_get_configuration_info(link, &config);
         if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
-                kio_addr_t port = 0;
+                unsigned int port = 0;
                 if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
                         port = config.BasePort2;
                         info->slave = 1;