diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 11:17:59 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-03-14 11:17:59 +0530 |
| commit | 805dd3508b2398ca339f5dd3b2d11ac82ef41b5c (patch) | |
| tree | 32fc13d8d203b570e666c21758b2f81ae6670bf7 /drivers/dma | |
| parent | 0e3d5b212999803542a2be5e0e439d7275eb1ad5 (diff) | |
| parent | 9bef6d8288eb568121d3a9ef8ada80960ad9bdec (diff) | |
| download | linux-next-805dd3508b2398ca339f5dd3b2d11ac82ef41b5c.tar.gz | |
Merge branch 'topic/omap' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/omap-dma.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 9794b073d7d7..43bd5aee7ffe 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -1009,6 +1009,13 @@ static int omap_dma_terminate_all(struct dma_chan *chan) return 0; } +static void omap_dma_synchronize(struct dma_chan *chan) +{ + struct omap_chan *c = to_omap_dma_chan(chan); + + vchan_synchronize(&c->vc); +} + static int omap_dma_pause(struct dma_chan *chan) { struct omap_chan *c = to_omap_dma_chan(chan); @@ -1112,6 +1119,7 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.device_pause = omap_dma_pause; od->ddev.device_resume = omap_dma_resume; od->ddev.device_terminate_all = omap_dma_terminate_all; + od->ddev.device_synchronize = omap_dma_synchronize; od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); |