aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/controller
diff options
context:
space:
mode:
authorGravatar Richard Zhu <hongxing.zhu@nxp.com> 2022-07-14 15:31:01 +0800
committerGravatar Bjorn Helgaas <bhelgaas@google.com> 2022-08-01 15:33:39 -0500
commitcfacf22e0df2e3db3e90306f830a4f6c08829b05 (patch)
tree2f6ffcb0fe51653d50f071596307d4480bc6812a /drivers/pci/controller
parentPCI: imx6: Disable i.MX6QDL clock when disabling ref clocks (diff)
downloadlinux-cfacf22e0df2e3db3e90306f830a4f6c08829b05.tar.gz
linux-cfacf22e0df2e3db3e90306f830a4f6c08829b05.tar.bz2
linux-cfacf22e0df2e3db3e90306f830a4f6c08829b05.zip
PCI: imx6: Call host init function directly in resume
Call imx6_pcie_host_init() instead of duplicating codes in resume. Note that this also means we do MPLL setup again during resume, which we didn't do before. [bhelgaas: add MPLL setup note, pointed out by Lucas] Link: https://lore.kernel.org/r/1657783869-19194-10-git-send-email-hongxing.zhu@nxp.com Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/pci/controller')
-rw-r--r--drivers/pci/controller/dwc/pci-imx6.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index f2157533442f..20bee1a9e651 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1033,9 +1033,9 @@ static int imx6_pcie_resume_noirq(struct device *dev)
if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND))
return 0;
- imx6_pcie_assert_core_reset(imx6_pcie);
- imx6_pcie_init_phy(imx6_pcie);
- imx6_pcie_deassert_core_reset(imx6_pcie);
+ ret = imx6_pcie_host_init(pp);
+ if (ret)
+ return ret;
dw_pcie_setup_rc(pp);
ret = imx6_pcie_start_link(imx6_pcie->pci);