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

Merge branch 'pci/controller/imx6' 

- Enable the 3.3V Vaux supply if available so devices can request wakeup
  with either Beacon or WAKE# (Richard Zhu)

* pci/controller/imx6:
  PCI: imx6: Enable the Vaux supply if available
parents 5611712a c221cbf8

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

+4 −0
Original line number Diff line number Diff line
@@ -1741,6 +1741,10 @@ static int imx_pcie_probe(struct platform_device *pdev) 
	pci->max_link_speed = 1;

	of_property_read_u32(node, "fsl,max-link-speed", &pci->max_link_speed);



	ret = devm_regulator_get_enable_optional(&pdev->dev, "vpcie3v3aux");

	if (ret < 0 && ret != -ENODEV)

		return dev_err_probe(dev, ret, "failed to enable Vaux supply\n");



	imx_pcie->vpcie = devm_regulator_get_optional(&pdev->dev, "vpcie");

	if (IS_ERR(imx_pcie->vpcie)) {

		if (PTR_ERR(imx_pcie->vpcie) != -ENODEV)