hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serial: imx: support RS-485 Rx disable on Tx 

Some RS-232 to RS-485 transceivers require Rx to be disabled on Tx to
avoid echo of Tx data into the Rx buffer. Specifically, the XR3160E
RS-232/RS-485/RS-422 transceiver behaves this way.

This commit disables Rx on active Tx when SER_RS485_ENABLED is active and
SER_RS485_RX_DURING_TX is disabled.

Note that this is a change in behavior of the driver. Until now
SER_RS485_RX_DURING_TX was enabled unconditionally even when disabled in
the TIOCSRS485 ioctl serial_rs485 flags field.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Baruch Siach 2016-02-29 14:34:10 +02:00 committed by Greg Kroah-Hartman
parent 3d23b4c364
commit 7d1cadca95
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/serial/imx.c
View File

@ -361,6 +361,7 @@ static void imx_stop_tx(struct uart_port *port)
imx_port_rts_inactive(sport, &temp); imx_port_rts_inactive(sport, &temp);
else else
imx_port_rts_active(sport, &temp); imx_port_rts_active(sport, &temp);
temp |= UCR2_RXEN;
writel(temp, port->membase + UCR2); writel(temp, port->membase + UCR2);
temp = readl(port->membase + UCR4); temp = readl(port->membase + UCR4);
@ -568,6 +569,8 @@ static void imx_start_tx(struct uart_port *port)
imx_port_rts_inactive(sport, &temp); imx_port_rts_inactive(sport, &temp);
else else
imx_port_rts_active(sport, &temp); imx_port_rts_active(sport, &temp);
if (!(port->rs485.flags & SER_RS485_RX_DURING_TX))
temp &= ~UCR2_RXEN;
writel(temp, port->membase + UCR2); writel(temp, port->membase + UCR2);
/* enable transmitter and shifter empty irq */ /* enable transmitter and shifter empty irq */
@ -1610,19 +1613,17 @@ static int imx_rs485_config(struct uart_port *port,
struct serial_rs485 *rs485conf) struct serial_rs485 *rs485conf)
{ {
struct imx_port *sport = (struct imx_port *)port; struct imx_port *sport = (struct imx_port *)port;
unsigned long temp;
/* unimplemented */ /* unimplemented */
rs485conf->delay_rts_before_send = 0; rs485conf->delay_rts_before_send = 0;
rs485conf->delay_rts_after_send = 0; rs485conf->delay_rts_after_send = 0;
rs485conf->flags |= SER_RS485_RX_DURING_TX;
/* RTS is required to control the transmitter */ /* RTS is required to control the transmitter */
if (!sport->have_rtscts) if (!sport->have_rtscts)
rs485conf->flags &= ~SER_RS485_ENABLED; rs485conf->flags &= ~SER_RS485_ENABLED;
if (rs485conf->flags & SER_RS485_ENABLED) { if (rs485conf->flags & SER_RS485_ENABLED) {
unsigned long temp;
/* disable transmitter */ /* disable transmitter */
temp = readl(sport->port.membase + UCR2); temp = readl(sport->port.membase + UCR2);
if (rs485conf->flags & SER_RS485_RTS_AFTER_SEND) if (rs485conf->flags & SER_RS485_RTS_AFTER_SEND)
@ -1632,6 +1633,14 @@ static int imx_rs485_config(struct uart_port *port,
writel(temp, sport->port.membase + UCR2); writel(temp, sport->port.membase + UCR2);
} }
/* Make sure Rx is enabled in case Tx is active with Rx disabled */
if (!(rs485conf->flags & SER_RS485_ENABLED) ||
rs485conf->flags & SER_RS485_RX_DURING_TX) {
temp = readl(sport->port.membase + UCR2);
temp |= UCR2_RXEN;
writel(temp, sport->port.membase + UCR2);
}
port->rs485 = *rs485conf; port->rs485 = *rs485conf;
return 0; return 0;