aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKedareswara rao Appana <appana.durga.rao@xilinx.com>2016-06-24 01:21:25 -0400
committerVinod Koul <vinod.koul@intel.com>2016-07-08 01:21:35 -0400
commitfde57a7c4474b2d00b7b82b94aa2dd0160b1bbee (patch)
treebef535d2bd436bc57d108f8ff9c78b572f1b2402
parent5cd0749af203a2f321d07721b0ebd744fe4ac129 (diff)
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> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt (renamed from Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt)0
-rw-r--r--drivers/dma/Kconfig11
-rw-r--r--drivers/dma/xilinx/Makefile2
-rw-r--r--drivers/dma/xilinx/xilinx_dma.c (renamed from drivers/dma/xilinx/xilinx_vdma.c)0
4 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
index 0faa18944434..0faa18944434 100644
--- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
+++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 8c98779a12b1..1f39f3ef6c8d 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -519,19 +519,24 @@ config XGENE_DMA
519 help 519 help
520 Enable support for the APM X-Gene SoC DMA engine. 520 Enable support for the APM X-Gene SoC DMA engine.
521 521
522config XILINX_VDMA 522config XILINX_DMA
523 tristate "Xilinx AXI VDMA Engine" 523 tristate "Xilinx AXI DMAS Engine"
524 depends on (ARCH_ZYNQ || MICROBLAZE || ARM64) 524 depends on (ARCH_ZYNQ || MICROBLAZE || ARM64)
525 select DMA_ENGINE 525 select DMA_ENGINE
526 help 526 help
527 Enable support for Xilinx AXI VDMA Soft IP. 527 Enable support for Xilinx AXI VDMA Soft IP.
528 528
529 This engine provides high-bandwidth direct memory access 529 AXI VDMA engine provides high-bandwidth direct memory access
530 between memory and AXI4-Stream video type target 530 between memory and AXI4-Stream video type target
531 peripherals including peripherals which support AXI4- 531 peripherals including peripherals which support AXI4-
532 Stream Video Protocol. It has two stream interfaces/ 532 Stream Video Protocol. It has two stream interfaces/
533 channels, Memory Mapped to Stream (MM2S) and Stream to 533 channels, Memory Mapped to Stream (MM2S) and Stream to
534 Memory Mapped (S2MM) for the data transfers. 534 Memory Mapped (S2MM) for the data transfers.
535 AXI CDMA engine provides high-bandwidth direct memory access
536 between a memory-mapped source address and a memory-mapped
537 destination address.
538 AXI DMA engine provides high-bandwidth one dimensional direct
539 memory access between memory and AXI4-Stream target peripherals.
535 540
536config ZX_DMA 541config ZX_DMA
537 tristate "ZTE ZX296702 DMA support" 542 tristate "ZTE ZX296702 DMA support"
diff --git a/drivers/dma/xilinx/Makefile b/drivers/dma/xilinx/Makefile
index 3c4e9f2fea28..af9e69a41f8f 100644
--- a/drivers/dma/xilinx/Makefile
+++ b/drivers/dma/xilinx/Makefile
@@ -1 +1 @@
obj-$(CONFIG_XILINX_VDMA) += xilinx_vdma.o obj-$(CONFIG_XILINX_DMA) += xilinx_dma.o
diff --git a/drivers/dma/xilinx/xilinx_vdma.c b/drivers/dma/xilinx/xilinx_dma.c
index 0768d9f783c9..0768d9f783c9 100644
--- a/drivers/dma/xilinx/xilinx_vdma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c