2019-02-20 15:32:51

by Martin Kepplinger

[permalink] [raw]
Subject: [PATCH 6/9] serial: sc16is7xx: add support for rs485 RTS delays in microseconds

Read struct serial_rs485's flag SER_RS485_DELAY_IN_USEC and apply the delay
accordingly.

Signed-off-by: Martin Kepplinger <[email protected]>
---
drivers/tty/serial/sc16is7xx.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 635178cf3eed..b0e00b9fb177 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -743,7 +743,13 @@ static void sc16is7xx_tx_proc(struct kthread_work *ws)
struct uart_port *port = &(to_sc16is7xx_one(ws, tx_work)->port);

if ((port->rs485.flags & SER_RS485_ENABLED) &&
- (port->rs485.delay_rts_before_send > 0))
+ (port->rs485.delay_rts_before_send > 0) &&
+ (port->rs485.flags & SER_RS485_DELAY_IN_USEC))
+ usleep_range(port->rs485.delay_rts_before_send,
+ port->rs485.delay_rts_before_send);
+ else if ((port->rs485.flags & SER_RS485_ENABLED) &&
+ (port->rs485.delay_rts_before_send > 0) &&
+ !(port->rs485.flags & SER_RS485_DELAY_IN_USEC))
msleep(port->rs485.delay_rts_before_send);

sc16is7xx_handle_tx(port);
--
2.20.1

Attachments:
smime.p7s (3.53 kB)

2019-02-20 15:33:04

by Martin Kepplinger

[permalink] [raw]
Subject: [PATCH 8/9] serial: fsl_lpuart: set SER_RS485_DELAY_IN_USEC accordingly

Clear SER_RS485_DELAY_IN_USEC for userspace to get correct settings.

Signed-off-by: Martin Kepplinger <[email protected]>
---
drivers/tty/serial/fsl_lpuart.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index ea1c85e3b432..a63aa22e3a25 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1124,6 +1124,7 @@ static int lpuart_config_rs485(struct uart_port *port,
rs485->delay_rts_before_send = 0;
rs485->delay_rts_after_send = 0;
rs485->flags &= ~SER_RS485_RX_DURING_TX;
+ rs485->flags &= ~SER_RS485_DELAY_IN_USEC;

if (rs485->flags & SER_RS485_ENABLED) {
/* Enable auto RS-485 RTS mode */
--
2.20.1

Attachments:
smime.p7s (3.53 kB)

2019-02-20 15:33:55

by Martin Kepplinger

[permalink] [raw]
Subject: [PATCH 9/9] serial: st32-usart: set SER_RS485_DELAY_IN_USEC accordingly

Unset SER_RS485_DELAY_IN_USEC for userspace to get correct settings.

Signed-off-by: Martin Kepplinger <[email protected]>
---
drivers/tty/serial/stm32-usart.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index e8d7a7bb4339..4daf5fc71644 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -112,6 +112,7 @@ static int stm32_config_rs485(struct uart_port *port,

port->rs485 = *rs485conf;

+ rs485conf->flags &= ~SER_RS485_DELAY_IN_USEC;
rs485conf->flags |= SER_RS485_RX_DURING_TX;

if (rs485conf->flags & SER_RS485_ENABLED) {
--
2.20.1

Attachments:
smime.p7s (3.53 kB)

2019-02-20 15:33:56

by Martin Kepplinger

[permalink] [raw]
Subject: [PATCH 7/9] serial: atmel_serial: set SER_RS485_DELAY_IN_USEC accordingly

Unset the SER_RS485_DELAY_IN_USEC flag during rs485 config for
userspace to get the correct setting.

Signed-off-by: Martin Kepplinger <[email protected]>
---
drivers/tty/serial/atmel_serial.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 05147fe24343..36ab1c131d36 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -346,6 +346,9 @@ static int atmel_config_rs485(struct uart_port *port,

port->rs485 = *rs485conf;

+ /* delays are in milliseconds */
+ rs485conf->flags &= ~SER_RS485_DELAY_IN_USEC;
+
if (rs485conf->flags & SER_RS485_ENABLED) {
dev_dbg(port->dev, "Setting UART to RS485\n");
atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
--
2.20.1

Attachments:
smime.p7s (3.53 kB)