Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 567fd1d4 authored by Qiang Liu's avatar Qiang Liu Committed by Greg Kroah-Hartman
Browse files

carma: remove unnecessary DMA_INTERRUPT capability 



These drivers set the DMA_INTERRUPT capability bit when requesting a DMA
controller channel. This was historical, and is no longer needed.

Recent changes to the drivers/dma/fsldma.c driver have removed support
for this flag. This makes the carma drivers unable to find a DMA channel
with the required capabilities.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarIra W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cfeb2852

drivers/misc/carma/carma-fpga-program.c

+0 −1
Original line number Diff line number Diff line
@@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op) 
	dev_set_drvdata(priv->dev, priv);

	dma_cap_zero(mask);

	dma_cap_set(DMA_MEMCPY, mask);

	dma_cap_set(DMA_INTERRUPT, mask);

	dma_cap_set(DMA_SLAVE, mask);

	dma_cap_set(DMA_SG, mask);

drivers/misc/carma/carma-fpga.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf) 
	src = SYS_FPGA_BLOCK;

	tx = chan->device->device_prep_dma_memcpy(chan, dst, src,

						  REG_BLOCK_SIZE,

						  DMA_PREP_INTERRUPT);

						  0);

	if (!tx) {

		dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");

		return -ENOMEM;