apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

carma: remove unnecessary DMA_INTERRUPT capability

Browse Source 
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: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Qiang Liu
2012-08-09 16:23:31 +08:00
committed by Greg Kroah-Hartman
parent cfeb28525f
commit 567fd1d4a6
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/misc/carma/carma-fpga-program.c
-1
View File
@@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op)
dev_set_drvdata(priv->dev, priv); dev_set_drvdata(priv->dev, priv);
dma_cap_zero(mask); dma_cap_zero(mask);
dma_cap_set(DMA_MEMCPY, mask); dma_cap_set(DMA_MEMCPY, mask);
dma_cap_set(DMA_INTERRUPT, mask);
dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SLAVE, mask);
dma_cap_set(DMA_SG, mask); dma_cap_set(DMA_SG, mask);
drivers/misc/carma/carma-fpga.c
+1 -1
View File
@@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf)
src = SYS_FPGA_BLOCK; src = SYS_FPGA_BLOCK;
tx = chan->device->device_prep_dma_memcpy(chan, dst, src, tx = chan->device->device_prep_dma_memcpy(chan, dst, src,
REG_BLOCK_SIZE, REG_BLOCK_SIZE,
DMA_PREP_INTERRUPT); 0);
if (!tx) { if (!tx) {
dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n"); dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");
return -ENOMEM; return -ENOMEM;