Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c

1 files changed, 19 insertions, 0 deletions

diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index ef7adc8135dd..ce6c35333ff7 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -71,6 +71,7 @@ struct uart_amba_port {
         unsigned int            im;     /* interrupt mask */
         unsigned int            old_status;
         unsigned int            ifls;   /* vendor-specific */
+        bool                    autorts;
 };
 
 /* There is by now at least one vendor with differing details, so handle it */
@@ -308,6 +309,11 @@ static void pl011_set_mctrl(struct uart_port *port, unsigned int mctrl)
         TIOCMBIT(TIOCM_OUT1, UART011_CR_OUT1);
         TIOCMBIT(TIOCM_OUT2, UART011_CR_OUT2);
         TIOCMBIT(TIOCM_LOOP, UART011_CR_LBE);
+
+        if (uap->autorts) {
+                /* We need to disable auto-RTS if we want to turn RTS off */
+                TIOCMBIT(TIOCM_RTS, UART011_CR_RTSEN);
+        }
 #undef TIOCMBIT
 
         writew(cr, uap->port.membase + UART011_CR);
@@ -437,6 +443,7 @@ static void pl011_shutdown(struct uart_port *port)
         /*
          * disable the port
          */
+        uap->autorts = false;
         writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
 
         /*
@@ -456,6 +463,7 @@ static void
 pl011_set_termios(struct uart_port *port, struct ktermios *termios,
                      struct ktermios *old)
 {
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int lcr_h, old_cr;
         unsigned long flags;
         unsigned int baud, quot;
@@ -532,6 +540,17 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
         old_cr = readw(port->membase + UART011_CR);
         writew(0, port->membase + UART011_CR);
 
+        if (termios->c_cflag & CRTSCTS) {
+                if (old_cr & UART011_CR_RTS)
+                        old_cr |= UART011_CR_RTSEN;
+
+                old_cr |= UART011_CR_CTSEN;
+                uap->autorts = true;
+        } else {
+                old_cr &= ~(UART011_CR_CTSEN | UART011_CR_RTSEN);
+                uap->autorts = false;
+        }
+
         /* Set baud rate */
         writew(quot & 0x3f, port->membase + UART011_FBRD);
         writew(quot >> 6, port->membase + UART011_IBRD);