Port of a Linux commit <TBD>

  PCIE PHY IP block on i.MX7D differs from the one used on i.MX6 family,
  so none of the code in current implementation of imx6_setup_phy_mpll()
  is applicable.

  Tested-by: Trent Piepho <tpie...@impinj.com>
  Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.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>
  Cc: linux-...@nxp.com
  Cc: linux-arm-ker...@lists.infradead.org
  Cc: linux-ker...@vger.kernel.org
  Cc: linux-...@vger.kernel.org

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

diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index dcebd7658..2911a019c 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -42,8 +42,11 @@ enum imx6_pcie_variants {
        IMX7D,
 };
 
+#define IMX6_PCIE_FLAG_IMX6_PHY                        BIT(0)
+
 struct imx6_pcie_drvdata {
        enum imx6_pcie_variants variant;
+       u32 flags;
 };
 
 struct imx6_pcie {
@@ -235,6 +238,9 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie)
 {
        uint32_t temp;
 
+       if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))
+               return;
+
        pcie_phy_read(imx6_pcie, PHY_RX_OVRD_IN_LO, &temp);
        temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
                 PHY_RX_OVRD_IN_LO_RX_PLL_EN);
@@ -756,9 +762,11 @@ 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,
        },
        [IMX6QP] = {
                .variant = IMX6QP,
+               .flags = IMX6_PCIE_FLAG_IMX6_PHY,
        },
        [IMX7D] = {
                .variant = IMX7D,
-- 
2.20.1


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

Reply via email to