ENGR00322581-05 tty: serial: imx: Revert "tty: serial: imx: set uart to cpu mode by default"

Since uart SDMA can work for Atheros BT module in android environment,
the previous patch (commit f337845718) disable SDMA mode in default,
now revert the patch to avoid the big change in dts for all platforms.

By default, we enable SDMA mode for uart.

Signed-off-by: Fugang Duan  <B38611@freescale.com>

2 files changed, 1 insertions, 7 deletions

diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
index 17fd9bc716ec..c662eb36be29 100644
--- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
+++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
@@ -10,8 +10,6 @@ Optional properties:
 - fsl,irda-mode : Indicate the uart supports irda mode
 - fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
                   is DCE mode by default.
-- fsl,dma-mode : Indicate the uart works in dma mode. The uart works
-                  is cpu mode by default.
 
 Example:
 
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 1570934978d7..efee6496f1ee 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -208,7 +208,6 @@ struct imx_port {
         unsigned int            have_rtscts:1;
         unsigned int            dte_mode:1;
         unsigned int            use_irda:1;
-        unsigned int            dma_mode:1;
         unsigned int            irda_inv_rx:1;
         unsigned int            irda_inv_tx:1;
         unsigned short          trcv_delay; /* transceiver delay */
@@ -1387,7 +1386,7 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
 
                         /* Can we enable the DMA support? */
                         if (is_imx6q_uart(sport) && !uart_console(port)
-                                && !sport->dma_is_inited && sport->dma_mode)
+                                && !sport->dma_is_inited)
                                 imx_uart_dma_init(sport);
                 } else {
                         termios->c_cflag &= ~CRTSCTS;
@@ -1950,9 +1949,6 @@ static int serial_imx_probe_dt(struct imx_port *sport,
         if (of_get_property(np, "fsl,dte-mode", NULL))
                 sport->dte_mode = 1;
 
-        if (of_get_property(np, "fsl,dma-mode", NULL))
-                sport->dma_mode = 1;
-
         sport->devdata = of_id->data;
 
         return 0;