Merge branch 'pci/host-imx6' into next

* pci/host-imx6:
  PCI: imx6: Explicitly request exclusive reset control

diff --combined drivers/pci/dwc/pci-imx6.c
index 20aae44,5a2ece3..b734835
--- 1/drivers/pci/dwc/pci-imx6.c
--- 2/drivers/pci/dwc/pci-imx6.c
+++ b/drivers/pci/dwc/pci-imx6.c
@@@ -636,7 -636,7 +636,7 @@@ err_reset_phy
        return ret;
  }
  
 -static void imx6_pcie_host_init(struct pcie_port *pp)
 +static int imx6_pcie_host_init(struct pcie_port *pp)
  {
        struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
        struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci);
@@@ -649,8 -649,6 +649,8 @@@
  
        if (IS_ENABLED(CONFIG_PCI_MSI))
                dw_pcie_msi_init(pp);
 +
 +      return 0;
  }
  
  static int imx6_pcie_link_up(struct dw_pcie *pci)
@@@ -780,14 -778,15 +780,15 @@@ static int imx6_pcie_probe(struct platf
                }
                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);