3 files changed, 72 insertions, 17 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 9ccc563d8730..8058533f8418 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2211,9 +2211,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
                 serial_outp(up, UART_EFR, efr);
         }
 
-#ifdef CONFIG_ARCH_OMAP15XX
+#ifdef CONFIG_ARCH_OMAP
         /* Workaround to enable 115200 baud on OMAP1510 internal ports */
-        if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) {
+        if (cpu_is_omap1510() && is_omap_port(up)) {
                 if (baud == 115200) {
                         quot = 1;
                         serial_out(up, UART_OMAP_OSC_12M_SEL, 1);
@@ -2266,18 +2266,27 @@ serial8250_pm(struct uart_port *port, unsigned int state,
                 p->pm(port, state, oldstate);
 }
 
+static unsigned int serial8250_port_size(struct uart_8250_port *pt)
+{
+        if (pt->port.iotype == UPIO_AU)
+                return 0x100000;
+#ifdef CONFIG_ARCH_OMAP
+        if (is_omap_port(pt))
+                return 0x16 << pt->port.regshift;
+#endif
+        return 8 << pt->port.regshift;
+}
+
 /*
  * Resource handling.
  */
 static int serial8250_request_std_resource(struct uart_8250_port *up)
 {
-        unsigned int size = 8 << up->port.regshift;
+        unsigned int size = serial8250_port_size(up);
         int ret = 0;
 
         switch (up->port.iotype) {
         case UPIO_AU:
-                size = 0x100000;
-                /* fall thru */
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
@@ -2311,12 +2320,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
 
 static void serial8250_release_std_resource(struct uart_8250_port *up)
 {
-        unsigned int size = 8 << up->port.regshift;
+        unsigned int size = serial8250_port_size(up);
 
         switch (up->port.iotype) {
         case UPIO_AU:
-                size = 0x100000;
-                /* fall thru */
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index f7a0d37c4221..abc00be55433 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -534,6 +534,11 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios,
 
         serial_out(up, UART_IER, up->ier);
 
+        if (termios->c_cflag & CRTSCTS)
+                up->mcr |= UART_MCR_AFE;
+        else
+                up->mcr &= ~UART_MCR_AFE;
+
         serial_out(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
         serial_out(up, UART_DLL, quot & 0xff);          /* LS of divisor */
         serial_out(up, UART_DLM, quot >> 8);            /* MS of divisor */
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c
index b9cbfc87f616..998e89dc5aaf 100644
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
@@ -63,8 +63,44 @@
 #define UART_DUMMY_LSR_RX       0x100
 #define UART_PORT_SIZE          (KS8695_USR - KS8695_URRB + 4)
 
-#define tx_enabled(port) ((port)->unused[0])
-#define rx_enabled(port) ((port)->unused[1])
+static inline int tx_enabled(struct uart_port *port)
+{
+        return port->unused[0] & 1;
+}
+
+static inline int rx_enabled(struct uart_port *port)
+{
+        return port->unused[0] & 2;
+}
+
+static inline int ms_enabled(struct uart_port *port)
+{
+        return port->unused[0] & 4;
+}
+
+static inline void ms_enable(struct uart_port *port, int enabled)
+{
+        if(enabled)
+                port->unused[0] |= 4;
+        else
+                port->unused[0] &= ~4;
+}
+
+static inline void rx_enable(struct uart_port *port, int enabled)
+{
+        if(enabled)
+                port->unused[0] |= 2;
+        else
+                port->unused[0] &= ~2;
+}
+
+static inline void tx_enable(struct uart_port *port, int enabled)
+{
+        if(enabled)
+                port->unused[0] |= 1;
+        else
+                port->unused[0] &= ~1;
+}
 
 
 #ifdef SUPPORT_SYSRQ
@@ -75,7 +111,7 @@ static void ks8695uart_stop_tx(struct uart_port *port)
 {
         if (tx_enabled(port)) {
                 disable_irq(KS8695_IRQ_UART_TX);
-                tx_enabled(port) = 0;
+                tx_enable(port, 0);
         }
 }
 
@@ -83,7 +119,7 @@ static void ks8695uart_start_tx(struct uart_port *port)
 {
         if (!tx_enabled(port)) {
                 enable_irq(KS8695_IRQ_UART_TX);
-                tx_enabled(port) = 1;
+                tx_enable(port, 1);
         }
 }
 
@@ -91,18 +127,24 @@ static void ks8695uart_stop_rx(struct uart_port *port)
 {
         if (rx_enabled(port)) {
                 disable_irq(KS8695_IRQ_UART_RX);
-                rx_enabled(port) = 0;
+                rx_enable(port, 0);
         }
 }
 
 static void ks8695uart_enable_ms(struct uart_port *port)
 {
-        enable_irq(KS8695_IRQ_UART_MODEM_STATUS);
+        if (!ms_enabled(port)) {
+                enable_irq(KS8695_IRQ_UART_MODEM_STATUS);
+                ms_enable(port,1);
+        }
 }
 
 static void ks8695uart_disable_ms(struct uart_port *port)
 {
-        disable_irq(KS8695_IRQ_UART_MODEM_STATUS);
+        if (ms_enabled(port)) {
+                disable_irq(KS8695_IRQ_UART_MODEM_STATUS);
+                ms_enable(port,0);
+        }
 }
 
 static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)
@@ -285,8 +327,9 @@ static int ks8695uart_startup(struct uart_port *port)
         int retval;
 
         set_irq_flags(KS8695_IRQ_UART_TX, IRQF_VALID | IRQF_NOAUTOEN);
-        tx_enabled(port) = 0;
-        rx_enabled(port) = 1;
+        tx_enable(port, 0);
+        rx_enable(port, 1);
+        ms_enable(port, 1);
 
         /*
          * Allocate the IRQ