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

Commit 8ac82f88 authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Vinod Koul
Browse files

dmaengine: at_xdmac: 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 avatarLudovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 7664cfe0

drivers/dma/at_xdmac.c

+11 −22
Original line number Diff line number Diff line
@@ -174,6 +174,13 @@ 


#define AT_XDMAC_MAX_CHAN	0x20



#define AT_XDMAC_DMA_BUSWIDTHS\

	(BIT(DMA_SLAVE_BUSWIDTH_UNDEFINED) |\

	BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) |\

	BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) |\

	BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) |\

	BIT(DMA_SLAVE_BUSWIDTH_8_BYTES))



enum atc_status {

	AT_XDMAC_CHAN_IS_CYCLIC = 0,

	AT_XDMAC_CHAN_IS_PAUSED,
@@ -1234,27 +1241,6 @@ static void at_xdmac_free_chan_resources(struct dma_chan *chan) 
	return;

}



#define AT_XDMAC_DMA_BUSWIDTHS\

	(BIT(DMA_SLAVE_BUSWIDTH_UNDEFINED) |\

	BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) |\

	BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) |\

	BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) |\

	BIT(DMA_SLAVE_BUSWIDTH_8_BYTES))



static int at_xdmac_device_slave_caps(struct dma_chan *dchan,

				      struct dma_slave_caps *caps)

{



	caps->src_addr_widths = AT_XDMAC_DMA_BUSWIDTHS;

	caps->dst_addr_widths = AT_XDMAC_DMA_BUSWIDTHS;

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

	caps->cmd_pause = true;

	caps->cmd_terminate = true;

	caps->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;



	return 0;

}



#ifdef CONFIG_PM

static int atmel_xdmac_prepare(struct device *dev)

{
@@ -1428,7 +1414,10 @@ static int at_xdmac_probe(struct platform_device *pdev) 
	atxdmac->dma.device_pause			= at_xdmac_device_pause;

	atxdmac->dma.device_resume			= at_xdmac_device_resume;

	atxdmac->dma.device_terminate_all		= at_xdmac_device_terminate_all;

	atxdmac->dma.device_slave_caps			= at_xdmac_device_slave_caps;

	atxdmac->dma.src_addr_widths = AT_XDMAC_DMA_BUSWIDTHS;

	atxdmac->dma.dst_addr_widths = AT_XDMAC_DMA_BUSWIDTHS;

	atxdmac->dma.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	atxdmac->dma.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;



	/* Disable all chans and interrupts. */

	at_xdmac_off(atxdmac);