Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (49 commits)
  serial8250: ratelimit "too much work" error
  serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster
  serial: abstraction for 8250 legacy ports
  serial/imx: check that the buffer is non-empty before sending it out
  serial: mfd: add more baud rates support
  jsm: Remove the uart port on errors
  Alchemy: Add UART PM methods.
  8250: allow platforms to override PM hook.
  altera_uart: Don't use plain integer as NULL pointer
  altera_uart: Fix missing prototype for registering an early console
  altera_uart: Fixup type usage of port flags
  altera_uart: Make it possible to use Altera UART and 8250 ports together
  altera_uart: Add support for different address strides
  altera_uart: Add support for getting mapbase and IRQ from resources
  altera_uart: Add support for polling mode (IRQ-less)
  serial: Factor out uart_poll_timeout() from 8250 driver
  serial: mark the 8250 driver as maintained
  serial: 8250: Don't delay after transmitter is ready.
  tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver
  vcs: invoke the vt update callback when /dev/vcs* is written to
  ...

2 files changed, 28 insertions, 35 deletions

diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 1dc55ee2681b..3691630931d6 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -24,6 +24,33 @@
 
 #include <prom.h>
 
+static void alchemy_8250_pm(struct uart_port *port, unsigned int state,
+                            unsigned int old_state)
+{
+        switch (state) {
+        case 0:
+                if ((__raw_readl(port->membase + UART_MOD_CNTRL) & 3) != 3) {
+                        /* power-on sequence as suggested in the databooks */
+                        __raw_writel(0, port->membase + UART_MOD_CNTRL);
+                        wmb();
+                        __raw_writel(1, port->membase + UART_MOD_CNTRL);
+                        wmb();
+                }
+                __raw_writel(3, port->membase + UART_MOD_CNTRL); /* full on */
+                wmb();
+                serial8250_do_pm(port, state, old_state);
+                break;
+        case 3:         /* power off */
+                serial8250_do_pm(port, state, old_state);
+                __raw_writel(0, port->membase + UART_MOD_CNTRL);
+                wmb();
+                break;
+        default:
+                serial8250_do_pm(port, state, old_state);
+                break;
+        }
+}
+
 #define PORT(_base, _irq)                                       \
         {                                                       \
                 .mapbase        = _base,                        \
@@ -33,6 +60,7 @@
                 .flags          = UPF_SKIP_TEST | UPF_IOREMAP | \
                                   UPF_FIXED_TYPE,               \
                 .type           = PORT_16550A,                  \
+                .pm             = alchemy_8250_pm,              \
         }
 
 static struct plat_serial8250_port au1x00_uart_data[] = {
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c
index 5ef06a164a82..e5916a516e58 100644
--- a/arch/mips/alchemy/common/power.c
+++ b/arch/mips/alchemy/common/power.c
@@ -49,11 +49,6 @@
  * We only have to save/restore registers that aren't otherwise
  * done as part of a driver pm_* function.
  */
-static unsigned int sleep_uart0_inten;
-static unsigned int sleep_uart0_fifoctl;
-static unsigned int sleep_uart0_linectl;
-static unsigned int sleep_uart0_clkdiv;
-static unsigned int sleep_uart0_enable;
 static unsigned int sleep_usb[2];
 static unsigned int sleep_sys_clocks[5];
 static unsigned int sleep_sys_pinfunc;
@@ -62,22 +57,6 @@ static unsigned int sleep_static_memctlr[4][3];
 
 static void save_core_regs(void)
 {
-        extern void save_au1xxx_intctl(void);
-        extern void pm_eth0_shutdown(void);
-
-        /*
-         * Do the serial ports.....these really should be a pm_*
-         * registered function by the driver......but of course the
-         * standard serial driver doesn't understand our Au1xxx
-         * unique registers.
-         */
-        sleep_uart0_inten = au_readl(UART0_ADDR + UART_IER);
-        sleep_uart0_fifoctl = au_readl(UART0_ADDR + UART_FCR);
-        sleep_uart0_linectl = au_readl(UART0_ADDR + UART_LCR);
-        sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK);
-        sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL);
-        au_sync();
-
 #ifndef CONFIG_SOC_AU1200
         /* Shutdown USB host/device. */
         sleep_usb[0] = au_readl(USB_HOST_CONFIG);
@@ -175,20 +154,6 @@ static void restore_core_regs(void)
         au_writel(sleep_static_memctlr[3][0], MEM_STCFG3);
         au_writel(sleep_static_memctlr[3][1], MEM_STTIME3);
         au_writel(sleep_static_memctlr[3][2], MEM_STADDR3);
-
-        /*
-         * Enable the UART if it was enabled before sleep.
-         * I guess I should define module control bits........
-         */
-        if (sleep_uart0_enable & 0x02) {
-                au_writel(0, UART0_ADDR + UART_MOD_CNTRL); au_sync();
-                au_writel(1, UART0_ADDR + UART_MOD_CNTRL); au_sync();
-                au_writel(3, UART0_ADDR + UART_MOD_CNTRL); au_sync();
-                au_writel(sleep_uart0_inten, UART0_ADDR + UART_IER); au_sync();
-                au_writel(sleep_uart0_fifoctl, UART0_ADDR + UART_FCR); au_sync();
-                au_writel(sleep_uart0_linectl, UART0_ADDR + UART_LCR); au_sync();
-                au_writel(sleep_uart0_clkdiv, UART0_ADDR + UART_CLK); au_sync();
-        }
 }
 
 void au_sleep(void)