diff options
author | 2017-11-14 10:37:28 +0530 | |
---|---|---|
committer | 2017-11-14 10:37:28 +0530 | |
commit | cecd5fc5512349662b9e7a9e06231055d803e3f6 (patch) | |
tree | 49a577762b0d5f7e6d95fd603db3c8a36c207969 /drivers/dma | |
parent | Merge branch 'topic/timer_api' into for-linus (diff) | |
parent | dmaengine: xilinx_dma: Move enum xdma_ip_type to driver file (diff) | |
download | linux-cecd5fc5512349662b9e7a9e06231055d803e3f6.tar.gz linux-cecd5fc5512349662b9e7a9e06231055d803e3f6.tar.bz2 linux-cecd5fc5512349662b9e7a9e06231055d803e3f6.zip |
Merge branch 'topic/xilinx' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/xilinx/xilinx_dma.c | 14 |
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, |