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

Commit f43a6fd4 authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul
Browse files

dmaengine: mmp-tdma: Split device_control 



Split the device_control callback of the Marvell MMP TDMA driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a0abd671

drivers/dma/mmp_tdma.c

+44 −38
Original line number Diff line number Diff line
@@ -164,33 +164,46 @@ static void mmp_tdma_enable_chan(struct mmp_tdma_chan *tdmac) 
	tdmac->status = DMA_IN_PROGRESS;

}



static void mmp_tdma_disable_chan(struct mmp_tdma_chan *tdmac)

static int mmp_tdma_disable_chan(struct dma_chan *chan)

{

	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);



	writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,

					tdmac->reg_base + TDCR);



	tdmac->status = DMA_COMPLETE;



	return 0;

}



static void mmp_tdma_resume_chan(struct mmp_tdma_chan *tdmac)

static int mmp_tdma_resume_chan(struct dma_chan *chan)

{

	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);



	writel(readl(tdmac->reg_base + TDCR) | TDCR_CHANEN,

					tdmac->reg_base + TDCR);

	tdmac->status = DMA_IN_PROGRESS;



	return 0;

}



static void mmp_tdma_pause_chan(struct mmp_tdma_chan *tdmac)

static int mmp_tdma_pause_chan(struct dma_chan *chan)

{

	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);



	writel(readl(tdmac->reg_base + TDCR) & ~TDCR_CHANEN,

					tdmac->reg_base + TDCR);

	tdmac->status = DMA_PAUSED;



	return 0;

}



static int mmp_tdma_config_chan(struct mmp_tdma_chan *tdmac)

static int mmp_tdma_config_chan(struct dma_chan *chan)

{

	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);

	unsigned int tdcr = 0;



	mmp_tdma_disable_chan(tdmac);

	mmp_tdma_disable_chan(chan);



	if (tdmac->dir == DMA_MEM_TO_DEV)

		tdcr = TDCR_DSTDIR_ADDR_HOLD | TDCR_SRCDIR_ADDR_INC;
@@ -452,26 +465,20 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic( 
	return NULL;

}



static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,

		unsigned long arg)

static int mmp_tdma_terminate_all(struct dma_chan *chan)

{

	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);

	struct dma_slave_config *dmaengine_cfg = (void *)arg;

	int ret = 0;



	switch (cmd) {

	case DMA_TERMINATE_ALL:

		mmp_tdma_disable_chan(tdmac);

	mmp_tdma_disable_chan(chan);

	/* disable interrupt */

	mmp_tdma_enable_irq(tdmac, false);

		break;

	case DMA_PAUSE:

		mmp_tdma_pause_chan(tdmac);

		break;

	case DMA_RESUME:

		mmp_tdma_resume_chan(tdmac);

		break;

	case DMA_SLAVE_CONFIG:

}



static int mmp_tdma_config(struct dma_chan *chan,

			   struct dma_slave_config *dmaengine_cfg)

{

	struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);



	if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {

		tdmac->dev_addr = dmaengine_cfg->src_addr;

		tdmac->burst_sz = dmaengine_cfg->src_maxburst;
@@ -482,12 +489,8 @@ static int mmp_tdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
		tdmac->buswidth = dmaengine_cfg->dst_addr_width;

	}

	tdmac->dir = dmaengine_cfg->direction;

		return mmp_tdma_config_chan(tdmac);

	default:

		ret = -ENOSYS;

	}



	return ret;

	return mmp_tdma_config_chan(chan);

}



static enum dma_status mmp_tdma_tx_status(struct dma_chan *chan,
@@ -668,7 +671,10 @@ static int mmp_tdma_probe(struct platform_device *pdev) 
	tdev->device.device_prep_dma_cyclic = mmp_tdma_prep_dma_cyclic;

	tdev->device.device_tx_status = mmp_tdma_tx_status;

	tdev->device.device_issue_pending = mmp_tdma_issue_pending;

	tdev->device.device_control = mmp_tdma_control;

	tdev->device.device_config = mmp_tdma_config;

	tdev->device.device_pause = mmp_tdma_pause_chan;

	tdev->device.device_resume = mmp_tdma_resume_chan;

	tdev->device.device_terminate_all = mmp_tdma_terminate_all;

	tdev->device.copy_align = TDMA_ALIGNMENT;



	dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));