Commit f4098554 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/imx6' 

- Allow host controller driver to probe successfully (as other drivers do)
  even if link is currently down (Fabio Estevam)

- Enable i.MX6QP PCIe power management (Richard Zhu)

- Invoke PHY exit function after PHY power off (Richard Zhu)

- Assert i.MX8MM CLKREQ# even if no device present to avoid boot hangs
  (Richard Zhu)

* remotes/lorenzo/pci/imx6:
  PCI: imx6: Assert i.MX8MM CLKREQ# even if no device present
  PCI: imx6: Invoke the PHY exit function after PHY power off
  PCI: imx6: Enable i.MX6QP PCIe power management support
  PCI: imx6: Allow to probe when dw_pcie_wait_for_link() fails
parents 8a43a744 45514f78

drivers/pci/controller/dwc/pci-imx6.c

+6 −13
Original line number Diff line number Diff line
@@ -453,10 +453,6 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) 
	case IMX7D:

		break;

	case IMX8MM:

		ret = clk_prepare_enable(imx6_pcie->pcie_aux);

		if (ret)

			dev_err(dev, "unable to enable pcie_aux clock\n");

		break;

	case IMX8MQ:

		ret = clk_prepare_enable(imx6_pcie->pcie_aux);

		if (ret) {
@@ -809,9 +805,7 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) 
	/* Start LTSSM. */

	imx6_pcie_ltssm_enable(dev);



	ret = dw_pcie_wait_for_link(pci);

	if (ret)

		goto err_reset_phy;

	dw_pcie_wait_for_link(pci);



	if (pci->link_gen == 2) {

		/* Allow Gen2 mode after the link is up. */
@@ -847,11 +841,7 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) 
		}



		/* Make sure link training is finished as well! */

		ret = dw_pcie_wait_for_link(pci);

		if (ret) {

			dev_err(dev, "Failed to bring link up!\n");

			goto err_reset_phy;

		}

		dw_pcie_wait_for_link(pci);

	} else {

		dev_info(dev, "Link: Gen2 disabled\n");

	}
@@ -923,6 +913,7 @@ static void imx6_pcie_pm_turnoff(struct imx6_pcie *imx6_pcie) 
	/* Others poke directly at IOMUXC registers */

	switch (imx6_pcie->drvdata->variant) {

	case IMX6SX:

	case IMX6QP:

		regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,

				IMX6SX_GPR12_PCIE_PM_TURN_OFF,

				IMX6SX_GPR12_PCIE_PM_TURN_OFF);
@@ -983,6 +974,7 @@ static int imx6_pcie_suspend_noirq(struct device *dev) 
	case IMX8MM:

		if (phy_power_off(imx6_pcie->phy))

			dev_err(dev, "unable to power off PHY\n");

		phy_exit(imx6_pcie->phy);

		break;

	default:

		break;
@@ -1252,7 +1244,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { 
	[IMX6QP] = {

		.variant = IMX6QP,

		.flags = IMX6_PCIE_FLAG_IMX6_PHY |

			 IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,

			 IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE |

			 IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,

		.dbi_length = 0x200,

	},

	[IMX7D] = {