aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2021-08-21 10:54:34 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-08-21 19:07:07 +0200
commit8299d1f057439f94c6a4412e2e5c5082b82a30c9 (patch)
tree1bf678d61f11f7394493be464c7876e496f7faed /target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
parent33b6885975ce376ff075362b7f0890326043111b (diff)
downloadupstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.gz
upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.bz2
upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.zip
bcm27xx: add kernel 5.10 support
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch b/target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
new file mode 100644
index 0000000000..bf7ae54c08
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.10/950-0343-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
@@ -0,0 +1,32 @@
+From 137865877ea138ef9c593ce74cbd4ddc2560e057 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sun, 11 Oct 2020 00:48:55 +0200
+Subject: [PATCH] bcm2835-dma: only reserve channel 0 if legacy dma
+ driver is enabled
+
+If CONFIG_DMA_BCM2708 isn't enabled there's no need to mask out
+one of the already scarce DMA channels.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ drivers/dma/bcm2835-dma.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/dma/bcm2835-dma.c
++++ b/drivers/dma/bcm2835-dma.c
+@@ -1283,6 +1283,7 @@ static int bcm2835_dma_probe(struct plat
+ goto err_no_dma;
+ }
+
++#ifdef CONFIG_DMA_BCM2708
+ /* One channel is reserved for the legacy API */
+ if (chans_available & BCM2835_DMA_BULK_MASK) {
+ rc = bcm_dmaman_probe(pdev, base,
+@@ -1293,6 +1294,7 @@ static int bcm2835_dma_probe(struct plat
+
+ chans_available &= ~BCM2835_DMA_BULK_MASK;
+ }
++#endif
+
+ /* And possibly one for the 40-bit DMA memcpy API */
+ if (chans_available & od->cfg_data->chan_40bit_mask &