diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 14:23:59 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 14:23:59 -0400 |
commit | 8a21881ac4ef04a3568f077b2ab3a84c0aa32c47 (patch) | |
tree | 6d8ddd05c9000ff5cb8db30c6decf233aef3f6ec /drivers/pci/dwc | |
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/dwc')
-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) | |||
780 | } | 780 | } |
781 | break; | 781 | break; |
782 | case IMX7D: | 782 | case IMX7D: |
783 | imx6_pcie->pciephy_reset = devm_reset_control_get(dev, | 783 | imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev, |
784 | "pciephy"); | 784 | "pciephy"); |
785 | if (IS_ERR(imx6_pcie->pciephy_reset)) { | 785 | if (IS_ERR(imx6_pcie->pciephy_reset)) { |
786 | dev_err(dev, "Failed to get PCIEPHY reset control\n"); | 786 | dev_err(dev, "Failed to get PCIEPHY reset control\n"); |
787 | return PTR_ERR(imx6_pcie->pciephy_reset); | 787 | return PTR_ERR(imx6_pcie->pciephy_reset); |
788 | } | 788 | } |
789 | 789 | ||
790 | imx6_pcie->apps_reset = devm_reset_control_get(dev, "apps"); | 790 | imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, |
791 | "apps"); | ||
791 | if (IS_ERR(imx6_pcie->apps_reset)) { | 792 | if (IS_ERR(imx6_pcie->apps_reset)) { |
792 | dev_err(dev, "Failed to get PCIE APPS reset control\n"); | 793 | dev_err(dev, "Failed to get PCIE APPS reset control\n"); |
793 | return PTR_ERR(imx6_pcie->apps_reset); | 794 | return PTR_ERR(imx6_pcie->apps_reset); |