From: Fabrice Gasnier <fabrice.gasnier@foss.st.com> To: Martin Devera <devik@eaxlabs.cz>, <linux-kernel@vger.kernel.org> Cc: <devicetree@vger.kernel.org>, Alexandre Torgue <alexandre.torgue@st.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rob Herring <robh+dt@kernel.org>, <linux-arm-kernel@lists.infradead.org>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, <linux-serial@vger.kernel.org>, Jiri Slaby <jirislaby@kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>, Le Ray <erwan.leray@st.com> Subject: Re: [PATCH v2 1/2] tty/serial: Add rx-tx-swap OF option to stm32-usart Date: Mon, 1 Mar 2021 11:28:50 +0100 [thread overview] Message-ID: <439a0d7a-cc0e-764b-7ed8-668b5a85f4a7@foss.st.com> (raw) In-Reply-To: <20210227164157.30971-1-devik@eaxlabs.cz> On 2/27/21 5:41 PM, Martin Devera wrote: > STM32 F7/H7 usarts supports RX & TX pin swapping. > Add option to turn it on. > Tested on STM32MP157. > > Signed-off-by: Martin Devera <devik@eaxlabs.cz> > --- > drivers/tty/serial/stm32-usart.c | 3 ++- > drivers/tty/serial/stm32-usart.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c > index b3675cf25a69..3650c8798061 100644 > --- a/drivers/tty/serial/stm32-usart.c > +++ b/drivers/tty/serial/stm32-usart.c > @@ -758,7 +758,7 @@ static void stm32_usart_set_termios(struct uart_port *port, > cr1 = USART_CR1_TE | USART_CR1_RE; > if (stm32_port->fifoen) > cr1 |= USART_CR1_FIFOEN; > - cr2 = 0; > + cr2 = stm32_port->swap ? USART_CR2_SWAP : 0; Hi Martin, Same could be done in the startup routine, that enables the port for reception (as described in Documentation/driver-api/serial/driver.rst) > cr3 = readl_relaxed(port->membase + ofs->cr3); > cr3 &= USART_CR3_TXFTIE | USART_CR3_RXFTCFG_MASK | USART_CR3_RXFTIE > | USART_CR3_TXFTCFG_MASK; > @@ -1078,6 +1078,7 @@ static struct stm32_port *stm32_usart_of_get_port(struct platform_device *pdev) > stm32_ports[id].hw_flow_control = > of_property_read_bool (np, "st,hw-flow-ctrl") /*deprecated*/ || > of_property_read_bool (np, "uart-has-rtscts"); > + stm32_ports[id].swap = of_property_read_bool(np, "rx-tx-swap"); The swap option/bit is available starting with stm32f7 (e.g. not on stm32f4). This could be added to compatible data, e.g. as done for other capabilities in stm32-usart.h. E.g you could add a "has_swap" in struct stm32_usart_config, then use it at probe time: if (cfg->has_swap) stm32_ports[id].swap = ...; Thanks for your patch, Best regards, Fabrice > stm32_ports[id].port.line = id; > stm32_ports[id].cr1_irq = USART_CR1_RXNEIE; > stm32_ports[id].cr3_irq = 0; > diff --git a/drivers/tty/serial/stm32-usart.h b/drivers/tty/serial/stm32-usart.h > index cb4f327c46db..2f054e2dc0ab 100644 > --- a/drivers/tty/serial/stm32-usart.h > +++ b/drivers/tty/serial/stm32-usart.h > @@ -271,6 +271,7 @@ struct stm32_port { > int last_res; > bool tx_dma_busy; /* dma tx busy */ > bool hw_flow_control; > + bool swap; /* swap RX & TX pins */ > bool fifoen; > int wakeirq; > int rdr_mask; /* receive data register mask */ >
WARNING: multiple messages have this Message-ID (diff)
From: Fabrice Gasnier <fabrice.gasnier@foss.st.com> To: Martin Devera <devik@eaxlabs.cz>, <linux-kernel@vger.kernel.org> Cc: devicetree@vger.kernel.org, Alexandre Torgue <alexandre.torgue@st.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rob Herring <robh+dt@kernel.org>, Le Ray <erwan.leray@st.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, linux-serial@vger.kernel.org, Jiri Slaby <jirislaby@kernel.org>, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 1/2] tty/serial: Add rx-tx-swap OF option to stm32-usart Date: Mon, 1 Mar 2021 11:28:50 +0100 [thread overview] Message-ID: <439a0d7a-cc0e-764b-7ed8-668b5a85f4a7@foss.st.com> (raw) In-Reply-To: <20210227164157.30971-1-devik@eaxlabs.cz> On 2/27/21 5:41 PM, Martin Devera wrote: > STM32 F7/H7 usarts supports RX & TX pin swapping. > Add option to turn it on. > Tested on STM32MP157. > > Signed-off-by: Martin Devera <devik@eaxlabs.cz> > --- > drivers/tty/serial/stm32-usart.c | 3 ++- > drivers/tty/serial/stm32-usart.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c > index b3675cf25a69..3650c8798061 100644 > --- a/drivers/tty/serial/stm32-usart.c > +++ b/drivers/tty/serial/stm32-usart.c > @@ -758,7 +758,7 @@ static void stm32_usart_set_termios(struct uart_port *port, > cr1 = USART_CR1_TE | USART_CR1_RE; > if (stm32_port->fifoen) > cr1 |= USART_CR1_FIFOEN; > - cr2 = 0; > + cr2 = stm32_port->swap ? USART_CR2_SWAP : 0; Hi Martin, Same could be done in the startup routine, that enables the port for reception (as described in Documentation/driver-api/serial/driver.rst) > cr3 = readl_relaxed(port->membase + ofs->cr3); > cr3 &= USART_CR3_TXFTIE | USART_CR3_RXFTCFG_MASK | USART_CR3_RXFTIE > | USART_CR3_TXFTCFG_MASK; > @@ -1078,6 +1078,7 @@ static struct stm32_port *stm32_usart_of_get_port(struct platform_device *pdev) > stm32_ports[id].hw_flow_control = > of_property_read_bool (np, "st,hw-flow-ctrl") /*deprecated*/ || > of_property_read_bool (np, "uart-has-rtscts"); > + stm32_ports[id].swap = of_property_read_bool(np, "rx-tx-swap"); The swap option/bit is available starting with stm32f7 (e.g. not on stm32f4). This could be added to compatible data, e.g. as done for other capabilities in stm32-usart.h. E.g you could add a "has_swap" in struct stm32_usart_config, then use it at probe time: if (cfg->has_swap) stm32_ports[id].swap = ...; Thanks for your patch, Best regards, Fabrice > stm32_ports[id].port.line = id; > stm32_ports[id].cr1_irq = USART_CR1_RXNEIE; > stm32_ports[id].cr3_irq = 0; > diff --git a/drivers/tty/serial/stm32-usart.h b/drivers/tty/serial/stm32-usart.h > index cb4f327c46db..2f054e2dc0ab 100644 > --- a/drivers/tty/serial/stm32-usart.h > +++ b/drivers/tty/serial/stm32-usart.h > @@ -271,6 +271,7 @@ struct stm32_port { > int last_res; > bool tx_dma_busy; /* dma tx busy */ > bool hw_flow_control; > + bool swap; /* swap RX & TX pins */ > bool fifoen; > int wakeirq; > int rdr_mask; /* receive data register mask */ > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-03-01 10:30 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-29 16:05 [PATCH 1/2] tty/serial: Add st,swap OF option to stm32-usart Martin Devera 2020-02-29 16:05 ` Martin Devera 2020-02-29 16:05 ` [PATCH 2/2] dt-bindings: serial: Add st,swap " Martin Devera 2020-02-29 16:05 ` Martin Devera 2020-03-10 19:00 ` Rob Herring 2020-03-10 19:00 ` Rob Herring 2020-03-10 19:00 ` Rob Herring 2020-03-20 18:05 ` Rob Herring 2020-03-20 18:05 ` Rob Herring 2021-02-27 16:41 ` [PATCH v2 1/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-02-27 16:41 ` Martin Devera 2021-02-27 16:41 ` [PATCH v2 2/2] dt-bindings: serial: Add rx-tx-swap " Martin Devera 2021-02-27 16:41 ` Martin Devera 2021-03-01 10:36 ` Fabrice Gasnier 2021-03-01 10:36 ` Fabrice Gasnier 2021-03-01 10:28 ` Fabrice Gasnier [this message] 2021-03-01 10:28 ` [PATCH v2 1/2] tty/serial: Add rx-tx-swap OF option " Fabrice Gasnier 2021-03-01 22:40 ` Martin DEVERA 2021-03-01 22:40 ` Martin DEVERA 2021-03-02 10:20 ` Fabrice Gasnier 2021-03-02 10:20 ` Fabrice Gasnier 2021-03-02 13:15 ` [PATCH v3 1/2] dt-bindings: serial: Add rx-tx-swap " Martin Devera 2021-03-02 13:15 ` Martin Devera 2021-03-02 13:15 ` [PATCH v3 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-03-02 13:15 ` Martin Devera 2021-03-02 17:44 ` Fabrice Gasnier 2021-03-02 17:44 ` Fabrice Gasnier 2021-03-02 19:03 ` [PATCH v4 1/2] dt-bindings: serial: Add rx-tx-swap " Martin Devera 2021-03-02 19:03 ` Martin Devera 2021-03-02 19:03 ` [PATCH v4 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-03-02 19:03 ` Martin Devera 2021-03-03 16:06 ` Fabrice Gasnier 2021-03-03 16:06 ` Fabrice Gasnier 2021-03-03 17:23 ` [PATCH v4 1/2] dt-bindings: serial: Add rx-tx-swap " Fabrice Gasnier 2021-03-03 17:23 ` Fabrice Gasnier 2021-03-08 19:20 ` Rob Herring 2021-03-08 19:20 ` Rob Herring 2021-03-11 21:51 ` [PATCH v5 " Martin Devera 2021-03-11 21:51 ` Martin Devera 2021-03-11 21:51 ` [PATCH v5 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-03-11 21:51 ` Martin Devera 2021-03-12 8:15 ` Greg Kroah-Hartman 2021-03-12 8:15 ` Greg Kroah-Hartman 2021-03-12 10:27 ` [PATCH v6 1/2] dt-bindings: serial: Add rx-tx-swap " Martin Devera 2021-03-12 10:27 ` Martin Devera 2021-03-12 10:27 ` [PATCH v6 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-03-12 10:27 ` Martin Devera 2021-03-12 14:23 ` [PATCH v6 1/2] dt-bindings: serial: Add rx-tx-swap " Rob Herring 2021-03-12 14:23 ` Rob Herring 2021-03-12 14:56 ` Martin DEVERA 2021-03-12 14:56 ` Martin DEVERA 2021-03-12 15:03 ` Martin DEVERA 2021-03-12 15:03 ` Martin DEVERA 2021-03-12 15:37 ` [PATCH v7 " Martin Devera 2021-03-12 15:37 ` Martin Devera 2021-03-12 15:37 ` [PATCH v7 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-03-12 15:37 ` Martin Devera 2021-03-26 14:18 ` Greg Kroah-Hartman 2021-03-26 14:18 ` Greg Kroah-Hartman 2021-03-28 15:43 ` [PATCH v8 1/2] dt-bindings: serial: Add rx-tx-swap " Martin Devera 2021-03-28 15:43 ` Martin Devera 2021-03-28 15:43 ` [PATCH v8 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera 2021-03-28 15:43 ` Martin Devera 2021-03-23 22:30 ` [PATCH v7 1/2] dt-bindings: serial: Add rx-tx-swap " Rob Herring 2021-03-23 22:30 ` Rob Herring 2021-03-02 19:06 ` [PATCH v3 2/2] tty/serial: Add rx-tx-swap OF option " Martin DEVERA 2021-03-02 19:06 ` Martin DEVERA 2020-03-12 9:02 ` [PATCH 1/2] tty/serial: Add st,swap " Greg Kroah-Hartman 2020-03-12 9:02 ` Greg Kroah-Hartman
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=439a0d7a-cc0e-764b-7ed8-668b5a85f4a7@foss.st.com \ --to=fabrice.gasnier@foss.st.com \ --cc=alexandre.torgue@st.com \ --cc=devicetree@vger.kernel.org \ --cc=devik@eaxlabs.cz \ --cc=erwan.leray@st.com \ --cc=gregkh@linuxfoundation.org \ --cc=jirislaby@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=robh+dt@kernel.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.