7 files changed, 57 insertions, 17 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0995430e4cf1..0ae9ced00ed4 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -299,6 +299,7 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
 
 static unsigned int serial_in(struct uart_8250_port *up, int offset)
 {
+        unsigned int tmp;
         offset = map_8250_in_reg(up, offset) << up->port.regshift;
 
         switch (up->port.iotype) {
@@ -317,6 +318,13 @@ static unsigned int serial_in(struct uart_8250_port *up, int offset)
                 return __raw_readl(up->port.membase + offset);
 #endif
 
+        case UPIO_TSI:
+                if (offset == UART_IIR) {
+                        tmp = readl((u32 *)(up->port.membase + UART_RX));
+                        return (cpu_to_le32(tmp) >> 8) & 0xff;
+                } else
+                        return readb(up->port.membase + offset);
+
         default:
                 return inb(up->port.iobase + offset);
         }
@@ -346,6 +354,10 @@ serial_out(struct uart_8250_port *up, int offset, int value)
                 __raw_writel(value, up->port.membase + offset);
                 break;
 #endif
+        case UPIO_TSI:
+                if (!((offset == UART_IER) && (value & UART_IER_UUE)))
+                        writeb(value, up->port.membase + offset);
+                break;
 
         default:
                 outb(value, up->port.iobase + offset);
@@ -2240,10 +2252,14 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 
         touch_nmi_watchdog();
 
-        if (oops_in_progress) {
-                locked = spin_trylock_irqsave(&up->port.lock, flags);
+        local_irq_save(flags);
+        if (up->port.sysrq) {
+                /* serial8250_handle_port() already took the lock */
+                locked = 0;
+        } else if (oops_in_progress) {
+                locked = spin_trylock(&up->port.lock);
         } else
-                spin_lock_irqsave(&up->port.lock, flags);
+                spin_lock(&up->port.lock);
 
         /*
          *      First save the IER then disable the interrupts
@@ -2265,7 +2281,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
         serial_out(up, UART_IER, ier);
 
         if (locked)
-                spin_unlock_irqrestore(&up->port.lock, flags);
+                spin_unlock(&up->port.lock);
+        local_irq_restore(flags);
 }
 
 static int serial8250_console_setup(struct console *co, char *options)
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index d119c8296a78..8a98aae80e22 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -673,7 +673,7 @@ static void dz_reset(struct dz_port *dport)
 }
 
 #ifdef CONFIG_SERIAL_DZ_CONSOLE
-static void dz_console_putchar(struct uart_port *port, int ch)
+static void dz_console_putchar(struct uart_port *uport, int ch)
 {
         struct dz_port *dport = (struct dz_port *)uport;
         unsigned long flags;
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 342042889f6e..5ff269fb604c 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -1143,9 +1143,8 @@ static void __init ip22zilog_prepare(void)
                 up[(chip * 2) + 1].port.fifosize = 1;
                 up[(chip * 2) + 1].port.ops = &ip22zilog_pops;
                 up[(chip * 2) + 1].port.type = PORT_IP22ZILOG;
-                up[(chip * 2) + 1].port.flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;
                 up[(chip * 2) + 1].port.line = (chip * 2) + 1;
-                up[(chip * 2) + 1].flags = 0;
+                up[(chip * 2) + 1].flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;
         }
 }
 
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index d5f636fbf29a..80ef7d482756 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2036,6 +2036,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
         case UPIO_MEM:
         case UPIO_MEM32:
         case UPIO_AU:
+        case UPIO_TSI:
                 snprintf(address, sizeof(address),
                          "MMIO 0x%lx", port->mapbase);
                 break;
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 0dbd4df44c05..979497f108c8 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -1052,7 +1052,7 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id *
         if (err)
                 return err;
 
-        err = sunsab_init_one(&up[0], op, 0,
+        err = sunsab_init_one(&up[1], op, 0,
                               (inst * 2) + 1);
         if (err) {
                 of_iounmap(up[0].port.membase,
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index f9013baba05b..d3a5aeee73a3 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1200,6 +1200,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
         if (up->port.type == PORT_UNKNOWN)
                 return -ENODEV;
 
+        printk("%s: %s port at %lx, irq %u\n",
+               to_of_device(up->port.dev)->node->full_name,
+               (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
+               up->port.mapbase, up->port.irq);
+
 #ifdef CONFIG_SERIO
         serio = &up->serio;
         serio->port_data = up;
@@ -1406,25 +1411,35 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
         struct device_node *dp = op->node;
         struct uart_sunsu_port *up;
         struct resource *rp;
+        enum su_type type;
         int err;
 
-        if (inst >= UART_NR)
-                return -EINVAL;
+        type = su_get_type(dp);
+        if (type == SU_PORT_PORT) {
+                if (inst >= UART_NR)
+                        return -EINVAL;
+                up = &sunsu_ports[inst];
+        } else {
+                up = kzalloc(sizeof(*up), GFP_KERNEL);
+                if (!up)
+                        return -ENOMEM;
+        }
 
-        up = &sunsu_ports[inst];
         up->port.line = inst;
 
         spin_lock_init(&up->port.lock);
 
-        up->su_type = su_get_type(dp);
+        up->su_type = type;
 
         rp = &op->resource[0];
-        up->port.mapbase = op->resource[0].start;
-
+        up->port.mapbase = rp->start;
         up->reg_size = (rp->end - rp->start) + 1;
         up->port.membase = of_ioremap(rp, 0, up->reg_size, "su");
-        if (!up->port.membase)
+        if (!up->port.membase) {
+                if (type != SU_PORT_PORT)
+                        kfree(up);
                 return -ENOMEM;
+        }
 
         up->port.irq = op->irqs[0];
 
@@ -1436,8 +1451,11 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
         err = 0;
         if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) {
                 err = sunsu_kbd_ms_init(up);
-                if (err)
+                if (err) {
+                        kfree(up);
                         goto out_unmap;
+                }
+                dev_set_drvdata(&op->dev, up);
 
                 return 0;
         }
@@ -1476,8 +1494,12 @@ static int __devexit su_remove(struct of_device *dev)
 #ifdef CONFIG_SERIO
                 serio_unregister_port(&up->serio);
 #endif
-        } else if (up->port.type != PORT_UNKNOWN)
+                kfree(up);
+        } else if (up->port.type != PORT_UNKNOWN) {
                 uart_remove_one_port(&sunsu_reg, &up->port);
+        }
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index e93d0edc2e08..6c8b0ea83c3c 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -38,6 +38,7 @@
 #include <linux/tty_flip.h>
 
 #include <asm/io.h>
+#include <asm/vr41xx/irq.h>
 #include <asm/vr41xx/siu.h>
 #include <asm/vr41xx/vr41xx.h>