15 files changed, 240 insertions, 87 deletions

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 24661cd5e4fb..768612f8e41e 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -2649,7 +2649,7 @@ static int __init rs_360_init(void)
                                 sup->tfcr = SMC_EB;
 
                                 /* Set this to 1 for now, so we get single
-                                 * character interrupts.  Using idle charater
+                                 * character interrupts.  Using idle character
                                  * time requires some additional tuning.
                                  */
                                 sup->mrblr = 1;
@@ -2728,7 +2728,7 @@ static int __init rs_360_init(void)
                                 up->tfcr = SMC_EB;
 
                                 /* Set this to 1 for now, so we get single
-                                 * character interrupts.  Using idle charater
+                                 * character interrupts.  Using idle character
                                  * time requires some additional tuning.
                                  */
                                 up->mrblr = 1;
@@ -2886,7 +2886,7 @@ int serial_console_setup( struct console *co, char *options)
                 sup->tfcr = SMC_EB;
 
                 /* Set this to 1 for now, so we get single
-                 * character interrupts.  Using idle charater
+                 * character interrupts.  Using idle character
                  * time requires some additional tuning.
                  */
                 sup->mrblr = 1;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 891e1dd65f24..09ef57034c9c 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -302,7 +302,7 @@ static const struct serial8250_config uart_config[] = {
         },
 };
 
-#if defined (CONFIG_SERIAL_8250_AU1X00)
+#if defined(CONFIG_MIPS_ALCHEMY)
 
 /* Au1x00 UART hardware has a weird register layout */
 static const u8 au_io_in_map[] = {
@@ -422,7 +422,6 @@ static unsigned int mem32_serial_in(struct uart_port *p, int offset)
         return readl(p->membase + offset);
 }
 
-#ifdef CONFIG_SERIAL_8250_AU1X00
 static unsigned int au_serial_in(struct uart_port *p, int offset)
 {
         offset = map_8250_in_reg(p, offset) << p->regshift;
@@ -434,7 +433,6 @@ static void au_serial_out(struct uart_port *p, int offset, int value)
         offset = map_8250_out_reg(p, offset) << p->regshift;
         __raw_writel(value, p->membase + offset);
 }
-#endif
 
 static unsigned int tsi_serial_in(struct uart_port *p, int offset)
 {
@@ -503,12 +501,11 @@ static void set_io_from_upio(struct uart_port *p)
                 p->serial_out = mem32_serial_out;
                 break;
 
-#ifdef CONFIG_SERIAL_8250_AU1X00
         case UPIO_AU:
                 p->serial_in = au_serial_in;
                 p->serial_out = au_serial_out;
                 break;
-#endif
+
         case UPIO_TSI:
                 p->serial_in = tsi_serial_in;
                 p->serial_out = tsi_serial_out;
@@ -535,9 +532,7 @@ serial_out_sync(struct uart_8250_port *up, int offset, int value)
         switch (p->iotype) {
         case UPIO_MEM:
         case UPIO_MEM32:
-#ifdef CONFIG_SERIAL_8250_AU1X00
         case UPIO_AU:
-#endif
         case UPIO_DWAPB:
                 p->serial_out(p, offset, value);
                 p->serial_in(p, UART_LCR);      /* safe, no side-effects */
@@ -573,7 +568,7 @@ static inline void _serial_dl_write(struct uart_8250_port *up, int value)
         serial_outp(up, UART_DLM, value >> 8 & 0xff);
 }
 
-#if defined(CONFIG_SERIAL_8250_AU1X00)
+#if defined(CONFIG_MIPS_ALCHEMY)
 /* Au1x00 haven't got a standard divisor latch */
 static int serial_dl_read(struct uart_8250_port *up)
 {
@@ -2596,11 +2591,9 @@ static void serial8250_config_port(struct uart_port *port, int flags)
         if (flags & UART_CONFIG_TYPE)
                 autoconfig(up, probeflags);
 
-#ifdef CONFIG_SERIAL_8250_AU1X00
         /* if access method is AU, it is a 16550 with a quirk */
         if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
                 up->bugs |= UART_BUG_NOMSR;
-#endif
 
         if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
                 autoconfig_irq(up);
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 8b23165bc5dc..e437ce8c1748 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -258,14 +258,6 @@ config SERIAL_8250_ACORN
           system, say Y to this option.  The driver can handle 1, 2, or 3 port
           cards.  If unsure, say N.
 
-config SERIAL_8250_AU1X00
-        bool "Au1x00 serial port support"
-        depends on SERIAL_8250 != n && SOC_AU1X00
-        help
-          If you have an Au1x00 SOC based board and want to use the serial port,
-          say Y to this option. The driver can handle up to 4 serial ports,
-          depending on the SOC. If unsure, say N.
-
 config SERIAL_8250_RM9K
         bool "Support for MIPS RM9xxx integrated serial port"
         depends on SERIAL_8250 != n && SERIAL_RM9000
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index b09a638d051f..50441ffe8e38 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -782,7 +782,7 @@ static int pl010_resume(struct amba_device *dev)
         return 0;
 }
 
-static struct amba_id pl010_ids[] __initdata = {
+static struct amba_id pl010_ids[] = {
         {
                 .id     = 0x00041010,
                 .mask   = 0x000fffff,
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index eb4cb480b93e..6ca7a44f29c2 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -69,9 +69,12 @@
 struct uart_amba_port {
         struct uart_port        port;
         struct clk              *clk;
-        unsigned int            im;     /* interrupt mask */
+        unsigned int            im;             /* interrupt mask */
         unsigned int            old_status;
-        unsigned int            ifls;   /* vendor-specific */
+        unsigned int            ifls;           /* vendor-specific */
+        unsigned int            lcrh_tx;        /* vendor-specific */
+        unsigned int            lcrh_rx;        /* vendor-specific */
+        bool                    oversampling;   /* vendor-specific */
         bool                    autorts;
 };
 
@@ -79,16 +82,25 @@ struct uart_amba_port {
 struct vendor_data {
         unsigned int            ifls;
         unsigned int            fifosize;
+        unsigned int            lcrh_tx;
+        unsigned int            lcrh_rx;
+        bool                    oversampling;
 };
 
 static struct vendor_data vendor_arm = {
         .ifls                   = UART011_IFLS_RX4_8|UART011_IFLS_TX4_8,
         .fifosize               = 16,
+        .lcrh_tx                = UART011_LCRH,
+        .lcrh_rx                = UART011_LCRH,
+        .oversampling           = false,
 };
 
 static struct vendor_data vendor_st = {
         .ifls                   = UART011_IFLS_RX_HALF|UART011_IFLS_TX_HALF,
         .fifosize               = 64,
+        .lcrh_tx                = ST_UART011_LCRH_TX,
+        .lcrh_rx                = ST_UART011_LCRH_RX,
+        .oversampling           = true,
 };
 
 static void pl011_stop_tx(struct uart_port *port)
@@ -327,12 +339,12 @@ static void pl011_break_ctl(struct uart_port *port, int break_state)
         unsigned int lcr_h;
 
         spin_lock_irqsave(&uap->port.lock, flags);
-        lcr_h = readw(uap->port.membase + UART011_LCRH);
+        lcr_h = readw(uap->port.membase + uap->lcrh_tx);
         if (break_state == -1)
                 lcr_h |= UART01x_LCRH_BRK;
         else
                 lcr_h &= ~UART01x_LCRH_BRK;
-        writew(lcr_h, uap->port.membase + UART011_LCRH);
+        writew(lcr_h, uap->port.membase + uap->lcrh_tx);
         spin_unlock_irqrestore(&uap->port.lock, flags);
 }
 
@@ -393,7 +405,17 @@ static int pl011_startup(struct uart_port *port)
         writew(cr, uap->port.membase + UART011_CR);
         writew(0, uap->port.membase + UART011_FBRD);
         writew(1, uap->port.membase + UART011_IBRD);
-        writew(0, uap->port.membase + UART011_LCRH);
+        writew(0, uap->port.membase + uap->lcrh_rx);
+        if (uap->lcrh_tx != uap->lcrh_rx) {
+                int i;
+                /*
+                 * Wait 10 PCLKs before writing LCRH_TX register,
+                 * to get this delay write read only register 10 times
+                 */
+                for (i = 0; i < 10; ++i)
+                        writew(0xff, uap->port.membase + UART011_MIS);
+                writew(0, uap->port.membase + uap->lcrh_tx);
+        }
         writew(0, uap->port.membase + UART01x_DR);
         while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
                 barrier();
@@ -422,10 +444,19 @@ static int pl011_startup(struct uart_port *port)
         return retval;
 }
 
+static void pl011_shutdown_channel(struct uart_amba_port *uap,
+                                        unsigned int lcrh)
+{
+      unsigned long val;
+
+      val = readw(uap->port.membase + lcrh);
+      val &= ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN);
+      writew(val, uap->port.membase + lcrh);
+}
+
 static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
-        unsigned long val;
 
         /*
          * disable all interrupts
@@ -450,9 +481,9 @@ static void pl011_shutdown(struct uart_port *port)
         /*
          * disable break condition and fifos
          */
-        val = readw(uap->port.membase + UART011_LCRH);
-        val &= ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN);
-        writew(val, uap->port.membase + UART011_LCRH);
+        pl011_shutdown_channel(uap, uap->lcrh_rx);
+        if (uap->lcrh_rx != uap->lcrh_tx)
+                pl011_shutdown_channel(uap, uap->lcrh_tx);
 
         /*
          * Shut down the clock producer
@@ -472,8 +503,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
         /*
          * Ask the core to calculate the divisor for us.
          */
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
-        quot = port->uartclk * 4 / baud;
+        baud = uart_get_baud_rate(port, termios, old, 0,
+                                  port->uartclk/(uap->oversampling ? 8 : 16));
+
+        if (baud > port->uartclk/16)
+                quot = DIV_ROUND_CLOSEST(port->uartclk * 8, baud);
+        else
+                quot = DIV_ROUND_CLOSEST(port->uartclk * 4, baud);
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
@@ -552,6 +588,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
                 uap->autorts = false;
         }
 
+        if (uap->oversampling) {
+                if (baud > port->uartclk/16)
+                        old_cr |= ST_UART011_CR_OVSFACT;
+                else
+                        old_cr &= ~ST_UART011_CR_OVSFACT;
+        }
+
         /* Set baud rate */
         writew(quot & 0x3f, port->membase + UART011_FBRD);
         writew(quot >> 6, port->membase + UART011_IBRD);
@@ -561,7 +604,17 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
          * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
          * ----------^----------^----------^----------^-----
          */
-        writew(lcr_h, port->membase + UART011_LCRH);
+        writew(lcr_h, port->membase + uap->lcrh_rx);
+        if (uap->lcrh_rx != uap->lcrh_tx) {
+                int i;
+                /*
+                 * Wait 10 PCLKs before writing LCRH_TX register,
+                 * to get this delay write read only register 10 times
+                 */
+                for (i = 0; i < 10; ++i)
+                        writew(0xff, uap->port.membase + UART011_MIS);
+                writew(lcr_h, port->membase + uap->lcrh_tx);
+        }
         writew(old_cr, port->membase + UART011_CR);
 
         spin_unlock_irqrestore(&port->lock, flags);
@@ -688,7 +741,7 @@ pl011_console_get_options(struct uart_amba_port *uap, int *baud,
         if (readw(uap->port.membase + UART011_CR) & UART01x_CR_UARTEN) {
                 unsigned int lcr_h, ibrd, fbrd;
 
-                lcr_h = readw(uap->port.membase + UART011_LCRH);
+                lcr_h = readw(uap->port.membase + uap->lcrh_tx);
 
                 *parity = 'n';
                 if (lcr_h & UART01x_LCRH_PEN) {
@@ -707,6 +760,12 @@ pl011_console_get_options(struct uart_amba_port *uap, int *baud,
                 fbrd = readw(uap->port.membase + UART011_FBRD);
 
                 *baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
+
+                if (uap->oversampling) {
+                        if (readw(uap->port.membase + UART011_CR)
+                                  & ST_UART011_CR_OVSFACT)
+                                *baud *= 2;
+                }
         }
 }
 
@@ -800,6 +859,9 @@ static int pl011_probe(struct amba_device *dev, struct amba_id *id)
         }
 
         uap->ifls = vendor->ifls;
+        uap->lcrh_rx = vendor->lcrh_rx;
+        uap->lcrh_tx = vendor->lcrh_tx;
+        uap->oversampling = vendor->oversampling;
         uap->port.dev = &dev->dev;
         uap->port.mapbase = dev->res.start;
         uap->port.membase = base;
@@ -868,7 +930,7 @@ static int pl011_resume(struct amba_device *dev)
 }
 #endif
 
-static struct amba_id pl011_ids[] __initdata = {
+static struct amba_id pl011_ids[] = {
         {
                 .id     = 0x00041011,
                 .mask   = 0x000fffff,
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index cd6cf575902e..6016179db533 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -852,7 +852,7 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo)
          */
         cpm_set_smc_fcr(up);
 
-        /* Using idle charater time requires some additional tuning.  */
+        /* Using idle character time requires some additional tuning.  */
         out_be16(&up->smc_mrblr, pinfo->rx_fifosize);
         out_be16(&up->smc_maxidl, pinfo->rx_fifosize);
         out_be16(&up->smc_brklen, 0);
diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
index a9a94ae72349..39f9a1adaa75 100644
--- a/drivers/serial/kgdboc.c
+++ b/drivers/serial/kgdboc.c
@@ -17,6 +17,7 @@
 #include <linux/kdb.h>
 #include <linux/tty.h>
 #include <linux/console.h>
+#include <linux/vt_kern.h>
 
 #define MAX_CONFIG_LEN          40
 
@@ -31,6 +32,7 @@ static struct kparam_string kps = {
         .maxlen                 = MAX_CONFIG_LEN,
 };
 
+static int kgdboc_use_kms;  /* 1 if we use kernel mode switching */
 static struct tty_driver        *kgdb_tty_driver;
 static int                      kgdb_tty_line;
 
@@ -104,6 +106,12 @@ static int configure_kgdboc(void)
         kgdboc_io_ops.is_console = 0;
         kgdb_tty_driver = NULL;
 
+        kgdboc_use_kms = 0;
+        if (strncmp(cptr, "kms,", 4) == 0) {
+                cptr += 4;
+                kgdboc_use_kms = 1;
+        }
+
         if (kgdboc_register_kbd(&cptr))
                 goto do_register;
 
@@ -201,8 +209,14 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
         return configure_kgdboc();
 }
 
+static int dbg_restore_graphics;
+
 static void kgdboc_pre_exp_handler(void)
 {
+        if (!dbg_restore_graphics && kgdboc_use_kms) {
+                dbg_restore_graphics = 1;
+                con_debug_enter(vc_cons[fg_console].d);
+        }
         /* Increment the module count when the debugger is active */
         if (!kgdb_connected)
                 try_module_get(THIS_MODULE);
@@ -213,6 +227,10 @@ static void kgdboc_post_exp_handler(void)
         /* decrement the module count when the debugger detaches */
         if (!kgdb_connected)
                 module_put(THIS_MODULE);
+        if (kgdboc_use_kms && dbg_restore_graphics) {
+                dbg_restore_graphics = 0;
+                con_debug_leave();
+        }
 }
 
 static struct kgdb_io kgdboc_io_ops = {
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 84a35f699016..1a88b363005c 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -113,7 +113,9 @@ struct psc_ops {
         unsigned char   (*read_char)(struct uart_port *port);
         void            (*cw_disable_ints)(struct uart_port *port);
         void            (*cw_restore_ints)(struct uart_port *port);
-        unsigned long   (*getuartclk)(void *p);
+        unsigned int    (*set_baudrate)(struct uart_port *port,
+                                        struct ktermios *new,
+                                        struct ktermios *old);
         int             (*clock)(struct uart_port *port, int enable);
         int             (*fifoc_init)(void);
         void            (*fifoc_uninit)(void);
@@ -121,6 +123,16 @@ struct psc_ops {
         irqreturn_t     (*handle_irq)(struct uart_port *port);
 };
 
+/* setting the prescaler and divisor reg is common for all chips */
+static inline void mpc52xx_set_divisor(struct mpc52xx_psc __iomem *psc,
+                                       u16 prescaler, unsigned int divisor)
+{
+        /* select prescaler */
+        out_be16(&psc->mpc52xx_psc_clock_select, prescaler);
+        out_8(&psc->ctur, divisor >> 8);
+        out_8(&psc->ctlr, divisor & 0xff);
+}
+
 #ifdef CONFIG_PPC_MPC52xx
 #define FIFO_52xx(port) ((struct mpc52xx_psc_fifo __iomem *)(PSC(port)+1))
 static void mpc52xx_psc_fifo_init(struct uart_port *port)
@@ -128,9 +140,6 @@ static void mpc52xx_psc_fifo_init(struct uart_port *port)
         struct mpc52xx_psc __iomem *psc = PSC(port);
         struct mpc52xx_psc_fifo __iomem *fifo = FIFO_52xx(port);
 
-        /* /32 prescaler */
-        out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00);
-
         out_8(&fifo->rfcntl, 0x00);
         out_be16(&fifo->rfalarm, 0x1ff);
         out_8(&fifo->tfcntl, 0x07);
@@ -219,15 +228,47 @@ static void mpc52xx_psc_cw_restore_ints(struct uart_port *port)
         out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
 }
 
-/* Search for bus-frequency property in this node or a parent */
-static unsigned long mpc52xx_getuartclk(void *p)
+static unsigned int mpc5200_psc_set_baudrate(struct uart_port *port,
+                                             struct ktermios *new,
+                                             struct ktermios *old)
 {
-        /*
-         * 5200 UARTs have a / 32 prescaler
-         * but the generic serial code assumes 16
-         * so return ipb freq / 2
-         */
-        return mpc5xxx_get_bus_frequency(p) / 2;
+        unsigned int baud;
+        unsigned int divisor;
+
+        /* The 5200 has a fixed /32 prescaler, uartclk contains the ipb freq */
+        baud = uart_get_baud_rate(port, new, old,
+                                  port->uartclk / (32 * 0xffff) + 1,
+                                  port->uartclk / 32);
+        divisor = (port->uartclk + 16 * baud) / (32 * baud);
+
+        /* enable the /32 prescaler and set the divisor */
+        mpc52xx_set_divisor(PSC(port), 0xdd00, divisor);
+        return baud;
+}
+
+static unsigned int mpc5200b_psc_set_baudrate(struct uart_port *port,
+                                              struct ktermios *new,
+                                              struct ktermios *old)
+{
+        unsigned int baud;
+        unsigned int divisor;
+        u16 prescaler;
+
+        /* The 5200B has a selectable /4 or /32 prescaler, uartclk contains the
+         * ipb freq */
+        baud = uart_get_baud_rate(port, new, old,
+                                  port->uartclk / (32 * 0xffff) + 1,
+                                  port->uartclk / 4);
+        divisor = (port->uartclk + 2 * baud) / (4 * baud);
+
+        /* select the proper prescaler and set the divisor */
+        if (divisor > 0xffff) {
+                divisor = (divisor + 4) / 8;
+                prescaler = 0xdd00; /* /32 */
+        } else
+                prescaler = 0xff00; /* /4 */
+        mpc52xx_set_divisor(PSC(port), prescaler, divisor);
+        return baud;
 }
 
 static void mpc52xx_psc_get_irq(struct uart_port *port, struct device_node *np)
@@ -258,7 +299,28 @@ static struct psc_ops mpc52xx_psc_ops = {
         .read_char = mpc52xx_psc_read_char,
         .cw_disable_ints = mpc52xx_psc_cw_disable_ints,
         .cw_restore_ints = mpc52xx_psc_cw_restore_ints,
-        .getuartclk = mpc52xx_getuartclk,
+        .set_baudrate = mpc5200_psc_set_baudrate,
+        .get_irq = mpc52xx_psc_get_irq,
+        .handle_irq = mpc52xx_psc_handle_irq,
+};
+
+static struct psc_ops mpc5200b_psc_ops = {
+        .fifo_init = mpc52xx_psc_fifo_init,
+        .raw_rx_rdy = mpc52xx_psc_raw_rx_rdy,
+        .raw_tx_rdy = mpc52xx_psc_raw_tx_rdy,
+        .rx_rdy = mpc52xx_psc_rx_rdy,
+        .tx_rdy = mpc52xx_psc_tx_rdy,
+        .tx_empty = mpc52xx_psc_tx_empty,
+        .stop_rx = mpc52xx_psc_stop_rx,
+        .start_tx = mpc52xx_psc_start_tx,
+        .stop_tx = mpc52xx_psc_stop_tx,
+        .rx_clr_irq = mpc52xx_psc_rx_clr_irq,
+        .tx_clr_irq = mpc52xx_psc_tx_clr_irq,
+        .write_char = mpc52xx_psc_write_char,
+        .read_char = mpc52xx_psc_read_char,
+        .cw_disable_ints = mpc52xx_psc_cw_disable_ints,
+        .cw_restore_ints = mpc52xx_psc_cw_restore_ints,
+        .set_baudrate = mpc5200b_psc_set_baudrate,
         .get_irq = mpc52xx_psc_get_irq,
         .handle_irq = mpc52xx_psc_handle_irq,
 };
@@ -392,9 +454,35 @@ static void mpc512x_psc_cw_restore_ints(struct uart_port *port)
         out_be32(&FIFO_512x(port)->rximr, port->read_status_mask & 0x7f);
 }
 
-static unsigned long mpc512x_getuartclk(void *p)
+static unsigned int mpc512x_psc_set_baudrate(struct uart_port *port,
+                                             struct ktermios *new,
+                                             struct ktermios *old)
 {
-        return mpc5xxx_get_bus_frequency(p);
+        unsigned int baud;
+        unsigned int divisor;
+
+        /*
+         * The "MPC5121e Microcontroller Reference Manual, Rev. 3" says on
+         * pg. 30-10 that the chip supports a /32 and a /10 prescaler.
+         * Furthermore, it states that "After reset, the prescaler by 10
+         * for the UART mode is selected", but the reset register value is
+         * 0x0000 which means a /32 prescaler. This is wrong.
+         *
+         * In reality using /32 prescaler doesn't work, as it is not supported!
+         * Use /16 or /10 prescaler, see "MPC5121e Hardware Design Guide",
+         * Chapter 4.1 PSC in UART Mode.
+         * Calculate with a /16 prescaler here.
+         */
+
+        /* uartclk contains the ips freq */
+        baud = uart_get_baud_rate(port, new, old,
+                                  port->uartclk / (16 * 0xffff) + 1,
+                                  port->uartclk / 16);
+        divisor = (port->uartclk + 8 * baud) / (16 * baud);
+
+        /* enable the /16 prescaler and set the divisor */
+        mpc52xx_set_divisor(PSC(port), 0xdd00, divisor);
+        return baud;
 }
 
 /* Init PSC FIFO Controller */
@@ -498,7 +586,7 @@ static struct psc_ops mpc512x_psc_ops = {
         .read_char = mpc512x_psc_read_char,
         .cw_disable_ints = mpc512x_psc_cw_disable_ints,
         .cw_restore_ints = mpc512x_psc_cw_restore_ints,
-        .getuartclk = mpc512x_getuartclk,
+        .set_baudrate = mpc512x_psc_set_baudrate,
         .clock = mpc512x_psc_clock,
         .fifoc_init = mpc512x_psc_fifoc_init,
         .fifoc_uninit = mpc512x_psc_fifoc_uninit,
@@ -666,8 +754,8 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
         struct mpc52xx_psc __iomem *psc = PSC(port);
         unsigned long flags;
         unsigned char mr1, mr2;
-        unsigned short ctr;
-        unsigned int j, baud, quot;
+        unsigned int j;
+        unsigned int baud;
 
         /* Prepare what we're gonna write */
         mr1 = 0;
@@ -704,16 +792,9 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
                 mr2 |= MPC52xx_PSC_MODE_TXCTS;
         }
 
-        baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
-        quot = uart_get_divisor(port, baud);
-        ctr = quot & 0xffff;
-
         /* Get the lock */
         spin_lock_irqsave(&port->lock, flags);
 
-        /* Update the per-port timeout */
-        uart_update_timeout(port, new->c_cflag, baud);
-
         /* Do our best to flush TX & RX, so we don't lose anything */
         /* But we don't wait indefinitely ! */
         j = 5000000;    /* Maximum wait */
@@ -737,8 +818,10 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
         out_8(&psc->command, MPC52xx_PSC_SEL_MODE_REG_1);
         out_8(&psc->mode, mr1);
         out_8(&psc->mode, mr2);
-        out_8(&psc->ctur, ctr >> 8);
-        out_8(&psc->ctlr, ctr & 0xff);
+        baud = psc_ops->set_baudrate(port, new, old);
+
+        /* Update the per-port timeout */
+        uart_update_timeout(port, new->c_cflag, baud);
 
         if (UART_ENABLE_MS(port, new->c_cflag))
                 mpc52xx_uart_enable_ms(port);
@@ -1118,7 +1201,7 @@ mpc52xx_console_setup(struct console *co, char *options)
                 return ret;
         }
 
-        uartclk = psc_ops->getuartclk(np);
+        uartclk = mpc5xxx_get_bus_frequency(np);
         if (uartclk == 0) {
                 pr_debug("Could not find uart clock frequency!\n");
                 return -EINVAL;
@@ -1201,6 +1284,7 @@ static struct uart_driver mpc52xx_uart_driver = {
 
 static struct of_device_id mpc52xx_uart_of_match[] = {
 #ifdef CONFIG_PPC_MPC52xx
+        { .compatible = "fsl,mpc5200b-psc-uart", .data = &mpc5200b_psc_ops, },
         { .compatible = "fsl,mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },
         /* binding used by old lite5200 device trees: */
         { .compatible = "mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },
@@ -1233,7 +1317,10 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
         pr_debug("Found %s assigned to ttyPSC%x\n",
                  mpc52xx_uart_nodes[idx]->full_name, idx);
 
-        uartclk = psc_ops->getuartclk(op->dev.of_node);
+        /* set the uart clock to the input clock of the psc, the different
+         * prescalers are taken into account in the set_baudrate() methods
+         * of the respective chip */
+        uartclk = mpc5xxx_get_bus_frequency(op->dev.of_node);
         if (uartclk == 0) {
                 dev_dbg(&op->dev, "Could not find uart clock frequency!\n");
                 return -EINVAL;
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index 3c02fa96f282..e65b0d9202a5 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -81,7 +81,7 @@ nwpserial_console_write(struct console *co, const char *s, unsigned int count)
 
         uart_console_write(&up->port, s, count, nwpserial_console_putchar);
 
-        /* wait for transmitter to become emtpy */
+        /* wait for transmitter to become empty */
         while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0)
                 cpu_relax();
 
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 9794e0cd3dcc..7e5e5efea4e2 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -470,7 +470,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
         }
 
         if (port->sc_port.state) {
-                /* The serial_core stuffs are initilized, use them */
+                /* The serial_core stuffs are initialized, use them */
                 tty = port->sc_port.state->port.tty;
         }
         else {
@@ -551,11 +551,11 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
         BUG_ON(!port->sc_is_asynch);
 
         if (port->sc_port.state) {
-                /* We're initilized, using serial core infrastructure */
+                /* We're initialized, using serial core infrastructure */
                 xmit = &port->sc_port.state->xmit;
         } else {
                 /* Probably sn_sal_switch_to_asynch has been run but serial core isn't
-                 * initilized yet.  Just return.  Writes are going through
+                 * initialized yet.  Just return.  Writes are going through
                  * sn_sal_console_write (due to register_console) at this time.
                  */
                 return;
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 890f91742962..a779e22d213e 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -525,7 +525,7 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
         unsigned long minor;
         int err;
 
-        if (op->irqs[0] == 0xffffffff)
+        if (op->archdata.irqs[0] == 0xffffffff)
                 return -ENODEV;
 
         port = kzalloc(sizeof(struct uart_port), GFP_KERNEL);
@@ -557,7 +557,7 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
 
         port->membase = (unsigned char __iomem *) __pa(port);
 
-        port->irq = op->irqs[0];
+        port->irq = op->archdata.irqs[0];
 
         port->dev = &op->dev;
 
@@ -644,12 +644,12 @@ static int __init sunhv_init(void)
         if (tlb_type != hypervisor)
                 return -ENODEV;
 
-        return of_register_driver(&hv_driver, &of_bus_type);
+        return of_register_platform_driver(&hv_driver);
 }
 
 static void __exit sunhv_exit(void)
 {
-        of_unregister_driver(&hv_driver);
+        of_unregister_platform_driver(&hv_driver);
 }
 
 module_init(sunhv_init);
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 5e81bc6b48b0..9845fb1cfb1f 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -969,7 +969,7 @@ static int __devinit sunsab_init_one(struct uart_sunsab_port *up,
                 return -ENOMEM;
         up->regs = (union sab82532_async_regs __iomem *) up->port.membase;
 
-        up->port.irq = op->irqs[0];
+        up->port.irq = op->archdata.irqs[0];
 
         up->port.fifosize = SAB82532_XMIT_FIFO_SIZE;
         up->port.iotype = UPIO_MEM;
@@ -1130,12 +1130,12 @@ static int __init sunsab_init(void)
                 }
         }
 
-        return of_register_driver(&sab_driver, &of_bus_type);
+        return of_register_platform_driver(&sab_driver);
 }
 
 static void __exit sunsab_exit(void)
 {
-        of_unregister_driver(&sab_driver);
+        of_unregister_platform_driver(&sab_driver);
         if (sunsab_reg.nr) {
                 sunserial_unregister_minors(&sunsab_reg, sunsab_reg.nr);
         }
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index ffbf4553f665..3cdf74822db5 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1443,7 +1443,7 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
                 return -ENOMEM;
         }
 
-        up->port.irq = op->irqs[0];
+        up->port.irq = op->archdata.irqs[0];
 
         up->port.dev = &op->dev;
 
@@ -1586,7 +1586,7 @@ static int __init sunsu_init(void)
                         return err;
         }
 
-        err = of_register_driver(&su_driver, &of_bus_type);
+        err = of_register_platform_driver(&su_driver);
         if (err && num_uart)
                 sunserial_unregister_minors(&sunsu_reg, num_uart);
 
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index f9a24f4ebb34..d1e6bcb59546 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1426,7 +1426,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
         rp = sunzilog_chip_regs[inst];
 
         if (zilog_irq == -1)
-                zilog_irq = op->irqs[0];
+                zilog_irq = op->archdata.irqs[0];
 
         up = &sunzilog_port_table[inst * 2];
 
@@ -1434,7 +1434,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
         up[0].port.mapbase = op->resource[0].start + 0x00;
         up[0].port.membase = (void __iomem *) &rp->channelA;
         up[0].port.iotype = UPIO_MEM;
-        up[0].port.irq = op->irqs[0];
+        up[0].port.irq = op->archdata.irqs[0];
         up[0].port.uartclk = ZS_CLOCK;
         up[0].port.fifosize = 1;
         up[0].port.ops = &sunzilog_pops;
@@ -1451,7 +1451,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
         up[1].port.mapbase = op->resource[0].start + 0x04;
         up[1].port.membase = (void __iomem *) &rp->channelB;
         up[1].port.iotype = UPIO_MEM;
-        up[1].port.irq = op->irqs[0];
+        up[1].port.irq = op->archdata.irqs[0];
         up[1].port.uartclk = ZS_CLOCK;
         up[1].port.fifosize = 1;
         up[1].port.ops = &sunzilog_pops;
@@ -1492,12 +1492,12 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                        "is a %s\n",
                        dev_name(&op->dev),
                        (unsigned long long) up[0].port.mapbase,
-                       op->irqs[0], sunzilog_type(&up[0].port));
+                       op->archdata.irqs[0], sunzilog_type(&up[0].port));
                 printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
                        dev_name(&op->dev),
                        (unsigned long long) up[1].port.mapbase,
-                       op->irqs[0], sunzilog_type(&up[1].port));
+                       op->archdata.irqs[0], sunzilog_type(&up[1].port));
                 kbm_inst++;
         }
 
@@ -1576,7 +1576,7 @@ static int __init sunzilog_init(void)
                         goto out_free_tables;
         }
 
-        err = of_register_driver(&zs_driver, &of_bus_type);
+        err = of_register_platform_driver(&zs_driver);
         if (err)
                 goto out_unregister_uart;
 
@@ -1604,7 +1604,7 @@ out:
         return err;
 
 out_unregister_driver:
-        of_unregister_driver(&zs_driver);
+        of_unregister_platform_driver(&zs_driver);
 
 out_unregister_uart:
         if (num_sunzilog) {
@@ -1619,7 +1619,7 @@ out_free_tables:
 
 static void __exit sunzilog_exit(void)
 {
-        of_unregister_driver(&zs_driver);
+        of_unregister_platform_driver(&zs_driver);
 
         if (zilog_irq != -1) {
                 struct uart_sunzilog_port *up = sunzilog_irq_chain;
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 8acccd564378..caf085d3a76a 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -21,6 +21,7 @@
 #include <asm/io.h>
 #if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE))
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>