diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-08-17 17:57:59 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-08-17 17:57:59 +0530 |
| commit | d3df935e35f5be0cf2647e281bda60214c92dc79 (patch) | |
| tree | d6cbfb6263d0bab01c9f0a330ef8ff381251f2e1 /drivers/dma | |
| parent | d0c993f6acafb8e30000192c837aa7337de68d3b (diff) | |
| parent | bbacb8e78a3b29ebdbb6af7d54fcf25d3f1c248f (diff) | |
| download | op-kernel-dev-d3df935e35f5be0cf2647e281bda60214c92dc79.zip op-kernel-dev-d3df935e35f5be0cf2647e281bda60214c92dc79.tar.gz | |
Merge branch 'topic/intel' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/hsu/hsu.c | 8 | ||||
| -rw-r--r-- | drivers/dma/idma64.c | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c index 29d04ca..202ffa9 100644 --- a/drivers/dma/hsu/hsu.c +++ b/drivers/dma/hsu/hsu.c @@ -413,6 +413,13 @@ static void hsu_dma_free_chan_resources(struct dma_chan *chan) vchan_free_chan_resources(to_virt_chan(chan)); } +static void hsu_dma_synchronize(struct dma_chan *chan) +{ + struct hsu_dma_chan *hsuc = to_hsu_dma_chan(chan); + + vchan_synchronize(&hsuc->vchan); +} + int hsu_dma_probe(struct hsu_dma_chip *chip) { struct hsu_dma *hsu; @@ -459,6 +466,7 @@ int hsu_dma_probe(struct hsu_dma_chip *chip) hsu->dma.device_pause = hsu_dma_pause; hsu->dma.device_resume = hsu_dma_resume; hsu->dma.device_terminate_all = hsu_dma_terminate_all; + hsu->dma.device_synchronize = hsu_dma_synchronize; hsu->dma.src_addr_widths = HSU_DMA_BUSWIDTHS; hsu->dma.dst_addr_widths = HSU_DMA_BUSWIDTHS; diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index e5c9112..1fbf9cb 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c @@ -496,6 +496,13 @@ static int idma64_terminate_all(struct dma_chan *chan) return 0; } +static void idma64_synchronize(struct dma_chan *chan) +{ + struct idma64_chan *idma64c = to_idma64_chan(chan); + + vchan_synchronize(&idma64c->vchan); +} + static int idma64_alloc_chan_resources(struct dma_chan *chan) { struct idma64_chan *idma64c = to_idma64_chan(chan); @@ -583,6 +590,7 @@ static int idma64_probe(struct idma64_chip *chip) idma64->dma.device_pause = idma64_pause; idma64->dma.device_resume = idma64_resume; idma64->dma.device_terminate_all = idma64_terminate_all; + idma64->dma.device_synchronize = idma64_synchronize; idma64->dma.src_addr_widths = IDMA64_BUSWIDTHS; idma64->dma.dst_addr_widths = IDMA64_BUSWIDTHS; |
