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

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

dmaengine: sirf: Split device_control 



Split the device_control callback of the SiRF Prima 2 DMA 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 be60f940

drivers/dma/sirf-dma.c

+13 −30
Original line number Diff line number Diff line
@@ -281,9 +281,10 @@ static dma_cookie_t sirfsoc_dma_tx_submit(struct dma_async_tx_descriptor *txd) 
	return cookie;

}



static int sirfsoc_dma_slave_config(struct sirfsoc_dma_chan *schan,

static int sirfsoc_dma_slave_config(struct dma_chan *chan,

				    struct dma_slave_config *config)

{

	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);

	unsigned long flags;



	if ((config->src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) ||
@@ -297,8 +298,9 @@ static int sirfsoc_dma_slave_config(struct sirfsoc_dma_chan *schan, 
	return 0;

}



static int sirfsoc_dma_terminate_all(struct sirfsoc_dma_chan *schan)

static int sirfsoc_dma_terminate_all(struct dma_chan *chan)

{

	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);

	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(&schan->chan);

	int cid = schan->chan.chan_id;

	unsigned long flags;
@@ -327,8 +329,9 @@ static int sirfsoc_dma_terminate_all(struct sirfsoc_dma_chan *schan) 
	return 0;

}



static int sirfsoc_dma_pause_chan(struct sirfsoc_dma_chan *schan)

static int sirfsoc_dma_pause_chan(struct dma_chan *chan)

{

	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);

	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(&schan->chan);

	int cid = schan->chan.chan_id;

	unsigned long flags;
@@ -348,8 +351,9 @@ static int sirfsoc_dma_pause_chan(struct sirfsoc_dma_chan *schan) 
	return 0;

}



static int sirfsoc_dma_resume_chan(struct sirfsoc_dma_chan *schan)

static int sirfsoc_dma_resume_chan(struct dma_chan *chan)

{

	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);

	struct sirfsoc_dma *sdma = dma_chan_to_sirfsoc_dma(&schan->chan);

	int cid = schan->chan.chan_id;

	unsigned long flags;
@@ -369,30 +373,6 @@ static int sirfsoc_dma_resume_chan(struct sirfsoc_dma_chan *schan) 
	return 0;

}



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

	unsigned long arg)

{

	struct dma_slave_config *config;

	struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);



	switch (cmd) {

	case DMA_PAUSE:

		return sirfsoc_dma_pause_chan(schan);

	case DMA_RESUME:

		return sirfsoc_dma_resume_chan(schan);

	case DMA_TERMINATE_ALL:

		return sirfsoc_dma_terminate_all(schan);

	case DMA_SLAVE_CONFIG:

		config = (struct dma_slave_config *)arg;

		return sirfsoc_dma_slave_config(schan, config);



	default:

		break;

	}



	return -ENOSYS;

}



/* Alloc channel resources */

static int sirfsoc_dma_alloc_chan_resources(struct dma_chan *chan)

{
@@ -739,7 +719,10 @@ static int sirfsoc_dma_probe(struct platform_device *op) 
	dma->device_alloc_chan_resources = sirfsoc_dma_alloc_chan_resources;

	dma->device_free_chan_resources = sirfsoc_dma_free_chan_resources;

	dma->device_issue_pending = sirfsoc_dma_issue_pending;

	dma->device_control = sirfsoc_dma_control;

	dma->device_config = sirfsoc_dma_slave_config;

	dma->device_pause = sirfsoc_dma_pause_chan;

	dma->device_resume = sirfsoc_dma_resume_chan;

	dma->device_terminate_all = sirfsoc_dma_terminate_all;

	dma->device_tx_status = sirfsoc_dma_tx_status;

	dma->device_prep_interleaved_dma = sirfsoc_dma_prep_interleaved;

	dma->device_prep_dma_cyclic = sirfsoc_dma_prep_cyclic;