aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-11-14 10:37:28 +0530
committerVinod Koul <vinod.koul@intel.com>2017-11-14 10:37:28 +0530
commitcecd5fc5512349662b9e7a9e06231055d803e3f6 (patch)
tree49a577762b0d5f7e6d95fd603db3c8a36c207969 /drivers/dma
parentMerge branch 'topic/timer_api' into for-linus (diff)
parentdmaengine: xilinx_dma: Move enum xdma_ip_type to driver file (diff)
downloadlinux-dev-cecd5fc5512349662b9e7a9e06231055d803e3f6.tar.xz
linux-dev-cecd5fc5512349662b9e7a9e06231055d803e3f6.zip
Merge branch 'topic/xilinx' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/xilinx/xilinx_dma.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 8722bcba489d..5eef13380ca8 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -366,6 +366,20 @@ struct xilinx_dma_chan {
u16 tdest;
};
+/**
+ * enum xdma_ip_type: DMA IP type.
+ *
+ * XDMA_TYPE_AXIDMA: Axi dma ip.
+ * XDMA_TYPE_CDMA: Axi cdma ip.
+ * XDMA_TYPE_VDMA: Axi vdma ip.
+ *
+ */
+enum xdma_ip_type {
+ XDMA_TYPE_AXIDMA = 0,
+ XDMA_TYPE_CDMA,
+ XDMA_TYPE_VDMA,
+};
+
struct xilinx_dma_config {
enum xdma_ip_type dmatype;
int (*clk_init)(struct platform_device *pdev, struct clk **axi_clk,