diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-01-06 10:47:32 +0100 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-01-06 10:47:32 +0100 |
commit | 7c7b680fa6b0866af2c4876da261bbfe710315d6 (patch) | |
tree | 6f2449fdecb4edab3309d40959309ca80d2bb71d /drivers/dma/edma.c | |
parent | Merge branch 'topic/desc_reuse' into for-linus (diff) | |
parent | dmaengine: omap-dma: Add support for DMA filter mapping to slave devices (diff) | |
download | linux-7c7b680fa6b0866af2c4876da261bbfe710315d6.tar.xz linux-7c7b680fa6b0866af2c4876da261bbfe710315d6.zip |
Merge branch 'topic/univ_api' into for-linus
Diffstat (limited to 'drivers/dma/edma.c')
-rw-r--r-- | drivers/dma/edma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 5317ae642d1c..6b3e9d991010 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2297,6 +2297,10 @@ static int edma_probe(struct platform_device *pdev) edma_set_chmap(&ecc->slave_chans[i], ecc->dummy_slot); } + ecc->dma_slave.filter.map = info->slave_map; + ecc->dma_slave.filter.mapcnt = info->slavecnt; + ecc->dma_slave.filter.fn = edma_filter_fn; + ret = dma_async_device_register(&ecc->dma_slave); if (ret) { dev_err(dev, "slave ddev registration failed (%d)\n", ret); |