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

Merge branch 'pci/controller/tegra194' 

- Move endpoint controller cleanups that depend on refclk from the host to
  the notifier that tells us the host has deasserted PERST# (Manivannan
  Sadhasivam)

* pci/controller/tegra194:
  PCI: tegra194: Move controller cleanups to pex_ep_event_pex_rst_deassert()
parents 72ae381b 40e21253

drivers/pci/controller/dwc/pcie-tegra194.c

+4 −3
Original line number Diff line number Diff line
@@ -1704,9 +1704,6 @@ static void pex_ep_event_pex_rst_assert(struct tegra_pcie_dw *pcie) 
	if (ret)

		dev_err(pcie->dev, "Failed to go Detect state: %d\n", ret);



	pci_epc_deinit_notify(pcie->pci.ep.epc);

	dw_pcie_ep_cleanup(&pcie->pci.ep);



	reset_control_assert(pcie->core_rst);



	tegra_pcie_disable_phy(pcie);
@@ -1785,6 +1782,10 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie) 
		goto fail_phy;

	}



	/* Perform cleanup that requires refclk */

	pci_epc_deinit_notify(pcie->pci.ep.epc);

	dw_pcie_ep_cleanup(&pcie->pci.ep);



	/* Clear any stale interrupt statuses */

	appl_writel(pcie, 0xFFFFFFFF, APPL_INTR_STATUS_L0);

	appl_writel(pcie, 0xFFFFFFFF, APPL_INTR_STATUS_L1_0_0);