Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 805dd350 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/omap' into for-linus

parents 0e3d5b21 9bef6d82

drivers/dma/omap-dma.c

+8 −0
Original line number Diff line number Diff line
@@ -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);