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

Commit 9427702d authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/imx' into for-linus

parents 340b11b9 f9d4a398

drivers/dma/imx-sdma.c

+11 −3
Original line number Diff line number Diff line
@@ -178,6 +178,14 @@ 
#define SDMA_WATERMARK_LEVEL_HWE	BIT(29)

#define SDMA_WATERMARK_LEVEL_CONT	BIT(31)



#define SDMA_DMA_BUSWIDTHS	(BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \

				 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \

				 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))



#define SDMA_DMA_DIRECTIONS	(BIT(DMA_DEV_TO_MEM) | \

				 BIT(DMA_MEM_TO_DEV) | \

				 BIT(DMA_DEV_TO_DEV))



/*

 * Mode/Count of data node descriptors - IPCv2

 */
@@ -1851,9 +1859,9 @@ static int sdma_probe(struct platform_device *pdev) 
	sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic;

	sdma->dma_device.device_config = sdma_config;

	sdma->dma_device.device_terminate_all = sdma_disable_channel_with_delay;

	sdma->dma_device.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	sdma->dma_device.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);

	sdma->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	sdma->dma_device.src_addr_widths = SDMA_DMA_BUSWIDTHS;

	sdma->dma_device.dst_addr_widths = SDMA_DMA_BUSWIDTHS;

	sdma->dma_device.directions = SDMA_DMA_DIRECTIONS;

	sdma->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;

	sdma->dma_device.device_issue_pending = sdma_issue_pending;

	sdma->dma_device.dev->dma_parms = &sdma->dma_parms;