leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pci/host-imx6' into next

Browse Source 
* pci/host-imx6:
  PCI: imx6: Explicitly request exclusive reset control
This commit is contained in:
Bjorn Helgaas 2017-09-07 13:23:59 -05:00
commit 8a21881ac4
1 changed files with 4 additions and 3 deletions

7
drivers/pci/dwc/pci-imx6.c
View File

@ -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);