From: "Uwe Kleine-König" <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> To: linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, Richard Genoud <richard.genoud-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org Subject: [PATCH v3 4/9] serial: atmel: Use common rs485 device tree parsing function Date: Mon, 26 Jun 2017 11:07:58 +0200 [thread overview] Message-ID: <20170626090803.10981-5-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20170626090803.10981-1-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> We just got a common helper for parsing the rs485 specific device tree properties. Use it and drop the open coded parser. Note that there is a small difference between the removed and the now used implementation: The former cleared flags to 0 if rs485-rts-delay was given, the common helper clears SER_RS485_RX_DURING_TX and SER_RS485_ENABLED only but always which makes more sense. Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> [ukleinek: point out semantic change in commit log] Signed-off-by: Uwe Kleine-König <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> --- drivers/tty/serial/atmel_serial.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 937d67f22fba..245d9c227ad5 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1684,29 +1684,6 @@ static void atmel_init_property(struct atmel_uart_port *atmel_port, } } -static void atmel_init_rs485(struct uart_port *port, - struct platform_device *pdev) -{ - struct device_node *np = pdev->dev.of_node; - - struct serial_rs485 *rs485conf = &port->rs485; - u32 rs485_delay[2]; - - /* rs485 properties */ - 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]; - rs485conf->flags = 0; - } - - if (of_get_property(np, "rs485-rx-during-tx", NULL)) - rs485conf->flags |= SER_RS485_RX_DURING_TX; - - if (of_get_property(np, "linux,rs485-enabled-at-boot-time", NULL)) - rs485conf->flags |= SER_RS485_ENABLED; -} - static void atmel_set_ops(struct uart_port *port) { struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); @@ -2390,7 +2367,7 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port, atmel_init_property(atmel_port, pdev); atmel_set_ops(port); - atmel_init_rs485(port, pdev); + of_get_rs485_mode(pdev->dev.of_node, &port->rs485); port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP; -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/9] serial: atmel: Use common rs485 device tree parsing function Date: Mon, 26 Jun 2017 11:07:58 +0200 [thread overview] Message-ID: <20170626090803.10981-5-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20170626090803.10981-1-u.kleine-koenig@pengutronix.de> From: Sascha Hauer <s.hauer@pengutronix.de> We just got a common helper for parsing the rs485 specific device tree properties. Use it and drop the open coded parser. Note that there is a small difference between the removed and the now used implementation: The former cleared flags to 0 if rs485-rts-delay was given, the common helper clears SER_RS485_RX_DURING_TX and SER_RS485_ENABLED only but always which makes more sense. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> [ukleinek: point out semantic change in commit log] Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> --- drivers/tty/serial/atmel_serial.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 937d67f22fba..245d9c227ad5 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1684,29 +1684,6 @@ static void atmel_init_property(struct atmel_uart_port *atmel_port, } } -static void atmel_init_rs485(struct uart_port *port, - struct platform_device *pdev) -{ - struct device_node *np = pdev->dev.of_node; - - struct serial_rs485 *rs485conf = &port->rs485; - u32 rs485_delay[2]; - - /* rs485 properties */ - 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]; - rs485conf->flags = 0; - } - - if (of_get_property(np, "rs485-rx-during-tx", NULL)) - rs485conf->flags |= SER_RS485_RX_DURING_TX; - - if (of_get_property(np, "linux,rs485-enabled-at-boot-time", NULL)) - rs485conf->flags |= SER_RS485_ENABLED; -} - static void atmel_set_ops(struct uart_port *port) { struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); @@ -2390,7 +2367,7 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port, atmel_init_property(atmel_port, pdev); atmel_set_ops(port); - atmel_init_rs485(port, pdev); + of_get_rs485_mode(pdev->dev.of_node, &port->rs485); port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP; -- 2.11.0
next prev parent reply other threads:[~2017-06-26 9:07 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-26 9:07 [PATCH v3 0/9] Add and make use of a common rs485 device tree parsing function Uwe Kleine-König 2017-06-26 9:07 ` Uwe Kleine-König [not found] ` <20170626090803.10981-1-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2017-06-26 9:07 ` [PATCH v3 1/9] serial: fsl_lpuart: clear unsupported options in .rs485_config() Uwe Kleine-König 2017-06-26 9:07 ` Uwe Kleine-König 2017-06-26 9:07 ` [PATCH v3 2/9] dt-bindings: serial/rs485: make rs485-rts-delay optional Uwe Kleine-König 2017-06-26 9:07 ` Uwe Kleine-König [not found] ` <20170626090803.10981-3-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2017-06-28 16:48 ` Rob Herring 2017-06-28 16:48 ` Rob Herring 2017-06-26 9:07 ` [PATCH v3 3/9] serial: Add common rs485 device tree parsing function Uwe Kleine-König 2017-06-26 9:07 ` Uwe Kleine-König [not found] ` <20170626090803.10981-4-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2017-06-27 7:40 ` Nicolas Ferre 2017-06-27 7:40 ` Nicolas Ferre 2017-06-26 9:07 ` Uwe Kleine-König [this message] 2017-06-26 9:07 ` [PATCH v3 4/9] serial: atmel: Use " Uwe Kleine-König [not found] ` <20170626090803.10981-5-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2017-06-27 7:41 ` Nicolas Ferre 2017-06-27 7:41 ` Nicolas Ferre 2017-06-27 8:27 ` Richard Genoud 2017-06-27 8:27 ` Richard Genoud 2017-06-26 9:07 ` [PATCH v3 5/9] serial: fsl_lpuart: " Uwe Kleine-König 2017-06-26 9:07 ` Uwe Kleine-König 2017-06-26 9:08 ` [PATCH v3 6/9] serial: omap-serial: " Uwe Kleine-König 2017-06-26 9:08 ` Uwe Kleine-König 2017-06-26 9:08 ` [PATCH v3 7/9] serial: imx: default to half duplex rs485 Uwe Kleine-König 2017-06-26 9:08 ` Uwe Kleine-König 2017-06-26 9:08 ` [PATCH v3 8/9] serial: imx: Use common rs485 device tree parsing function Uwe Kleine-König 2017-06-26 9:08 ` Uwe Kleine-König 2017-06-26 9:08 ` [PATCH v3 9/9] of: document rs485 bindings for Atmel USART, Freescale UARTs and OMAP UART Uwe Kleine-König 2017-06-26 9:08 ` Uwe Kleine-König [not found] ` <20170626090803.10981-10-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2017-06-27 7:42 ` Nicolas Ferre 2017-06-27 7:42 ` Nicolas Ferre 2017-06-28 18:04 ` Rob Herring 2017-06-28 18:04 ` Rob Herring 2017-06-29 18:53 ` Uwe Kleine-König 2017-06-29 18:53 ` Uwe Kleine-König 2017-06-29 15:12 ` [PATCH v3 0/9] Add and make use of a common rs485 device tree parsing function Greg KH 2017-06-29 15:12 ` Greg KH [not found] ` <20170629151200.GA16362-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org> 2017-06-29 18:47 ` Uwe Kleine-König 2017-06-29 18:47 ` Uwe Kleine-König
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170626090803.10981-5-u.kleine-koenig@pengutronix.de \ --to=u.kleine-koenig-bicnvbalz9megne8c9+irq@public.gmane.org \ --cc=alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=richard.genoud-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.