diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-03 16:34:15 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-04 15:32:22 +0200 |
commit | bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c (patch) | |
tree | a14ee2d05b866a146be2544c04b795eb5c2c68a8 /target/linux/bcm27xx/patches-5.4/950-0263-tty-amba-pl011-Make-TX-optimisation-conditional.patch | |
parent | 8d24ea3f31b4e60a342e579e3218e1adc282dba3 (diff) | |
download | upstream-bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c.tar.gz upstream-bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c.tar.bz2 upstream-bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c.zip |
kernel: bump 5.4 to 5.4.211
Similar version was upstreamed:
bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch
Manually adapted:
ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch
Compile-tested: x86/64
Run-tested: x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0263-tty-amba-pl011-Make-TX-optimisation-conditional.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0263-tty-amba-pl011-Make-TX-optimisation-conditional.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0263-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/bcm27xx/patches-5.4/950-0263-tty-amba-pl011-Make-TX-optimisation-conditional.patch index 58829c9e92..88188ce617 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0263-tty-amba-pl011-Make-TX-optimisation-conditional.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0263-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", -@@ -1350,6 +1353,7 @@ __acquires(&uap->port.lock) +@@ -1359,6 +1362,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); /* -@@ -1485,6 +1489,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1494,6 +1498,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 { -@@ -1504,7 +1509,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1513,7 +1518,7 @@ static irqreturn_t pl011_int(int irq, vo UART011_CTSMIS|UART011_RIMIS)) pl011_modem_status(uap); if (status & UART011_TXIS) |