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

Commit 11f932ec authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dw_dmac: disable dma in optimal way in probe 



The dw_dma_off call needs to have the all_chan_mask calculated. So, done this
calculations before the call. Moreover, remove duplicate code that masks the
DMA interrupts.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.linux@gmail.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 2e4c364e

drivers/dma/dw_dmac.c

+4 −8
Original line number Diff line number Diff line
@@ -1431,6 +1431,9 @@ static int __init dw_probe(struct platform_device *pdev) 
	}

	clk_prepare_enable(dw->clk);



	/* Calculate all channel mask before DMA setup */

	dw->all_chan_mask = (1 << pdata->nr_channels) - 1;



	/* force dma off, just in case */

	dw_dma_off(dw);
@@ -1442,8 +1445,6 @@ static int __init dw_probe(struct platform_device *pdev) 


	tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);



	dw->all_chan_mask = (1 << pdata->nr_channels) - 1;



	INIT_LIST_HEAD(&dw->dma.channels);

	for (i = 0; i < pdata->nr_channels; i++) {

		struct dw_dma_chan	*dwc = &dw->chan[i];
@@ -1473,17 +1474,12 @@ static int __init dw_probe(struct platform_device *pdev) 
		channel_clear_bit(dw, CH_EN, dwc->mask);

	}



	/* Clear/disable all interrupts on all channels. */

	/* Clear all interrupts on all channels. */

	dma_writel(dw, CLEAR.XFER, dw->all_chan_mask);

	dma_writel(dw, CLEAR.SRC_TRAN, dw->all_chan_mask);

	dma_writel(dw, CLEAR.DST_TRAN, dw->all_chan_mask);

	dma_writel(dw, CLEAR.ERROR, dw->all_chan_mask);



	channel_clear_bit(dw, MASK.XFER, dw->all_chan_mask);

	channel_clear_bit(dw, MASK.SRC_TRAN, dw->all_chan_mask);

	channel_clear_bit(dw, MASK.DST_TRAN, dw->all_chan_mask);

	channel_clear_bit(dw, MASK.ERROR, dw->all_chan_mask);



	dma_cap_set(DMA_MEMCPY, dw->dma.cap_mask);

	dma_cap_set(DMA_SLAVE, dw->dma.cap_mask);

	if (pdata->is_private)