[PATCH v2 14/15] PCI: imx6: Convert DIRECT_SPEED_CHANGE quirk code to use a flag

[Andrey Smirnov]

Port of a Linux commit 4c458bb347ae016e75f6c61dab95ce530f4ff6fc

  Both i.MX7D and i.MX8MQ have the same behaviour when it comes to
  clearing DIRECT_SPEED_CHANGE bit when no speed change occurs, so to
  handle variants correctly add a flag instead of checking the IP block
  variant.

  Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
  [lorenzo.pieral...@arm.com: updated log]
  Signed-off-by: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
  Reviewed-by: Lucas Stach <l.st...@pengutronix.de>
  Cc: Bjorn Helgaas <bhelg...@google.com>
  Cc: Fabio Estevam <fabio.este...@nxp.com>
  Cc: Chris Healy <cphe...@gmail.com>
  Cc: Lucas Stach <l.st...@pengutronix.de>
  Cc: Leonard Crestez <leonard.cres...@nxp.com>
  Cc: "A.s. Dong" <aisheng.d...@nxp.com>
  Cc: Richard Zhu <hongxing....@nxp.com>

Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
---
 drivers/pci/pci-imx6.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index 2911a019c..d77c24990 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -43,6 +43,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;
@@ -524,7 +525,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
@@ -762,11 +764,13 @@ static void imx6_pcie_remove(struct device_d *dev)
 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,
        },
        [IMX6QP] = {
                .variant = IMX6QP,
-               .flags = IMX6_PCIE_FLAG_IMX6_PHY,
+               .flags = IMX6_PCIE_FLAG_IMX6_PHY |
+                        IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,
        },
        [IMX7D] = {
                .variant = IMX7D,
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox