2 files changed, 16 insertions, 7 deletions

diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index b3455a970a1d..35d9ab95c5cb 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -429,7 +429,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 {
         struct uart_8250_port uart;
         int ret, line, flags = dev_id->driver_data;
-        struct resource *res = NULL;
 
         if (flags & UNKNOWN_DEV) {
                 ret = serial_pnp_guess_board(dev);
@@ -440,12 +439,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
         memset(&uart, 0, sizeof(uart));
         if (pnp_irq_valid(dev, 0))
                 uart.port.irq = pnp_irq(dev, 0);
-        if ((flags & CIR_PORT) && pnp_port_valid(dev, 2))
-                res = pnp_get_resource(dev, IORESOURCE_IO, 2);
-        else if (pnp_port_valid(dev, 0))
-                res = pnp_get_resource(dev, IORESOURCE_IO, 0);
-        if (pnp_resource_enabled(res)) {
-                uart.port.iobase = res->start;
+        if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {
+                uart.port.iobase = pnp_port_start(dev, 2);
+                uart.port.iotype = UPIO_PORT;
+        } else if (pnp_port_valid(dev, 0)) {
+                uart.port.iobase = pnp_port_start(dev, 0);
                 uart.port.iotype = UPIO_PORT;
         } else if (pnp_mem_valid(dev, 0)) {
                 uart.port.mapbase = pnp_mem_start(dev, 0);
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 4dc41408ecb7..30d4f7a783cd 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -886,6 +886,17 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
         /* FIFO ENABLE, DMA MODE */
 
+        up->scr |= OMAP_UART_SCR_RX_TRIG_GRANU1_MASK;
+        /*
+         * NOTE: Setting OMAP_UART_SCR_RX_TRIG_GRANU1_MASK
+         * sets Enables the granularity of 1 for TRIGGER RX
+         * level. Along with setting RX FIFO trigger level
+         * to 1 (as noted below, 16 characters) and TLR[3:0]
+         * to zero this will result RX FIFO threshold level
+         * to 1 character, instead of 16 as noted in comment
+         * below.
+         */
+
         /* Set receive FIFO threshold to 16 characters and
          * transmit FIFO threshold to 16 spaces
          */