tty: serial: fsl_lpuart: clear LPUART Status Register in lpuart32_shutdown()

[linux-2.6-block.git] / drivers / tty / serial / fsl_lpuart.c

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 5e69fb73f570f68d21ae99b765da5f614d1d9cc5..8918e08bb19eef5f8263ce9ced6bf39e464bd56a 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -5,6 +5,8 @@
  *  Copyright 2012-2014 Freescale Semiconductor, Inc.
  */
 
+#include <linux/bitfield.h>
+#include <linux/bits.h>
 #include <linux/clk.h>
 #include <linux/console.h>
 #include <linux/delay.h>
@@ -181,7 +183,7 @@
 #define UARTCTRL_SBK           0x00010000
 #define UARTCTRL_MA1IE         0x00008000
 #define UARTCTRL_MA2IE         0x00004000
-#define UARTCTRL_IDLECFG       0x00000100
+#define UARTCTRL_IDLECFG       GENMASK(10, 8)
 #define UARTCTRL_LOOPS         0x00000080
 #define UARTCTRL_DOZEEN                0x00000040
 #define UARTCTRL_RSRC          0x00000020
@@ -1523,7 +1525,7 @@ static void lpuart32_setup_watermark(struct lpuart_port *sport)
        ctrl = lpuart32_read(&sport->port, UARTCTRL);
        ctrl_saved = ctrl;
        ctrl &= ~(UARTCTRL_TIE | UARTCTRL_TCIE | UARTCTRL_TE |
-                       UARTCTRL_RIE | UARTCTRL_RE);
+                       UARTCTRL_RIE | UARTCTRL_RE | UARTCTRL_ILIE);
        lpuart32_write(&sport->port, ctrl, UARTCTRL);
 
        /* enable FIFO mode */
@@ -1547,7 +1549,8 @@ static void lpuart32_setup_watermark_enable(struct lpuart_port *sport)
        lpuart32_setup_watermark(sport);
 
        temp = lpuart32_read(&sport->port, UARTCTRL);
-       temp |= UARTCTRL_RE | UARTCTRL_TE | UARTCTRL_ILIE;
+       temp |= UARTCTRL_RE | UARTCTRL_TE;
+       temp |= FIELD_PREP(UARTCTRL_IDLECFG, 0x7);
        lpuart32_write(&sport->port, temp, UARTCTRL);
 }
 
@@ -1691,7 +1694,7 @@ static void lpuart32_configure(struct lpuart_port *sport)
        }
        temp = lpuart32_read(&sport->port, UARTCTRL);
        if (!sport->lpuart_dma_rx_use)
-               temp |= UARTCTRL_RIE;
+               temp |= UARTCTRL_RIE | UARTCTRL_ILIE;
        if (!sport->lpuart_dma_tx_use)
                temp |= UARTCTRL_TIE;
        lpuart32_write(&sport->port, temp, UARTCTRL);
@@ -1796,9 +1799,18 @@ static void lpuart32_shutdown(struct uart_port *port)
 
        spin_lock_irqsave(&port->lock, flags);
 
+       /* clear status */
+       temp = lpuart32_read(&sport->port, UARTSTAT);
+       lpuart32_write(&sport->port, temp, UARTSTAT);
+
+       /* disable Rx/Tx DMA */
+       temp = lpuart32_read(port, UARTBAUD);
+       temp &= ~(UARTBAUD_TDMAE | UARTBAUD_RDMAE);
+       lpuart32_write(port, temp, UARTBAUD);
+
        /* disable Rx/Tx and interrupts */
        temp = lpuart32_read(port, UARTCTRL);
-       temp &= ~(UARTCTRL_TE | UARTCTRL_RE |
+       temp &= ~(UARTCTRL_TE | UARTCTRL_RE | UARTCTRL_ILIE |
                        UARTCTRL_TIE | UARTCTRL_TCIE | UARTCTRL_RIE);
        lpuart32_write(port, temp, UARTCTRL);