2 files changed, 25 insertions, 23 deletions

diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 2b97b80d6d7d..c7b5afeecaf2 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -6,6 +6,7 @@
 #include <linux/pci.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/serial_reg.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/prom.h>
@@ -47,6 +48,24 @@ static struct __initdata of_device_id legacy_serial_parents[] = {
 static unsigned int legacy_serial_count;
 static int legacy_serial_console = -1;
 
+static unsigned int tsi_serial_in(struct uart_port *p, int offset)
+{
+        unsigned int tmp;
+        offset = offset << p->regshift;
+        if (offset == UART_IIR) {
+                tmp = readl(p->membase + (UART_IIR & ~3));
+                return (tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
+        } else
+                return readb(p->membase + offset);
+}
+
+static void tsi_serial_out(struct uart_port *p, int offset, int value)
+{
+        offset = offset << p->regshift;
+        if (!((offset == UART_IER) && (value & UART_IER_UUE)))
+                writeb(value, p->membase + offset);
+}
+
 static int __init add_legacy_port(struct device_node *np, int want_index,
                                   int iotype, phys_addr_t base,
                                   phys_addr_t taddr, unsigned long irq,
@@ -102,6 +121,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
                 legacy_serial_ports[index].iobase = base;
         else
                 legacy_serial_ports[index].mapbase = base;
+
         legacy_serial_ports[index].iotype = iotype;
         legacy_serial_ports[index].uartclk = clock;
         legacy_serial_ports[index].irq = irq;
@@ -112,6 +132,11 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
         legacy_serial_infos[index].speed = spd ? be32_to_cpup(spd) : 0;
         legacy_serial_infos[index].irq_check_parent = irq_check_parent;
 
+        if (iotype == UPIO_TSI) {
+                legacy_serial_ports[index].serial_in = tsi_serial_in;
+                legacy_serial_ports[index].serial_out = tsi_serial_out;
+        }
+
         printk(KERN_DEBUG "Found legacy serial port %d for %s\n",
                index, np->full_name);
         printk(KERN_DEBUG "  %s=%llx, taddr=%llx, irq=%lx, clk=%d, speed=%d\n",
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index 7f50999eebc2..610b8e63710d 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -443,24 +443,6 @@ static void au_serial_out(struct uart_port *p, int offset, int value)
         __raw_writel(value, p->membase + offset);
 }
 
-static unsigned int tsi_serial_in(struct uart_port *p, int offset)
-{
-        unsigned int tmp;
-        offset = map_8250_in_reg(p, offset) << p->regshift;
-        if (offset == UART_IIR) {
-                tmp = readl(p->membase + (UART_IIR & ~3));
-                return (tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
-        } else
-                return readb(p->membase + offset);
-}
-
-static void tsi_serial_out(struct uart_port *p, int offset, int value)
-{
-        offset = map_8250_out_reg(p, offset) << p->regshift;
-        if (!((offset == UART_IER) && (value & UART_IER_UUE)))
-                writeb(value, p->membase + offset);
-}
-
 /* Save the LCR value so it can be re-written when a Busy Detect IRQ occurs. */
 static inline void dwapb_save_out_value(struct uart_port *p, int offset,
                                         int value)
@@ -535,11 +517,6 @@ static void set_io_from_upio(struct uart_port *p)
                 p->serial_out = au_serial_out;
                 break;
 
-        case UPIO_TSI:
-                p->serial_in = tsi_serial_in;
-                p->serial_out = tsi_serial_out;
-                break;
-
         case UPIO_DWAPB:
                 p->serial_in = mem_serial_in;
                 p->serial_out = dwapb_serial_out;