diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:23:59 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:23:59 -0500 |
| commit | 8a21881ac4ef04a3568f077b2ab3a84c0aa32c47 (patch) | |
| tree | 6d8ddd05c9000ff5cb8db30c6decf233aef3f6ec /drivers/pci | |
| parent | b7c19476bd80183f105c6aa22d2bbad1ecd26a2e (diff) | |
| parent | 7c18058701b5af15529faa92a4c604d57c8de765 (diff) | |
Merge branch 'pci/host-imx6' into next
* pci/host-imx6:
PCI: imx6: Explicitly request exclusive reset control
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 20aae4469ee4..b73483534a5b 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c @@ -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, - "pciephy"); + 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); |