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

Commit ffb5be7c authored by Baolin Wang's avatar Baolin Wang Committed by Vinod Koul
Browse files

dmaengine: sprd: Change channel id to slave id for DMA cell specifier 



We will describe the slave id in DMA cell specifier instead of DMA channel
id, thus we should save the slave id from DMA engine translation function,
and remove the channel id validation.

Meanwhile we do not need set default slave id in sprd_dma_alloc_chan_resources(),
remove it.

Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent b5a4c373

drivers/dma/sprd-dma.c

+4 −15
Original line number Diff line number Diff line
@@ -580,15 +580,7 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id) 


static int sprd_dma_alloc_chan_resources(struct dma_chan *chan)

{

	struct sprd_dma_chn *schan = to_sprd_dma_chan(chan);

	int ret;



	ret = pm_runtime_get_sync(chan->device->dev);

	if (ret < 0)

		return ret;



	schan->dev_id = SPRD_DMA_SOFTWARE_UID;

	return 0;

	return pm_runtime_get_sync(chan->device->dev);

}



static void sprd_dma_free_chan_resources(struct dma_chan *chan)
@@ -1021,13 +1013,10 @@ static void sprd_dma_free_desc(struct virt_dma_desc *vd) 
static bool sprd_dma_filter_fn(struct dma_chan *chan, void *param)

{

	struct sprd_dma_chn *schan = to_sprd_dma_chan(chan);

	struct sprd_dma_dev *sdev = to_sprd_dma_dev(&schan->vc.chan);

	u32 req = *(u32 *)param;

	u32 slave_id = *(u32 *)param;



	if (req < sdev->total_chns)

		return req == schan->chn_num + 1;

	else

		return false;

	schan->dev_id = slave_id;

	return true;

}



static int sprd_dma_probe(struct platform_device *pdev)