Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: (21 commits)
  [SERIAL] add PNP IDs for FPI based touchscreens
  [SERIAL] Magic SysRq SAK does nothing on serial consoles
  [SERIAL] tickle NMI watchdog on serial output.
  [SERIAL] Fix oops when removing suspended serial port
  [SERIAL] Fix resume handling bug
  [SERIAL] Remove wrong asm/serial.h inclusions
  [SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c
  [SERIAL] OMAP1510 serial fix for 115200 baud
  [SERIAL] returning proper error from serial core driver
  [SERIAL] Make uart_line_info() correctly tell MMIO from I/O port
  [SERIAL] suspend/resume handlers don't have level arg anymore
  [SERIAL] 8250 resourse management fixes
  [SERIAL] serial_cs: Add quirk for brainboxes 2-port RS232 card
  [SERIAL] serial_cs: handle Nokia multi->single port bodge via config quirk
  [SERIAL] serial_cs: add configuration quirk
  [SERIAL] serial_cs: Convert Oxford 950 / Possio GCC wakeup quirk
  [SERIAL] serial_cs: convert IBM post-init handling to a quirk
  [SERIAL] serial_cs: allow wildcarded quirks
  [SERIAL] serial_cs: convert multi-port table to quirk table
  [SERIAL] serial_cs: Use clean up multiport card detection
  ...

1 files changed, 22 insertions, 13 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 10c2daab99ac..cc2a205d4230 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1896,6 +1896,17 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
                 serial_outp(up, UART_EFR, efr);
         }
 
+#ifdef CONFIG_ARCH_OMAP15XX
+        /* Workaround to enable 115200 baud on OMAP1510 internal ports */
+        if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) {
+                if (baud == 115200) {
+                        quot = 1;
+                        serial_out(up, UART_OMAP_OSC_12M_SEL, 1);
+                } else
+                        serial_out(up, UART_OMAP_OSC_12M_SEL, 0);
+        }
+#endif
+
         if (up->capabilities & UART_NATSEMI) {
                 /* Switch to bank 2 not bank 1, to avoid resetting EXCR2 */
                 serial_outp(up, UART_LCR, 0xe0);
@@ -1949,6 +1960,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
         case UPIO_AU:
                 size = 0x100000;
                 /* fall thru */
+        case UPIO_TSI:
+        case UPIO_MEM32:
         case UPIO_MEM:
                 if (!up->port.mapbase)
                         break;
@@ -1984,6 +1997,8 @@ static void serial8250_release_std_resource(struct uart_8250_port *up)
         case UPIO_AU:
                 size = 0x100000;
                 /* fall thru */
+        case UPIO_TSI:
+        case UPIO_MEM32:
         case UPIO_MEM:
                 if (!up->port.mapbase)
                         break;
@@ -2007,17 +2022,15 @@ static int serial8250_request_rsa_resource(struct uart_8250_port *up)
 {
         unsigned long start = UART_RSA_BASE << up->port.regshift;
         unsigned int size = 8 << up->port.regshift;
-        int ret = 0;
+        int ret = -EINVAL;
 
         switch (up->port.iotype) {
-        case UPIO_MEM:
-                ret = -EINVAL;
-                break;
-
         case UPIO_HUB6:
         case UPIO_PORT:
                 start += up->port.iobase;
-                if (!request_region(start, size, "serial-rsa"))
+                if (request_region(start, size, "serial-rsa"))
+                        ret = 0;
+                else
                         ret = -EBUSY;
                 break;
         }
@@ -2031,9 +2044,6 @@ static void serial8250_release_rsa_resource(struct uart_8250_port *up)
         unsigned int size = 8 << up->port.regshift;
 
         switch (up->port.iotype) {
-        case UPIO_MEM:
-                break;
-
         case UPIO_HUB6:
         case UPIO_PORT:
                 release_region(up->port.iobase + offset, size);
@@ -2222,9 +2232,10 @@ static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
         /* Wait up to 1s for flow control if necessary */
         if (up->port.flags & UPF_CONS_FLOW) {
                 tmout = 1000000;
-                while (--tmout &&
-                       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
+                while (!(serial_in(up, UART_MSR) & UART_MSR_CTS) && --tmout) {
                         udelay(1);
+                        touch_nmi_watchdog();
+                }
         }
 }
 
@@ -2397,7 +2408,6 @@ int __init early_serial_setup(struct uart_port *port)
 /**
  *      serial8250_suspend_port - suspend one serial port
  *      @line:  serial line number
- *      @level: the level of port suspension, as per uart_suspend_port
  *
  *      Suspend one serial port.
  */
@@ -2409,7 +2419,6 @@ void serial8250_suspend_port(int line)
 /**
  *      serial8250_resume_port - resume one serial port
  *      @line:  serial line number
- *      @level: the level of port resumption, as per uart_resume_port
  *
  *      Resume one serial port.
  */