diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 21:39:09 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 21:39:09 +0530 |
| commit | cf6c0ab54daeb614ae79bdd0168e8b7ec2650134 (patch) | |
| tree | a5dbdf23ae9184edce0cab7944df9798da309a1d /drivers/misc/carma | |
| parent | 2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (diff) | |
| parent | b80719b6bd083130c112cb4d3e5329a164eef4c3 (diff) | |
| download | linux-cf6c0ab54daeb614ae79bdd0168e8b7ec2650134.tar.gz | |
Merge branch 'topic/dma_control_fsl_acks' into for-linus
Diffstat (limited to 'drivers/misc/carma')
| -rw-r--r-- | drivers/misc/carma/carma-fpga-program.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c index 7be89832db19..298f9127e697 100644 --- a/drivers/misc/carma/carma-fpga-program.c +++ b/drivers/misc/carma/carma-fpga-program.c @@ -16,6 +16,7 @@ #include <linux/completion.h> #include <linux/miscdevice.h> #include <linux/dmaengine.h> +#include <linux/fsldma.h> #include <linux/interrupt.h> #include <linux/highmem.h> #include <linux/kernel.h> @@ -518,23 +519,22 @@ static noinline int fpga_program_dma(struct fpga_dev *priv) config.direction = DMA_MEM_TO_DEV; config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4; - ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG, - (unsigned long)&config); + ret = dmaengine_slave_config(chan, &config); if (ret) { dev_err(priv->dev, "DMA slave configuration failed\n"); goto out_dma_unmap; } - ret = chan->device->device_control(chan, FSLDMA_EXTERNAL_START, 1); + ret = fsl_dma_external_start(chan, 1) if (ret) { dev_err(priv->dev, "DMA external control setup failed\n"); goto out_dma_unmap; } /* setup and submit the DMA transaction */ - tx = chan->device->device_prep_dma_sg(chan, - table.sgl, num_pages, - vb->sglist, vb->sglen, 0); + + tx = dmaengine_prep_dma_sg(chan, table.sgl, num_pages, + vb->sglist, vb->sglen, 0); if (!tx) { dev_err(priv->dev, "Unable to prep DMA transaction\n"); ret = -ENOMEM; |