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
Kirill Smelkov
linux
Commits
25036f2a
Commit
25036f2a
authored
Feb 21, 2017
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/ste' into for-linus
parents
e4e48c47
15c60668
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
drivers/dma/ste_dma40.c
drivers/dma/ste_dma40.c
+5
-2
No files found.
drivers/dma/ste_dma40.c
View file @
25036f2a
...
@@ -2809,12 +2809,14 @@ static void __init d40_chan_init(struct d40_base *base, struct dma_device *dma,
...
@@ -2809,12 +2809,14 @@ static void __init d40_chan_init(struct d40_base *base, struct dma_device *dma,
static
void
d40_ops_init
(
struct
d40_base
*
base
,
struct
dma_device
*
dev
)
static
void
d40_ops_init
(
struct
d40_base
*
base
,
struct
dma_device
*
dev
)
{
{
if
(
dma_has_cap
(
DMA_SLAVE
,
dev
->
cap_mask
))
if
(
dma_has_cap
(
DMA_SLAVE
,
dev
->
cap_mask
))
{
dev
->
device_prep_slave_sg
=
d40_prep_slave_sg
;
dev
->
device_prep_slave_sg
=
d40_prep_slave_sg
;
dev
->
directions
=
BIT
(
DMA_DEV_TO_MEM
)
|
BIT
(
DMA_MEM_TO_DEV
);
}
if
(
dma_has_cap
(
DMA_MEMCPY
,
dev
->
cap_mask
))
{
if
(
dma_has_cap
(
DMA_MEMCPY
,
dev
->
cap_mask
))
{
dev
->
device_prep_dma_memcpy
=
d40_prep_memcpy
;
dev
->
device_prep_dma_memcpy
=
d40_prep_memcpy
;
dev
->
directions
=
BIT
(
DMA_MEM_TO_MEM
);
/*
/*
* This controller can only access address at even
* This controller can only access address at even
* 32bit boundaries, i.e. 2^2
* 32bit boundaries, i.e. 2^2
...
@@ -2836,6 +2838,7 @@ static void d40_ops_init(struct d40_base *base, struct dma_device *dev)
...
@@ -2836,6 +2838,7 @@ static void d40_ops_init(struct d40_base *base, struct dma_device *dev)
dev
->
device_pause
=
d40_pause
;
dev
->
device_pause
=
d40_pause
;
dev
->
device_resume
=
d40_resume
;
dev
->
device_resume
=
d40_resume
;
dev
->
device_terminate_all
=
d40_terminate_all
;
dev
->
device_terminate_all
=
d40_terminate_all
;
dev
->
residue_granularity
=
DMA_RESIDUE_GRANULARITY_BURST
;
dev
->
dev
=
base
->
dev
;
dev
->
dev
=
base
->
dev
;
}
}
...
...
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