diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:23:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:23:33 +0200 |
| commit | 1ba7055af26f008e8fc8dab9dcb1701534afbe16 (patch) | |
| tree | 6156556f56eba8ebc6d50639fbc8329f5ad078a2 /drivers/tty/serial/imx.c | |
| parent | serial: imx: Improve Kconfig text (diff) | |
| parent | Linux 3.10-rc5 (diff) | |
| download | linux-1ba7055af26f008e8fc8dab9dcb1701534afbe16.tar.xz linux-1ba7055af26f008e8fc8dab9dcb1701534afbe16.zip | |
Merge 3.10-rc5 into tty-next
Diffstat (limited to 'drivers/tty/serial/imx.c')
| -rw-r--r-- | drivers/tty/serial/imx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 0478083069c0..7a761f7c9781 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -787,6 +787,8 @@ static int imx_startup(struct uart_port *port) temp = readl(sport->port.membase + UCR2); temp |= (UCR2_RXEN | UCR2_TXEN); + if (!sport->have_rtscts) + temp |= UCR2_IRTS; writel(temp, sport->port.membase + UCR2); if (USE_IRDA(sport)) { |