Skip to content

L
linux
Commit 8a21881a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

Merge branch 'pci/host-imx6' into next 

* pci/host-imx6:
  PCI: imx6: Explicitly request exclusive reset control
parents b7c19476 7c180587
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
drivers/pci/dwc/pci-imx6.c
View file @ 8a21881a
...@@ -780,14 +780,15 @@ static int imx6_pcie_probe(struct platform_device *pdev) ...@@ -780,14 +780,15 @@ static int imx6_pcie_probe(struct platform_device *pdev)
} }
break; break;
case IMX7D: case IMX7D:
imx6_pcie->pciephy_reset = devm_reset_control_get(dev, imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev,
"pciephy"); "pciephy");
if (IS_ERR(imx6_pcie->pciephy_reset)) { if (IS_ERR(imx6_pcie->pciephy_reset)) {
dev_err(dev, "Failed to get PCIEPHY reset control\n"); dev_err(dev, "Failed to get PCIEPHY reset control\n");
return PTR_ERR(imx6_pcie->pciephy_reset); 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)) { if (IS_ERR(imx6_pcie->apps_reset)) {
dev_err(dev, "Failed to get PCIE APPS reset control\n"); dev_err(dev, "Failed to get PCIE APPS reset control\n");
return PTR_ERR(imx6_pcie->apps_reset); return PTR_ERR(imx6_pcie->apps_reset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7