dmaengine: xilinx: Use different channel names for each dma

Current driver assumes that child node channel name is either
"xlnx,axi-vdma-mm2s-channel" or "xlnx,axi-vdma-s2mm-channel"
which is confusing the users of AXI DMA and CDMA.
This patch fixes this issue by using different channel
names for the AXI DMA and AXI CDMA child nodes.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 0768d9f783c9..cf47347a1bc6 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -2353,7 +2353,9 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev,
         if (!has_dre)
                 xdev->common.copy_align = fls(width - 1);
 
-        if (of_device_is_compatible(node, "xlnx,axi-vdma-mm2s-channel")) {
+        if (of_device_is_compatible(node, "xlnx,axi-vdma-mm2s-channel") ||
+            of_device_is_compatible(node, "xlnx,axi-dma-mm2s-channel") ||
+            of_device_is_compatible(node, "xlnx,axi-cdma-channel")) {
                 chan->direction = DMA_MEM_TO_DEV;
                 chan->id = chan_id;
                 chan->tdest = chan_id;
@@ -2367,7 +2369,9 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev,
                                 chan->flush_on_fsync = true;
                 }
         } else if (of_device_is_compatible(node,
-                                            "xlnx,axi-vdma-s2mm-channel")) {
+                                           "xlnx,axi-vdma-s2mm-channel") ||
+                   of_device_is_compatible(node,
+                                           "xlnx,axi-dma-s2mm-channel")) {
                 chan->direction = DMA_DEV_TO_MEM;
                 chan->id = chan_id;
                 chan->tdest = chan_id - xdev->nr_channels;