2 files changed, 9 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
index b462d0c54823..c662eb36be29 100644
--- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
+++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
@@ -8,6 +8,8 @@ Required properties:
 Optional properties:
 - fsl,uart-has-rtscts : Indicate the uart has rts and cts
 - 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.
 
 Example:
 
@@ -16,4 +18,5 @@ serial@73fbc000 {
         reg = <0x73fbc000 0x4000>;
         interrupts = <31>;
         fsl,uart-has-rtscts;
+        fsl,dte-mode;
 };
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index b350cf175940..a07e94f6a9fc 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -201,6 +201,7 @@ struct imx_port {
         unsigned int            old_status;
         int                     txirq, rxirq, rtsirq;
         unsigned int            have_rtscts:1;
+        unsigned int            dte_mode:1;
         unsigned int            use_irda:1;
         unsigned int            irda_inv_rx:1;
         unsigned int            irda_inv_tx:1;
@@ -1022,6 +1023,8 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
 
         ufcr = readl(sport->port.membase + UFCR);
         ufcr = (ufcr & (~UFCR_RFDIV)) | UFCR_RFDIV_REG(div);
+        if (sport->dte_mode)
+                ufcr |= UFCR_DCEDTE;
         writel(ufcr, sport->port.membase + UFCR);
 
         writel(num, sport->port.membase + UBIR);
@@ -1446,6 +1449,9 @@ static int serial_imx_probe_dt(struct imx_port *sport,
         if (of_get_property(np, "fsl,irda-mode", NULL))
                 sport->use_irda = 1;
 
+        if (of_get_property(np, "fsl,dte-mode", NULL))
+                sport->dte_mode = 1;
+
         sport->devdata = of_id->data;
 
         return 0;