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

Merge branch 'pci/host-imx6' into next 

* pci/host-imx6:
  PCI: imx6: Explicitly request exclusive reset control
parents b7c19476 7c180587

drivers/pci/dwc/pci-imx6.c

+4 −3
Original line number Diff line number Diff line
@@ -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);