diff options
| -rw-r--r-- | drivers/serial/serial_imx.c | 11 | ||||
| -rw-r--r-- | include/serial/imx-uart.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 68b438b0bb..563813a4b6 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -55,6 +55,7 @@ static struct imx_serial_devtype_data imx21_data = { struct imx_serial_priv { struct console_device cdev; int baudrate; + int dte_mode; struct notifier_block notify; void __iomem *regs; struct clk *clk; @@ -93,9 +94,12 @@ static int imx_serial_init_port(struct console_device *cdev) writel(0, regs + UBMR); writel(0, regs + priv->devtype->uts); - /* Configure FIFOs */ - writel(0xa81, regs + UFCR); + val = 0xa81; + if (priv->dte_mode) + val |= UFCR_DCEDTE; + + writel(val, regs + UFCR); if (priv->devtype->onems) @@ -240,6 +244,9 @@ static int imx_serial_probe(struct device_d *dev) } } + if (of_property_read_bool(dev->device_node, "fsl,dte-mode")) + priv->dte_mode = 1; + imx_serial_init_port(cdev); /* Enable UART */ diff --git a/include/serial/imx-uart.h b/include/serial/imx-uart.h index 8faa12f24b..29b117c51f 100644 --- a/include/serial/imx-uart.h +++ b/include/serial/imx-uart.h @@ -84,6 +84,7 @@ #define UFCR_RFDIV2 (0b100<<7) /* Reference freq divider mask */ #define UFCR_RFDIV1 (0b101<<7) /* Reference freq divider mask */ #define UFCR_RFDIV7 (0b110<<7) /* Reference freq divider mask */ +#define UFCR_DCEDTE (1<<6) /* DCE/DTE mode select */ #define UFCR_TXTL_SHF 10 /* Transmitter trigger level shift */ #define USR1_PARITYERR (1<<15) /* Parity error interrupt flag */ #define USR1_RTSS (1<<14) /* RTS pin status */ |