Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
cecd5fc5
Commit
cecd5fc5
authored
Nov 14, 2017
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/xilinx' into for-linus
parents
40b4ed1a
f3ae7d91
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
drivers/dma/xilinx/xilinx_dma.c
drivers/dma/xilinx/xilinx_dma.c
+14
-0
include/linux/dma/xilinx_dma.h
include/linux/dma/xilinx_dma.h
+0
-14
No files found.
drivers/dma/xilinx/xilinx_dma.c
View file @
cecd5fc5
...
...
@@ -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
,
...
...
include/linux/dma/xilinx_dma.h
View file @
cecd5fc5
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment