summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/omap-serial.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-09-13 10:18:30 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-18 18:36:25 +0200
commitaf2f927676aa4e7635101350c0d1b17eb770a8d1 (patch)
treed26e0ce4030069bf63de89040049d0bc9b5f956c /drivers/tty/serial/omap-serial.c
parentdde18d53d72d06c30a925ca73986f711102b064e (diff)
downloadlinux-stable-af2f927676aa4e7635101350c0d1b17eb770a8d1.tar.gz
linux-stable-af2f927676aa4e7635101350c0d1b17eb770a8d1.tar.bz2
linux-stable-af2f927676aa4e7635101350c0d1b17eb770a8d1.zip
serial: omap-serial: Use common rs485 device tree parsing function
We just got a common helper for parsing the rs485 specific device tree properties. Use it and drop the open coded parser. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-rw-r--r--drivers/tty/serial/omap-serial.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7754053deeda..580f56754699 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1606,7 +1606,6 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
struct device_node *np)
{
struct serial_rs485 *rs485conf = &up->port.rs485;
- u32 rs485_delay[2];
enum of_gpio_flags flags;
int ret;
@@ -1637,17 +1636,7 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up,
up->rts_gpio = -EINVAL;
}
- if (of_property_read_u32_array(np, "rs485-rts-delay",
- rs485_delay, 2) == 0) {
- rs485conf->delay_rts_before_send = rs485_delay[0];
- rs485conf->delay_rts_after_send = rs485_delay[1];
- }
-
- if (of_property_read_bool(np, "rs485-rx-during-tx"))
- rs485conf->flags |= SER_RS485_RX_DURING_TX;
-
- if (of_property_read_bool(np, "linux,rs485-enabled-at-boot-time"))
- rs485conf->flags |= SER_RS485_ENABLED;
+ of_get_rs485_mode(np, rs485conf);
return 0;
}