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
8a21881a
Commit
8a21881a
authored
7 years ago
by
Bjorn Helgaas
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'pci/host-imx6' into next
* pci/host-imx6: PCI: imx6: Explicitly request exclusive reset control
parents
b7c19476
7c180587
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
drivers/pci/dwc/pci-imx6.c
drivers/pci/dwc/pci-imx6.c
+4
-3
No files found.
drivers/pci/dwc/pci-imx6.c
View file @
8a21881a
...
...
@@ -780,14 +780,15 @@ static int imx6_pcie_probe(struct platform_device *pdev)
}
break
;
case
IMX7D
:
imx6_pcie
->
pciephy_reset
=
devm_reset_control_get
(
dev
,
imx6_pcie
->
pciephy_reset
=
devm_reset_control_get
_exclusive
(
dev
,
"pciephy"
);
if
(
IS_ERR
(
imx6_pcie
->
pciephy_reset
))
{
dev_err
(
dev
,
"Failed to get PCIEPHY reset control
\n
"
);
return
PTR_ERR
(
imx6_pcie
->
pciephy_reset
);
}
imx6_pcie
->
apps_reset
=
devm_reset_control_get
(
dev
,
"apps"
);
imx6_pcie
->
apps_reset
=
devm_reset_control_get_exclusive
(
dev
,
"apps"
);
if
(
IS_ERR
(
imx6_pcie
->
apps_reset
))
{
dev_err
(
dev
,
"Failed to get PCIE APPS reset control
\n
"
);
return
PTR_ERR
(
imx6_pcie
->
apps_reset
);
...
...
This diff is collapsed.
Click to expand it.
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