aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-23 03:00:02 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-26 12:49:15 +0200
commitd8dc9f108a9267a1783269d59e8afcf2ebe7e6db (patch)
tree4a287e6ce97ae551ca41ef8aeed80afcf4df353c /target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch
parent697e80d12b776f424448bded5e4ed3a06517ddfc (diff)
downloadupstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.tar.gz
upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.tar.bz2
upstream-d8dc9f108a9267a1783269d59e8afcf2ebe7e6db.zip
kernel: bump 5.4 to 5.4.126
Manually rebased: bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch All other patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch b/target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch
index f82ae7d9f6..5326934b71 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0212-spi-bcm2835-enable-shared-interrupt-support.patch
@@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
/* Read as many bytes as possible from FIFO */
bcm2835_rd_fifo(bs);
/* Write as many bytes as possible to FIFO */
-@@ -1281,7 +1285,8 @@ static int bcm2835_spi_probe(struct plat
+@@ -1287,7 +1291,8 @@ static int bcm2835_spi_probe(struct plat
bcm2835_wr(bs, BCM2835_SPI_CS,
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);