diff options
| author | richard zhu <hongxing.zhu@nxp.com> | 2019-11-08 11:25:23 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:29:18 +0800 |
| commit | 36ef451ed2f5dc7c9bb92ad98594eb54c0170666 (patch) | |
| tree | 3ae7b903024bf810dcd9bdb10db3505acf1f2ae1 /drivers/pci/controller/dwc/pci-imx6.c | |
| parent | c4ba50059576f8a01adc952d3a37c0c3c5120123 (diff) | |
Revert "MLK-11484-3 PCI: designware: Refine setup_rc and add msi data restore"
This patch is not proper for 5.4 kernel, revert it by this commit.
This reverts commit 8b76ca7ff3f7bb26223e5aa111d3bef987e62a4e.
Signed-off-by: richard zhu <hongxing.zhu@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
Diffstat (limited to 'drivers/pci/controller/dwc/pci-imx6.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-imx6.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 12c3d862f11d..44239a348d8a 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1598,14 +1598,9 @@ pm_turnoff_sleep: static int imx6_pcie_suspend_noirq(struct device *dev) { struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); - struct pcie_port *pp = &imx6_pcie->pci->pp; if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND)) return 0; - - if (IS_ENABLED(CONFIG_PCI_MSI)) - dw_pcie_msi_cfg_store(pp); - imx6_pcie_pm_turnoff(imx6_pcie); imx6_pcie_ltssm_disable(dev); imx6_pcie_clk_disable(imx6_pcie); @@ -1626,10 +1621,6 @@ static int imx6_pcie_resume_noirq(struct device *dev) imx6_pcie_init_phy(imx6_pcie); imx6_pcie_deassert_core_reset(imx6_pcie); dw_pcie_setup_rc(pp); - - if (IS_ENABLED(CONFIG_PCI_MSI)) - dw_pcie_msi_cfg_restore(pp); - pci_imx_set_msi_en(pp); ret = imx6_pcie_establish_link(imx6_pcie); |