Message ID | 20200229160507.31309-1-devik@eaxlabs.cz (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/2] tty/serial: Add st,swap OF option to stm32-usart | expand |
On Sat, Feb 29, 2020 at 05:05:06PM +0100, 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(-) This, and patch 2/2, do not apply to my tty-next branch at all. What did you make them against? Please rebase and resend the series. thanks, greg k-h
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;
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(-)