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
3378e7a4
Commit
3378e7a4
authored
May 04, 2017
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/qcom' into for-linus
parents
dd2b9ff8
dc7c733a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
drivers/dma/qcom/hidma.c
drivers/dma/qcom/hidma.c
+15
-0
drivers/dma/qcom/hidma_ll.c
drivers/dma/qcom/hidma_ll.c
+6
-0
No files found.
drivers/dma/qcom/hidma.c
View file @
3378e7a4
...
@@ -865,6 +865,20 @@ static int hidma_probe(struct platform_device *pdev)
...
@@ -865,6 +865,20 @@ static int hidma_probe(struct platform_device *pdev)
return
rc
;
return
rc
;
}
}
static
void
hidma_shutdown
(
struct
platform_device
*
pdev
)
{
struct
hidma_dev
*
dmadev
=
platform_get_drvdata
(
pdev
);
dev_info
(
dmadev
->
ddev
.
dev
,
"HI-DMA engine shutdown
\n
"
);
pm_runtime_get_sync
(
dmadev
->
ddev
.
dev
);
if
(
hidma_ll_disable
(
dmadev
->
lldev
))
dev_warn
(
dmadev
->
ddev
.
dev
,
"channel did not stop
\n
"
);
pm_runtime_mark_last_busy
(
dmadev
->
ddev
.
dev
);
pm_runtime_put_autosuspend
(
dmadev
->
ddev
.
dev
);
}
static
int
hidma_remove
(
struct
platform_device
*
pdev
)
static
int
hidma_remove
(
struct
platform_device
*
pdev
)
{
{
struct
hidma_dev
*
dmadev
=
platform_get_drvdata
(
pdev
);
struct
hidma_dev
*
dmadev
=
platform_get_drvdata
(
pdev
);
...
@@ -908,6 +922,7 @@ MODULE_DEVICE_TABLE(of, hidma_match);
...
@@ -908,6 +922,7 @@ MODULE_DEVICE_TABLE(of, hidma_match);
static
struct
platform_driver
hidma_driver
=
{
static
struct
platform_driver
hidma_driver
=
{
.
probe
=
hidma_probe
,
.
probe
=
hidma_probe
,
.
remove
=
hidma_remove
,
.
remove
=
hidma_remove
,
.
shutdown
=
hidma_shutdown
,
.
driver
=
{
.
driver
=
{
.
name
=
"hidma"
,
.
name
=
"hidma"
,
.
of_match_table
=
hidma_match
,
.
of_match_table
=
hidma_match
,
...
...
drivers/dma/qcom/hidma_ll.c
View file @
3378e7a4
...
@@ -499,6 +499,9 @@ int hidma_ll_enable(struct hidma_lldev *lldev)
...
@@ -499,6 +499,9 @@ int hidma_ll_enable(struct hidma_lldev *lldev)
lldev
->
trch_state
=
HIDMA_CH_ENABLED
;
lldev
->
trch_state
=
HIDMA_CH_ENABLED
;
lldev
->
evch_state
=
HIDMA_CH_ENABLED
;
lldev
->
evch_state
=
HIDMA_CH_ENABLED
;
/* enable irqs */
writel
(
ENABLE_IRQS
,
lldev
->
evca
+
HIDMA_EVCA_IRQ_EN_REG
);
return
0
;
return
0
;
}
}
...
@@ -596,6 +599,9 @@ int hidma_ll_disable(struct hidma_lldev *lldev)
...
@@ -596,6 +599,9 @@ int hidma_ll_disable(struct hidma_lldev *lldev)
lldev
->
trch_state
=
HIDMA_CH_SUSPENDED
;
lldev
->
trch_state
=
HIDMA_CH_SUSPENDED
;
lldev
->
evch_state
=
HIDMA_CH_SUSPENDED
;
lldev
->
evch_state
=
HIDMA_CH_SUSPENDED
;
/* disable interrupts */
writel
(
0
,
lldev
->
evca
+
HIDMA_EVCA_IRQ_EN_REG
);
return
0
;
return
0
;
}
}
...
...
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