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

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

dmaengine: bcm2835: Split device_control 



Split the device_control callback of the Broadcom BCM2835 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>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 3d138877

drivers/dma/bcm2835-dma.c

+8 −23
Original line number Original line Diff line number Diff line
@@ -436,9 +436,11 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic( 
	return vchan_tx_prep(&c->vc, &d->vd, flags);

	return vchan_tx_prep(&c->vc, &d->vd, flags);

}

}





static int bcm2835_dma_slave_config(struct bcm2835_chan *c,

static int bcm2835_dma_slave_config(struct dma_chan *chan,

				    struct dma_slave_config *cfg)

				    struct dma_slave_config *cfg)

{

{

	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);



	if ((cfg->direction == DMA_DEV_TO_MEM &&

	if ((cfg->direction == DMA_DEV_TO_MEM &&

	     cfg->src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) ||

	     cfg->src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES) ||

	    (cfg->direction == DMA_MEM_TO_DEV &&

	    (cfg->direction == DMA_MEM_TO_DEV &&
@@ -452,8 +454,9 @@ static int bcm2835_dma_slave_config(struct bcm2835_chan *c, 
	return 0;

	return 0;

}

}





static int bcm2835_dma_terminate_all(struct bcm2835_chan *c)

static int bcm2835_dma_terminate_all(struct dma_chan *chan)

{

{

	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);

	struct bcm2835_dmadev *d = to_bcm2835_dma_dev(c->vc.chan.device);

	struct bcm2835_dmadev *d = to_bcm2835_dma_dev(c->vc.chan.device);

	unsigned long flags;

	unsigned long flags;

	int timeout = 10000;

	int timeout = 10000;
@@ -495,24 +498,6 @@ static int bcm2835_dma_terminate_all(struct bcm2835_chan *c) 
	return 0;

	return 0;

}

}





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

	unsigned long arg)

{

	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);



	switch (cmd) {

	case DMA_SLAVE_CONFIG:

		return bcm2835_dma_slave_config(c,

				(struct dma_slave_config *)arg);



	case DMA_TERMINATE_ALL:

		return bcm2835_dma_terminate_all(c);



	default:

		return -ENXIO;

	}

}



static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq)

static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq)

{

{

	struct bcm2835_chan *c;

	struct bcm2835_chan *c;
@@ -615,9 +600,9 @@ static int bcm2835_dma_probe(struct platform_device *pdev) 
	od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;

	od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;

	od->ddev.device_tx_status = bcm2835_dma_tx_status;

	od->ddev.device_tx_status = bcm2835_dma_tx_status;

	od->ddev.device_issue_pending = bcm2835_dma_issue_pending;

	od->ddev.device_issue_pending = bcm2835_dma_issue_pending;

	od->ddev.device_slave_caps = bcm2835_dma_device_slave_caps;

	od->ddev.device_prep_dma_cyclic = bcm2835_dma_prep_dma_cyclic;

	od->ddev.device_prep_dma_cyclic = bcm2835_dma_prep_dma_cyclic;

	od->ddev.device_control = bcm2835_dma_control;

	od->ddev.device_config = bcm2835_dma_slave_config;

	od->ddev.device_terminate_all = bcm2835_dma_terminate_all;

	od->ddev.dev = &pdev->dev;

	od->ddev.dev = &pdev->dev;

	INIT_LIST_HEAD(&od->ddev.channels);

	INIT_LIST_HEAD(&od->ddev.channels);

	spin_lock_init(&od->lock);

	spin_lock_init(&od->lock);