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

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

dmaengine: bcm2835: Declare slave capabilities for the generic code 



Now that the generic slave caps code can make use of the device assigned
capabilities, instead of relying on a callback to be implemented.

Make use of this code.

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 8ac82f88

drivers/dma/bcm2835-dma.c

+3 −12
Original line number Diff line number Diff line
@@ -550,18 +550,6 @@ static struct dma_chan *bcm2835_dma_xlate(struct of_phandle_args *spec, 
	return chan;

}



static int bcm2835_dma_device_slave_caps(struct dma_chan *dchan,

	struct dma_slave_caps *caps)

{

	caps->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	caps->dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	caps->cmd_pause = false;

	caps->cmd_terminate = true;



	return 0;

}



static int bcm2835_dma_probe(struct platform_device *pdev)

{

	struct bcm2835_dmadev *od;
@@ -603,6 +591,9 @@ static int bcm2835_dma_probe(struct platform_device *pdev) 
	od->ddev.device_prep_dma_cyclic = bcm2835_dma_prep_dma_cyclic;

	od->ddev.device_config = bcm2835_dma_slave_config;

	od->ddev.device_terminate_all = bcm2835_dma_terminate_all;

	od->ddev.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	od->ddev.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

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

	INIT_LIST_HEAD(&od->ddev.channels);

	spin_lock_init(&od->lock);