aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/carma
diff options
context:
space:
mode:
authorQiang Liu <qiang.liu@freescale.com>2012-08-09 04:23:31 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 13:10:02 -0400
commit567fd1d4a66a2d6e5599be0ada582e0a3dbd23d4 (patch)
tree328dc3d30a7c4a8672a340243ef511c00a4fd380 /drivers/misc/carma
parentcfeb28525faa855b7f0bd06a330a6961f4c5127e (diff)
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: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/carma')
-rw-r--r--drivers/misc/carma/carma-fpga-program.c1
-rw-r--r--drivers/misc/carma/carma-fpga.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index a2d25e4857e3..eaddfe9db149 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op)
978 dev_set_drvdata(priv->dev, priv); 978 dev_set_drvdata(priv->dev, priv);
979 dma_cap_zero(mask); 979 dma_cap_zero(mask);
980 dma_cap_set(DMA_MEMCPY, mask); 980 dma_cap_set(DMA_MEMCPY, mask);
981 dma_cap_set(DMA_INTERRUPT, mask);
982 dma_cap_set(DMA_SLAVE, mask); 981 dma_cap_set(DMA_SLAVE, mask);
983 dma_cap_set(DMA_SG, mask); 982 dma_cap_set(DMA_SG, mask);
984 983
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 8c279da07410..0c43297ed9ac 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf)
666 src = SYS_FPGA_BLOCK; 666 src = SYS_FPGA_BLOCK;
667 tx = chan->device->device_prep_dma_memcpy(chan, dst, src, 667 tx = chan->device->device_prep_dma_memcpy(chan, dst, src,
668 REG_BLOCK_SIZE, 668 REG_BLOCK_SIZE,
669 DMA_PREP_INTERRUPT); 669 0);
670 if (!tx) { 670 if (!tx) {
671 dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n"); 671 dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");
672 return -ENOMEM; 672 return -ENOMEM;