Merge tag 'char-misc-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-2.6-microblaze.git] / drivers / mfd / motorola-cpcap.c

diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
index 30d82bf..6fb206d 100644 (file)
--- a/drivers/mfd/motorola-cpcap.c
+++ b/drivers/mfd/motorola-cpcap.c
@@ -327,6 +327,10 @@ static int cpcap_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
+       /* Parent SPI controller uses DMA, CPCAP and child devices do not */
+       spi->dev.coherent_dma_mask = 0;
+       spi->dev.dma_mask = &spi->dev.coherent_dma_mask;
+
        return devm_mfd_add_devices(&spi->dev, 0, cpcap_mfd_devices,
                                    ARRAY_SIZE(cpcap_mfd_devices), NULL, 0, NULL);
 }