From 0f630e17a914f09435f6c2368cb14c997271f14d Mon Sep 17 00:00:00 2001 From: Ye Li Date: Fri, 22 May 2020 01:50:57 -0700 Subject: [PATCH] MLK-24042-2 pci: pcie_imx: Fix iMX6Q remove issue Wrong variable is check during pcie driver removing (6QP is checked but should be 6Q), so iMX6Q won't enter its handling and cause kernel PCI link failed to detect. Signed-off-by: Ye Li Reviewed-by: Peng Fan (cherry picked from commit 0dd8cc03ecc45faaba0297c2832ff6ae307e8f30) --- drivers/pci/pcie_imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index b18940f..10eff28 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -1063,7 +1063,7 @@ static int imx6_pcie_assert_core_reset(struct imx_pcie_priv *priv, * If both LTSSM_ENABLE and REF_SSP_ENABLE are active we have a strong * indication that the bootloader activated the link. */ - if (priv->variant == IMX6QP && prepare_for_boot) { + if (priv->variant == IMX6Q && prepare_for_boot) { u32 val, gpr1, gpr12; imx_pcie_gpr_read(priv, 4, &gpr1); -- 1.9.1