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
3a7b854d
Commit
3a7b854d
authored
Apr 10, 2018
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/renesas' into for-linus
parents
477e0f90
a0b007e1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
+2
-0
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
+1
-0
drivers/dma/sh/rcar-dmac.c
drivers/dma/sh/rcar-dmac.c
+11
-2
No files found.
Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
View file @
3a7b854d
...
@@ -18,6 +18,7 @@ Required Properties:
...
@@ -18,6 +18,7 @@ Required Properties:
Examples with soctypes are:
Examples with soctypes are:
- "renesas,dmac-r8a7743" (RZ/G1M)
- "renesas,dmac-r8a7743" (RZ/G1M)
- "renesas,dmac-r8a7745" (RZ/G1E)
- "renesas,dmac-r8a7745" (RZ/G1E)
- "renesas,dmac-r8a77470" (RZ/G1C)
- "renesas,dmac-r8a7790" (R-Car H2)
- "renesas,dmac-r8a7790" (R-Car H2)
- "renesas,dmac-r8a7791" (R-Car M2-W)
- "renesas,dmac-r8a7791" (R-Car M2-W)
- "renesas,dmac-r8a7792" (R-Car V2H)
- "renesas,dmac-r8a7792" (R-Car V2H)
...
@@ -26,6 +27,7 @@ Required Properties:
...
@@ -26,6 +27,7 @@ Required Properties:
- "renesas,dmac-r8a7795" (R-Car H3)
- "renesas,dmac-r8a7795" (R-Car H3)
- "renesas,dmac-r8a7796" (R-Car M3-W)
- "renesas,dmac-r8a7796" (R-Car M3-W)
- "renesas,dmac-r8a77970" (R-Car V3M)
- "renesas,dmac-r8a77970" (R-Car V3M)
- "renesas,dmac-r8a77980" (R-Car V3H)
- reg: base address and length of the registers block for the DMAC
- reg: base address and length of the registers block for the DMAC
...
...
Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt
View file @
3a7b854d
...
@@ -11,6 +11,7 @@ Required Properties:
...
@@ -11,6 +11,7 @@ Required Properties:
- "renesas,r8a7794-usb-dmac" (R-Car E2)
- "renesas,r8a7794-usb-dmac" (R-Car E2)
- "renesas,r8a7795-usb-dmac" (R-Car H3)
- "renesas,r8a7795-usb-dmac" (R-Car H3)
- "renesas,r8a7796-usb-dmac" (R-Car M3-W)
- "renesas,r8a7796-usb-dmac" (R-Car M3-W)
- "renesas,r8a77965-usb-dmac" (R-Car M3-N)
- reg: base address and length of the registers block for the DMAC
- reg: base address and length of the registers block for the DMAC
- interrupts: interrupt specifiers for the DMAC, one for each entry in
- interrupts: interrupt specifiers for the DMAC, one for each entry in
interrupt-names.
interrupt-names.
...
...
drivers/dma/sh/rcar-dmac.c
View file @
3a7b854d
...
@@ -1301,8 +1301,17 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan,
...
@@ -1301,8 +1301,17 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan,
* If the cookie doesn't correspond to the currently running transfer
* If the cookie doesn't correspond to the currently running transfer
* then the descriptor hasn't been processed yet, and the residue is
* then the descriptor hasn't been processed yet, and the residue is
* equal to the full descriptor size.
* equal to the full descriptor size.
* Also, a client driver is possible to call this function before
* rcar_dmac_isr_channel_thread() runs. In this case, the "desc.running"
* will be the next descriptor, and the done list will appear. So, if
* the argument cookie matches the done list's cookie, we can assume
* the residue is zero.
*/
*/
if
(
cookie
!=
desc
->
async_tx
.
cookie
)
{
if
(
cookie
!=
desc
->
async_tx
.
cookie
)
{
list_for_each_entry
(
desc
,
&
chan
->
desc
.
done
,
node
)
{
if
(
cookie
==
desc
->
async_tx
.
cookie
)
return
0
;
}
list_for_each_entry
(
desc
,
&
chan
->
desc
.
pending
,
node
)
{
list_for_each_entry
(
desc
,
&
chan
->
desc
.
pending
,
node
)
{
if
(
cookie
==
desc
->
async_tx
.
cookie
)
if
(
cookie
==
desc
->
async_tx
.
cookie
)
return
desc
->
size
;
return
desc
->
size
;
...
@@ -1677,7 +1686,7 @@ static const struct dev_pm_ops rcar_dmac_pm = {
...
@@ -1677,7 +1686,7 @@ static const struct dev_pm_ops rcar_dmac_pm = {
* - Wait for the current transfer to complete and stop the device,
* - Wait for the current transfer to complete and stop the device,
* - Resume transfers, if any.
* - Resume transfers, if any.
*/
*/
SET_
LATE
_SYSTEM_SLEEP_PM_OPS
(
pm_runtime_force_suspend
,
SET_
NOIRQ
_SYSTEM_SLEEP_PM_OPS
(
pm_runtime_force_suspend
,
pm_runtime_force_resume
)
pm_runtime_force_resume
)
SET_RUNTIME_PM_OPS
(
rcar_dmac_runtime_suspend
,
rcar_dmac_runtime_resume
,
SET_RUNTIME_PM_OPS
(
rcar_dmac_runtime_suspend
,
rcar_dmac_runtime_resume
,
NULL
)
NULL
)
...
...
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