MLK-16830 PCI: imx: fix boot failulre when the pll is not locked

Return the error when the pll is not locked.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Frank Li <frank.li@nxp.com>
rebase on v4.19
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index d5faeda..39f4326 100644 (file)
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -788,8 +788,10 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
                        dev_err(dev, "ERROR PM_REQ_CORE_RST is still set.\n");
 
                /* wait for phy pll lock firstly. */
-               if (imx8_pcie_wait_for_phy_pll_lock(imx6_pcie))
+               if (imx8_pcie_wait_for_phy_pll_lock(imx6_pcie)) {
                        ret = -ENODEV;
+                       break;
+               }
 
                /* set up the cpu address offset */
                if (imx6_pcie->cpu_base)
@@ -829,7 +831,8 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
                mdelay(20);
        }
 
-       return ret;
+       if (ret == 0)
+               return ret;
 
 err_ref_clk:
        clk_disable_unprepare(imx6_pcie->pcie_phy);