diff options
author | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 10:37:28 +0530 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 10:37:28 +0530 |
commit | cecd5fc5512349662b9e7a9e06231055d803e3f6 (patch) | |
tree | 49a577762b0d5f7e6d95fd603db3c8a36c207969 | |
parent | 40b4ed1a1a214d9da3db0298b2079103a9a7e32a (diff) | |
parent | f3ae7d9155c79bb8f97ca3ff61ea979dec402952 (diff) |
Merge branch 'topic/xilinx' into for-linus
-rw-r--r-- | drivers/dma/xilinx/xilinx_dma.c | 14 | ||||
-rw-r--r-- | include/linux/dma/xilinx_dma.h | 14 |
2 files changed, 14 insertions, 14 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, diff --git a/include/linux/dma/xilinx_dma.h b/include/linux/dma/xilinx_dma.h index 3ae300052553..34b98f276ed0 100644 --- a/include/linux/dma/xilinx_dma.h +++ b/include/linux/dma/xilinx_dma.h @@ -41,20 +41,6 @@ struct xilinx_vdma_config { int ext_fsync; }; -/** - * 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, -}; - int xilinx_vdma_channel_set_config(struct dma_chan *dchan, struct xilinx_vdma_config *cfg); |