mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
667f6c7f49
Manually rebased patches:
bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch
layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch
mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
Removed:
layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
lantiq/Easybox 904 xDSL, x86_64
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 5f1a35c3f5c17cc6229873248a56784fcd03db1c Mon Sep 17 00:00:00 2001
|
|
From: Fugang Duan <fugang.duan@nxp.com>
|
|
Date: Fri, 27 Sep 2019 15:18:41 +0800
|
|
Subject: [PATCH] serial: fsl_lpuart: enable two stop bits
|
|
|
|
Add two stop bits support.
|
|
User can run the command to enable two stop bits
|
|
for test: stty cstopb -F /dev/ttyLPx
|
|
|
|
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
|
|
---
|
|
drivers/tty/serial/fsl_lpuart.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
|
@@ -2135,11 +2135,12 @@ lpuart32_set_termios(struct uart_port *p
|
|
{
|
|
struct lpuart_port *sport = container_of(port, struct lpuart_port, port);
|
|
unsigned long flags;
|
|
- unsigned long ctrl, old_ctrl, modem;
|
|
+ unsigned long ctrl, old_ctrl, bd, modem;
|
|
unsigned int baud;
|
|
unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;
|
|
|
|
ctrl = old_ctrl = lpuart32_read(&sport->port, UARTCTRL);
|
|
+ bd = lpuart32_read(&sport->port, UARTBAUD);
|
|
modem = lpuart32_read(&sport->port, UARTMODIR);
|
|
/*
|
|
* only support CS8 and CS7, and for CS7 must enable PE.
|
|
@@ -2176,7 +2177,9 @@ lpuart32_set_termios(struct uart_port *p
|
|
}
|
|
|
|
if (termios->c_cflag & CSTOPB)
|
|
- termios->c_cflag &= ~CSTOPB;
|
|
+ bd |= UARTBAUD_SBNS;
|
|
+ else
|
|
+ bd &= ~UARTBAUD_SBNS;
|
|
|
|
/* parity must be enabled when CS7 to match 8-bits format */
|
|
if ((termios->c_cflag & CSIZE) == CS7)
|
|
@@ -2246,6 +2249,7 @@ lpuart32_set_termios(struct uart_port *p
|
|
lpuart32_write(&sport->port, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE),
|
|
UARTCTRL);
|
|
|
|
+ lpuart32_write(&sport->port, bd, UARTBAUD);
|
|
lpuart32_serial_setbrg(sport, baud);
|
|
lpuart32_write(&sport->port, modem, UARTMODIR);
|
|
lpuart32_write(&sport->port, ctrl, UARTCTRL);
|