From aedcbaae3798c2dc1e686fb2c958a8897b4f93c9 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 21 Jul 2022 16:19:32 -0400 Subject: 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 (cherry picked from commit 7d3c0928de191b203dd5b27ddf208698d08639e3) --- .../950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/bcm27xx/patches-5.10/950-0035-tty-amba-pl011-Make-TX-optimisation-conditional.patch') 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 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 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 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) -- cgit v1.2.3