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() and 
imx6_pcie_reset_phy() 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-kernel@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
 drivers/pci/controller/dwc/pci-imx6.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c 
b/drivers/pci/controller/dwc/pci-imx6.c
index d50ed69e7a57..caa05104b90b 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -41,8 +41,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 {
@@ -256,6 +259,9 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie)
 {
        u32 tmp;
 
+       if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))
+               return;
+
        pcie_phy_read(imx6_pcie, PHY_RX_OVRD_IN_LO, &tmp);
        tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
                PHY_RX_OVRD_IN_LO_RX_PLL_EN);
@@ -573,6 +579,9 @@ static int imx6_setup_phy_mpll(struct imx6_pcie *imx6_pcie)
        int mult, div;
        u32 val;
 
+       if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_IMX6_PHY))
+               return 0;
+
        switch (phy_rate) {
        case 125000000:
                /*
@@ -1088,12 +1097,15 @@ 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,
        },
        [IMX6SX] = {
                .variant = IMX6SX,
+               .flags = IMX6_PCIE_FLAG_IMX6_PHY,
        },
        [IMX6QP] = {
                .variant = IMX6QP,
+               .flags = IMX6_PCIE_FLAG_IMX6_PHY,
        },
        [IMX7D] = {
                .variant = IMX7D,
-- 
2.19.1

Reply via email to