|
@@ -316,8 +316,7 @@ static int atmel_config_rs485(struct uart_port *port,
|
|
if (rs485conf->flags & SER_RS485_ENABLED) {
|
|
if (rs485conf->flags & SER_RS485_ENABLED) {
|
|
dev_dbg(port->dev, "Setting UART to RS485\n");
|
|
dev_dbg(port->dev, "Setting UART to RS485\n");
|
|
atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
|
|
atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
|
|
- if ((rs485conf->delay_rts_after_send) > 0)
|
|
|
|
- UART_PUT_TTGR(port, rs485conf->delay_rts_after_send);
|
|
|
|
|
|
+ UART_PUT_TTGR(port, rs485conf->delay_rts_after_send);
|
|
mode |= ATMEL_US_USMODE_RS485;
|
|
mode |= ATMEL_US_USMODE_RS485;
|
|
} else {
|
|
} else {
|
|
dev_dbg(port->dev, "Setting UART to RS232\n");
|
|
dev_dbg(port->dev, "Setting UART to RS232\n");
|
|
@@ -355,8 +354,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
|
|
|
|
|
|
/* override mode to RS485 if needed, otherwise keep the current mode */
|
|
/* override mode to RS485 if needed, otherwise keep the current mode */
|
|
if (port->rs485.flags & SER_RS485_ENABLED) {
|
|
if (port->rs485.flags & SER_RS485_ENABLED) {
|
|
- if ((port->rs485.delay_rts_after_send) > 0)
|
|
|
|
- UART_PUT_TTGR(port, port->rs485.delay_rts_after_send);
|
|
|
|
|
|
+ UART_PUT_TTGR(port, port->rs485.delay_rts_after_send);
|
|
mode &= ~ATMEL_US_USMODE;
|
|
mode &= ~ATMEL_US_USMODE;
|
|
mode |= ATMEL_US_USMODE_RS485;
|
|
mode |= ATMEL_US_USMODE_RS485;
|
|
}
|
|
}
|
|
@@ -2062,8 +2060,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
|
|
|
|
|
|
/* mode */
|
|
/* mode */
|
|
if (port->rs485.flags & SER_RS485_ENABLED) {
|
|
if (port->rs485.flags & SER_RS485_ENABLED) {
|
|
- if ((port->rs485.delay_rts_after_send) > 0)
|
|
|
|
- UART_PUT_TTGR(port, port->rs485.delay_rts_after_send);
|
|
|
|
|
|
+ UART_PUT_TTGR(port, port->rs485.delay_rts_after_send);
|
|
mode |= ATMEL_US_USMODE_RS485;
|
|
mode |= ATMEL_US_USMODE_RS485;
|
|
} else if (termios->c_cflag & CRTSCTS) {
|
|
} else if (termios->c_cflag & CRTSCTS) {
|
|
/* RS232 with hardware handshake (RTS/CTS) */
|
|
/* RS232 with hardware handshake (RTS/CTS) */
|