aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-11-11 15:30:36 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-18 21:13:46 +0100
commit667f6c7f49c94213ca43a42ad5a9e23abfd81861 (patch)
treea16e6cc807cda32e1dfbaef1a0de486d5ba1166c /target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch
parent79f3f1358bf993a5d7ae14eba9cea2686b40841d (diff)
downloadupstream-667f6c7f49c94213ca43a42ad5a9e23abfd81861.tar.gz
upstream-667f6c7f49c94213ca43a42ad5a9e23abfd81861.tar.bz2
upstream-667f6c7f49c94213ca43a42ad5a9e23abfd81861.zip
kernel: bump 5.4 to 5.4.77
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>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch b/target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch
index 71c75584b8..69dc1b465a 100644
--- a/target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch
+++ b/target/linux/layerscape/patches-5.4/819-uart-0010-tty-serial-lpuart-enable-wakeup-source-for-lpuart.patch
@@ -28,7 +28,7 @@ Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
#include <linux/pm_domain.h>
#include <linux/pm_runtime.h>
#include <linux/reset.h>
-@@ -1707,10 +1708,23 @@ static void lpuart_rx_dma_startup(struct
+@@ -1722,10 +1723,23 @@ static void lpuart_rx_dma_startup(struct
}
}
@@ -53,7 +53,7 @@ Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
unsigned char temp;
/* determine FIFO size and enable FIFO mode */
-@@ -1723,14 +1737,7 @@ static int lpuart_startup(struct uart_po
+@@ -1738,14 +1752,7 @@ static int lpuart_startup(struct uart_po
sport->rxfifo_size = UARTFIFO_DEPTH((temp >> UARTPFIFO_RXSIZE_OFF) &
UARTPFIFO_FIFOSIZE_MASK);
@@ -69,7 +69,7 @@ Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
return 0;
}
-@@ -1757,11 +1764,27 @@ static void lpuart32_configure(struct lp
+@@ -1772,11 +1779,27 @@ static void lpuart32_configure(struct lp
lpuart32_write(&sport->port, temp, UARTCTRL);
}
@@ -98,9 +98,9 @@ Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
unsigned long temp;
int ret;
-@@ -1782,17 +1805,8 @@ static int lpuart32_startup(struct uart_
- sport->rxfifo_size = UARTFIFO_DEPTH((temp >> UARTFIFO_RXSIZE_OFF) &
- UARTFIFO_FIFOSIZE_MASK);
+@@ -1808,17 +1831,8 @@ static int lpuart32_startup(struct uart_
+ sport->port.fifosize = sport->txfifo_size;
+ }
- spin_lock_irqsave(&sport->port.lock, flags);
-
@@ -117,7 +117,7 @@ Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
return 0;
}
-@@ -2850,108 +2864,205 @@ static int lpuart_runtime_resume(struct
+@@ -2876,108 +2890,205 @@ static int lpuart_runtime_resume(struct
return lpuart_enable_clks(sport);
};