]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: imx-sdma: Correct src_addr_widths and directions
authorNicolin Chen <nicoleotsuka@gmail.com>
Thu, 14 Sep 2017 18:46:43 +0000 (11:46 -0700)
committerVinod Koul <vinod.koul@intel.com>
Thu, 21 Sep 2017 17:15:42 +0000 (22:45 +0530)
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>
drivers/dma/imx-sdma.c

index a67ec1bdc4e0c9bf461eaa5b54e842526df0bfca..2184881afe76be5840f9adaff908c91e0626c2db 100644 (file)
 #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;