diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 15:29:16 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:05:34 +0200 |
commit | 8cc7ac54b6cfbccf61f31c51313e6480811b5f44 (patch) | |
tree | 4a0f1d2c650d837e1fd6a0156827c4a1ac958bf8 /target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch | |
parent | 1c95d78f087c9cd78caf17181525c8853d78bf1c (diff) | |
download | upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.gz upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.bz2 upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.zip |
kernel: bump 5.4 to 5.4.150
Manually rebased:
generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
Removed upstreamed:
generic/backport-5.4/040-ARM-8918-2-only-build-return_address-if-needed.patch
layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch')
-rw-r--r-- | target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch index 872b2bad45..2b3a4ae12f 100644 --- a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch @@ -10,7 +10,7 @@ #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c -@@ -290,7 +290,7 @@ static const struct serial8250_config ua +@@ -291,7 +291,7 @@ static const struct serial8250_config ua .tx_loadsz = 16, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2597,6 +2597,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2598,6 +2598,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; |