From: Martin Devera <devik@eaxlabs.cz>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
linux-serial@vger.kernel.org (open list:SERIAL DRIVERS),
linux-arm-kernel@lists.infradead.org (moderated list:ARM/STM32
ARCHITECTURE), linux-kernel@vger.kernel.org (open list)
Cc: Martin Devera <devik@eaxlabs.cz>
Subject: [PATCH 1/2] tty/serial: Add st,swap OF option to stm32-usart
Date: Sat, 29 Feb 2020 17:05:06 +0100 [thread overview]
Message-ID: <20200229160507.31309-1-devik@eaxlabs.cz> (raw)
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 fdcc2142aa79..8d25869a02eb 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -780,7 +780,7 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios,
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;
/* Tx and RX FIFO configuration */
cr3 = readl_relaxed(port->membase + ofs->cr3);
@@ -1097,6 +1097,7 @@ static struct stm32_port *stm32_of_get_stm32_port(struct platform_device *pdev)
stm32_ports[id].hw_flow_control = of_property_read_bool(np,
"st,hw-flow-ctrl");
+ stm32_ports[id].swap = of_property_read_bool(np, "st,swap");
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 2a68bc48652e..2503a91b890c 100644
--- a/drivers/tty/serial/stm32-usart.h
+++ b/drivers/tty/serial/stm32-usart.h
@@ -275,6 +275,7 @@ struct stm32_port {
enum dma_cb rx_dma_cb; /* dma rx callback status */
bool tx_dma_busy; /* dma tx busy */
bool hw_flow_control;
+ bool swap; /* swap RX & TX pins */
bool fifoen;
int wakeirq;
struct pinctrl_state *console_pins;
--
2.11.0
next reply other threads:[~2020-02-29 16:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 16:05 Martin Devera [this message]
2020-02-29 16:05 ` [PATCH 2/2] dt-bindings: serial: Add st,swap to stm32-usart Martin Devera
2020-03-10 19:00 ` 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 ` [PATCH v2 2/2] dt-bindings: serial: Add rx-tx-swap " Martin Devera
2021-03-01 10:36 ` Fabrice Gasnier
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-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 ` [PATCH v3 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera
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 ` [PATCH v4 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera
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-08 19:20 ` Rob Herring
2021-03-11 21:51 ` [PATCH v5 " Martin Devera
2021-03-11 21:51 ` [PATCH v5 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera
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 ` [PATCH v6 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera
2021-03-12 14:23 ` [PATCH v6 1/2] dt-bindings: serial: Add rx-tx-swap " Rob Herring
2021-03-12 14:56 ` Martin DEVERA
2021-03-12 15:03 ` Martin DEVERA
2021-03-12 15:37 ` [PATCH v7 " Martin Devera
2021-03-12 15:37 ` [PATCH v7 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera
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 ` [PATCH v8 2/2] tty/serial: Add rx-tx-swap OF option " Martin Devera
2021-03-23 22:30 ` [PATCH v7 1/2] dt-bindings: serial: Add rx-tx-swap " Rob Herring
2021-03-02 19:06 ` [PATCH v3 2/2] tty/serial: Add rx-tx-swap OF option " Martin DEVERA
2020-03-12 9:02 ` [PATCH 1/2] tty/serial: Add st,swap " 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=20200229160507.31309-1-devik@eaxlabs.cz \
--to=devik@eaxlabs.cz \
--cc=alexandre.torgue@st.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).