mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
b4c02c9998
Removed upstreamed patches:
generic/pending-5.4
445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
446-mtd-spinand-gigadevice-Add-QE-Bit.patch
pistachio/patches-5.4
150-pwm-img-Fix-null-pointer-access-in-probe.patch
Manually rebased:
layerscape/patches-5.4
801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
mvebu (mamba, rango), x86_64, ramips/mt7621
Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh]
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
|
|
@@ -2109,11 +2109,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.
|
|
@@ -2150,7 +2151,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)
|
|
@@ -2220,6 +2223,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);
|