diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-08-05 07:43:44 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-08-19 09:10:04 -0400 |
commit | d7db80801f8117cf210b9e2cd2c800e326d59fa2 (patch) | |
tree | 27f954b51f2eed85d16ec1a54dacc0730c717116 /drivers/dma/at_hdmac.c | |
parent | 3c477482bb9f976e5451c50be7d3d60ea6f88646 (diff) |
dmaengine: at_hdmac: fix way to specify cyclic capability
In this driver, we can trigger cyclic transfer on peripherals-DMA interfaces.
It is dependent on driver implementation but cannot depend on a platform
property: we remove the dma_has_cap(DMA_CYCLIC, ) test which has no meaning.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/at_hdmac.c')
-rw-r--r-- | drivers/dma/at_hdmac.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index d774800b9fa4..3b99dc62874b 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
@@ -1301,15 +1301,13 @@ static int __init at_dma_probe(struct platform_device *pdev) | |||
1301 | if (dma_has_cap(DMA_MEMCPY, atdma->dma_common.cap_mask)) | 1301 | if (dma_has_cap(DMA_MEMCPY, atdma->dma_common.cap_mask)) |
1302 | atdma->dma_common.device_prep_dma_memcpy = atc_prep_dma_memcpy; | 1302 | atdma->dma_common.device_prep_dma_memcpy = atc_prep_dma_memcpy; |
1303 | 1303 | ||
1304 | if (dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask)) | 1304 | if (dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask)) { |
1305 | atdma->dma_common.device_prep_slave_sg = atc_prep_slave_sg; | 1305 | atdma->dma_common.device_prep_slave_sg = atc_prep_slave_sg; |
1306 | 1306 | /* controller can do slave DMA: can trigger cyclic transfers */ | |
1307 | if (dma_has_cap(DMA_CYCLIC, atdma->dma_common.cap_mask)) | 1307 | dma_cap_set(DMA_CYCLIC, atdma->dma_common.cap_mask); |
1308 | atdma->dma_common.device_prep_dma_cyclic = atc_prep_dma_cyclic; | 1308 | atdma->dma_common.device_prep_dma_cyclic = atc_prep_dma_cyclic; |
1309 | |||
1310 | if (dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask) || | ||
1311 | dma_has_cap(DMA_CYCLIC, atdma->dma_common.cap_mask)) | ||
1312 | atdma->dma_common.device_control = atc_control; | 1309 | atdma->dma_common.device_control = atc_control; |
1310 | } | ||
1313 | 1311 | ||
1314 | dma_writel(atdma, EN, AT_DMA_ENABLE); | 1312 | dma_writel(atdma, EN, AT_DMA_ENABLE); |
1315 | 1313 | ||