diff options
| author | Nicolin Chen <nicoleotsuka@gmail.com> | 2017-09-14 11:46:43 -0700 |
|---|---|---|
| committer | Shengjiu Wang <shengjiu.wang@nxp.com> | 2017-11-21 11:45:56 +0800 |
| commit | 523bca4c13ce25d7872168e697e780b4153e7ab4 (patch) | |
| tree | f8e94b59245cfea8d4b2dc7a675c7b2c0a19d943 | |
| parent | 814574fa5f9bda5e4684adb76792930c01ac333a (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>
(cherry-picked from commit f9d4a398f121b00f581da1428bff9b93d955452d)
(cherry picked from commit fe731cab86a2d3dc90016acc617a1b5c6b5eca23)
| -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 9968d02cf399..109a06a6c3ab 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -184,6 +184,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 */ @@ -2311,9 +2319,9 @@ static int sdma_probe(struct platform_device *pdev) sdma->dma_device.device_terminate_all = sdma_terminate_all; sdma->dma_device.device_pause = sdma_channel_pause; sdma->dma_device.device_resume = sdma_channel_resume; - 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_BURST; sdma->dma_device.device_prep_dma_memcpy = sdma_prep_memcpy; sdma->dma_device.device_prep_dma_sg = sdma_prep_memcpy_sg; |