p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'topic/xilinx' into for-linus

This commit is contained in:
Vinod Koul 2017-11-14 10:37:28 +05:30
parent 40b4ed1a1a f3ae7d9155
commit cecd5fc551
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/dma/xilinx/xilinx_dma.c
View File

@ -366,6 +366,20 @@ struct xilinx_dma_chan {
u16 tdest; 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 { struct xilinx_dma_config {
enum xdma_ip_type dmatype; enum xdma_ip_type dmatype;
int (*clk_init)(struct platform_device *pdev, struct clk **axi_clk, int (*clk_init)(struct platform_device *pdev, struct clk **axi_clk,

14
include/linux/dma/xilinx_dma.h
View File

@ -41,20 +41,6 @@ struct xilinx_vdma_config {
int ext_fsync; 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, int xilinx_vdma_channel_set_config(struct dma_chan *dchan,
struct xilinx_vdma_config *cfg); struct xilinx_vdma_config *cfg);