| Message ID | 20190221171758.10322-3-martin.kepplinger@ginzinger.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/9] serial: uapi: add SER_RS485_DELAY_IN_USEC flag to struct serial_rs485 | expand |
On Thu, Feb 21, 2019 at 06:17:52PM +0100, Martin Kepplinger wrote: > struct serial_rs485 now optionally holds the rts delay values in > microseconds. Users can set these delays in their devicetree descriptions, > so this adds the microseconds-option with the "rs485-rts-delay-us" boolean > property. If it has a value, it's not boolean. Should the old prop be deprecated? > > Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> > --- > Documentation/devicetree/bindings/serial/rs485.txt | 1 + > drivers/tty/serial/serial_core.c | 11 +++++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/Documentation/devicetree/bindings/serial/rs485.txt b/Documentation/devicetree/bindings/serial/rs485.txt > index b92592dff6dd..77396c62b383 100644 > --- a/Documentation/devicetree/bindings/serial/rs485.txt > +++ b/Documentation/devicetree/bindings/serial/rs485.txt > @@ -12,6 +12,7 @@ Optional properties: > * b is the delay between end of data sent and rts signal in milliseconds > it corresponds to the delay after sending data and actual release of the line. > If this property is not specified, <0 0> is assumed. > +- rs485-rts-delay-us: the same as rs485-rts-delay, but in microseconds. > - rs485-rts-active-low: drive RTS low when sending (default is high). > - linux,rs485-enabled-at-boot-time: empty property telling to enable the rs485 > feature at boot time. It can be disabled later with proper ioctl.
diff --git a/Documentation/devicetree/bindings/serial/rs485.txt b/Documentation/devicetree/bindings/serial/rs485.txt index b92592dff6dd..77396c62b383 100644 --- a/Documentation/devicetree/bindings/serial/rs485.txt +++ b/Documentation/devicetree/bindings/serial/rs485.txt @@ -12,6 +12,7 @@ Optional properties: * b is the delay between end of data sent and rts signal in milliseconds it corresponds to the delay after sending data and actual release of the line. If this property is not specified, <0 0> is assumed. +- rs485-rts-delay-us: the same as rs485-rts-delay, but in microseconds. - rs485-rts-active-low: drive RTS low when sending (default is high). - linux,rs485-enabled-at-boot-time: empty property telling to enable the rs485 feature at boot time. It can be disabled later with proper ioctl. diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 556f50aa1b58..4fb265b2c0fe 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3097,6 +3097,17 @@ void uart_get_rs485_mode(struct device *dev, struct serial_rs485 *rs485conf) rs485conf->delay_rts_after_send = 0; } + ret = device_property_read_u32_array(dev, "rs485-rts-delay-us", + rs485_delay, 2); + if (!ret) { + rs485conf->delay_rts_before_send = rs485_delay[0]; + rs485conf->delay_rts_after_send = rs485_delay[1]; + rs485conf->flags |= SER_RS485_DELAY_IN_USEC; + } else { + rs485conf->delay_rts_before_send = 0; + rs485conf->delay_rts_after_send = 0; + } + /* * Clear full-duplex and enabled flags, set RTS polarity to active high * to get to a defined state with the following properties:
struct serial_rs485 now optionally holds the rts delay values in microseconds. Users can set these delays in their devicetree descriptions, so this adds the microseconds-option with the "rs485-rts-delay-us" boolean property. Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> --- Documentation/devicetree/bindings/serial/rs485.txt | 1 + drivers/tty/serial/serial_core.c | 11 +++++++++++ 2 files changed, 12 insertions(+)