diff options
author | Nicolin Chen <nicoleotsuka@gmail.com> | 2017-09-14 14:46:43 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2017-09-21 13:15:42 -0400 |
commit | f9d4a398f121b00f581da1428bff9b93d955452d (patch) | |
tree | fb4051862cc9cecf03804f78b0d9de4917371065 | |
parent | 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff) |
dmaengine: imx-sdma: Correct src_addr_widths and directions
The driver already supports DMA_DEV_TO_DEV in sdma_config(),
DMA_SLAVE_BUSWIDTH_2_BYTES and DMA_SLAVE_BUSWIDTH_1_BYTE in
sdma_prep_slave_sg(). So this patch adds them to the lists.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/dma/imx-sdma.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index a67ec1bdc4e0..2184881afe76 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
@@ -178,6 +178,14 @@ | |||
178 | #define SDMA_WATERMARK_LEVEL_HWE BIT(29) | 178 | #define SDMA_WATERMARK_LEVEL_HWE BIT(29) |
179 | #define SDMA_WATERMARK_LEVEL_CONT BIT(31) | 179 | #define SDMA_WATERMARK_LEVEL_CONT BIT(31) |
180 | 180 | ||
181 | #define SDMA_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ | ||
182 | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ | ||
183 | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES)) | ||
184 | |||
185 | #define SDMA_DMA_DIRECTIONS (BIT(DMA_DEV_TO_MEM) | \ | ||
186 | BIT(DMA_MEM_TO_DEV) | \ | ||
187 | BIT(DMA_DEV_TO_DEV)) | ||
188 | |||
181 | /* | 189 | /* |
182 | * Mode/Count of data node descriptors - IPCv2 | 190 | * Mode/Count of data node descriptors - IPCv2 |
183 | */ | 191 | */ |
@@ -1851,9 +1859,9 @@ static int sdma_probe(struct platform_device *pdev) | |||
1851 | sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic; | 1859 | sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic; |
1852 | sdma->dma_device.device_config = sdma_config; | 1860 | sdma->dma_device.device_config = sdma_config; |
1853 | sdma->dma_device.device_terminate_all = sdma_disable_channel_with_delay; | 1861 | sdma->dma_device.device_terminate_all = sdma_disable_channel_with_delay; |
1854 | sdma->dma_device.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); | 1862 | sdma->dma_device.src_addr_widths = SDMA_DMA_BUSWIDTHS; |
1855 | sdma->dma_device.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); | 1863 | sdma->dma_device.dst_addr_widths = SDMA_DMA_BUSWIDTHS; |
1856 | sdma->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); | 1864 | sdma->dma_device.directions = SDMA_DMA_DIRECTIONS; |
1857 | sdma->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT; | 1865 | sdma->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT; |
1858 | sdma->dma_device.device_issue_pending = sdma_issue_pending; | 1866 | sdma->dma_device.device_issue_pending = sdma_issue_pending; |
1859 | sdma->dma_device.dev->dma_parms = &sdma->dma_parms; | 1867 | sdma->dma_device.dev->dma_parms = &sdma->dma_parms; |