dmaengine: xilinx: Rename driver and config

In the existing vdma driver support for
AXI DMA and CDMA got added so the driver is no
longer VDMA specific.

This patch renames the driver and DT binding doc to xilinx_dma
and updates the Kconfig description for all the DMAS.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>

diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
similarity index 100%
rename from Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
rename to Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index c827b9961d32f638ea730608a2f5d72333027d09..5ec8256452aef91b228ee8d9e3ecf9576ee2f128 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -515,19 +515,24 @@ config XGENE_DMA
 
 source "drivers/dma/xilinx/Kconfig"
 
-config XILINX_VDMA
-       tristate "Xilinx AXI VDMA Engine"
+config XILINX_DMA
+       tristate "Xilinx AXI DMAS Engine"
        depends on (ARCH_ZYNQ || MICROBLAZE || ARM64)
        select DMA_ENGINE
        help
          Enable support for Xilinx AXI VDMA Soft IP.
 
-         This engine provides high-bandwidth direct memory access
+         AXI VDMA engine provides high-bandwidth direct memory access
          between memory and AXI4-Stream video type target
          peripherals including peripherals which support AXI4-
          Stream Video Protocol.  It has two stream interfaces/
          channels, Memory Mapped to Stream (MM2S) and Stream to
          Memory Mapped (S2MM) for the data transfers.
+         AXI CDMA engine provides high-bandwidth direct memory access
+         between a memory-mapped source address and a memory-mapped
+         destination address.
+         AXI DMA engine provides high-bandwidth one dimensional direct
+         memory access between memory and AXI4-Stream target peripherals.
 
 config XILINX_ZYNQMP_DMA
        tristate "Xilinx ZynqMP DMA Engine"

diff --git a/drivers/dma/xilinx/Makefile b/drivers/dma/xilinx/Makefile
index 8f507e5aad8899e5c5de3417c333f33f14b61447..ff3980422302bc116e1f863f4a01e2e0cfee1ac6 100644 (file)
--- a/drivers/dma/xilinx/Makefile
+++ b/drivers/dma/xilinx/Makefile
@@ -2,6 +2,6 @@ obj-$(CONFIG_XILINX_DMATEST) += axidmatest.o
 obj-$(CONFIG_XILINX_VDMATEST) += vdmatest.o
 obj-$(CONFIG_XILINX_CDMATEST) += cdmatest.o
 obj-$(CONFIG_XILINX_DPDMA) += xilinx_dpdma.o
-obj-$(CONFIG_XILINX_VDMA) += xilinx_vdma.o
+obj-$(CONFIG_XILINX_DMA) += xilinx_dma.o
 obj-$(CONFIG_XILINX_ZYNQMP_DMA) += zynqmp_dma.o
 obj-$(CONFIG_XILINX_ZYNQMP_DMATEST) += zynqmp_dmatest.o

diff --git a/drivers/dma/xilinx/xilinx_vdma.c b/drivers/dma/xilinx/xilinx_dma.c
similarity index 100%
rename from drivers/dma/xilinx/xilinx_vdma.c
rename to drivers/dma/xilinx/xilinx_dma.c