bcm2835-dma: only reserve channel 0 if legacy dma driver is enabled
authorMatthias Reichl <hias@horus.com>
Sat, 10 Oct 2020 22:48:55 +0000 (00:48 +0200)
committerpopcornmix <popcornmix@gmail.com>
Wed, 27 Jan 2021 19:13:21 +0000 (19:13 +0000)
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

index d1127b9..0cbfa9d 100644 (file)
@@ -1283,6 +1283,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
                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 platform_device *pdev)
 
                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 &