1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 26e1e974b0dd..11b73d733dae 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -42,6 +42,7 @@ enum imx6_pcie_variants {
 };
 
 #define IMX6_PCIE_FLAG_IMX6_PHY                 BIT(0)
+#define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE        BIT(1)
 
 struct imx6_pcie_drvdata {
         enum imx6_pcie_variants variant;
@@ -710,7 +711,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
                 tmp |= PORT_LOGIC_SPEED_CHANGE;
                 dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp);
 
-                if (imx6_pcie->drvdata->variant != IMX7D) {
+                if (imx6_pcie->drvdata->flags &
+                    IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE) {
                         /*
                          * On i.MX7, DIRECT_SPEED_CHANGE behaves differently
                          * from i.MX6 family when no link speed transition
@@ -1099,15 +1101,18 @@ static void imx6_pcie_shutdown(struct platform_device *pdev)
 static const struct imx6_pcie_drvdata drvdata[] = {
         [IMX6Q] = {
                 .variant = IMX6Q,
-                .flags = IMX6_PCIE_FLAG_IMX6_PHY,
+                .flags = IMX6_PCIE_FLAG_IMX6_PHY |
+                         IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,
         },
         [IMX6SX] = {
                 .variant = IMX6SX,
-                .flags = IMX6_PCIE_FLAG_IMX6_PHY,
+                .flags = IMX6_PCIE_FLAG_IMX6_PHY |
+                         IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,
         },
         [IMX6QP] = {
                 .variant = IMX6QP,
-                .flags = IMX6_PCIE_FLAG_IMX6_PHY,
+                .flags = IMX6_PCIE_FLAG_IMX6_PHY |
+                         IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,
         },
         [IMX7D] = {
                 .variant = IMX7D,