Merge "pci: msm: Read clkreq override bit irrespective of rpmsg_send status" (6c4205c3) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/pci/controller/pci-msm.c

+7 −13

Original line number	Diff line number	Diff line
		@@ -6623,11 +6623,6 @@ static int msm_pcie_drv_resume(struct msm_pcie_dev_t *pcie_dev)
		if (clk_info->hdl && !clk_info->suppressible)
		clk_prepare_enable(clk_info->hdl);

		/*
		* if DRV subsystem did not respond to previous rpmsg command, check if
		* PCIe CLKREQ override is still enabled
		*/
		if (rpmsg_ret) {
		clkreq_override_en = readl_relaxed(pcie_dev->parf +
		PCIE20_PARF_CLKREQ_OVERRIDE) &
		PCIE20_PARF_CLKREQ_IN_ENABLE;
		@@ -6635,7 +6630,6 @@ static int msm_pcie_drv_resume(struct msm_pcie_dev_t *pcie_dev)
		PCIE_DBG(pcie_dev,
		"PCIe: RC%d: CLKREQ Override detected\n",
		pcie_dev->rc_idx);
		}

		/*
		* if PCIe CLKREQ override is still enabled, then make sure PCIe mux is