diff options
author | John Audia <therealgraysky@proton.me> | 2022-07-21 16:19:32 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-30 17:21:47 +0200 |
commit | aedcbaae3798c2dc1e686fb2c958a8897b4f93c9 (patch) | |
tree | 4168ff56c1ac8f55564436ca76c6126e86b6cfeb /target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch | |
parent | a409bd7705154045141e8fde408a33c19dfe9be9 (diff) | |
download | upstream-aedcbaae3798c2dc1e686fb2c958a8897b4f93c9.tar.gz upstream-aedcbaae3798c2dc1e686fb2c958a8897b4f93c9.tar.bz2 upstream-aedcbaae3798c2dc1e686fb2c958a8897b4f93c9.zip |
kernel: bump 5.10 to 5.10.132
All patches automatically rebased.
The following patch was replaced by a similar version upstream:
bcm27xx/patches-5.10/950-0036-tty-amba-pl011-Add-un-throttle-support.patch
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 7d3c0928de191b203dd5b27ddf208698d08639e3)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch index f7316fb3e6..478270fa5b 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> spin_unlock(&uap->port.lock); dev_vdbg(uap->port.dev, "Took %d chars from DMA buffer and %d chars from the FIFO\n", -@@ -1341,6 +1344,7 @@ __acquires(&uap->port.lock) +@@ -1350,6 +1353,7 @@ __acquires(&uap->port.lock) { pl011_fifo_to_tty(uap); @@ -66,7 +66,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> spin_unlock(&uap->port.lock); tty_flip_buffer_push(&uap->port.state->port); /* -@@ -1474,6 +1478,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1483,6 +1487,7 @@ static irqreturn_t pl011_int(int irq, vo int handled = 0; spin_lock_irqsave(&uap->port.lock, flags); @@ -74,7 +74,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> status = pl011_read(uap, REG_RIS) & uap->im; if (status) { do { -@@ -1493,7 +1498,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1502,7 +1507,7 @@ static irqreturn_t pl011_int(int irq, vo UART011_CTSMIS|UART011_RIMIS)) pl011_modem_status(uap); if (status & UART011_TXIS) |