fsl/fman: take into account all RGMII modes

Accept the internal delay RGMII variants.

Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
index 84ea130..98bba10 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
@@ -381,6 +381,9 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg,
 
        /* check RGMII support */
        if (iface == PHY_INTERFACE_MODE_RGMII ||
+           iface == PHY_INTERFACE_MODE_RGMII_ID ||
+           iface == PHY_INTERFACE_MODE_RGMII_RXID ||
+           iface == PHY_INTERFACE_MODE_RGMII_TXID ||
            iface == PHY_INTERFACE_MODE_RMII)
                if (tmp & DTSEC_ID2_INT_REDUCED_OFF)
                        return -EINVAL;
@@ -390,7 +393,10 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg,
                if (tmp & DTSEC_ID2_INT_REDUCED_OFF)
                        return -EINVAL;
 
-       is_rgmii = iface == PHY_INTERFACE_MODE_RGMII;
+       is_rgmii = iface == PHY_INTERFACE_MODE_RGMII ||
+                  iface == PHY_INTERFACE_MODE_RGMII_ID ||
+                  iface == PHY_INTERFACE_MODE_RGMII_RXID ||
+                  iface == PHY_INTERFACE_MODE_RGMII_TXID;
        is_sgmii = iface == PHY_INTERFACE_MODE_SGMII;
        is_qsgmii = iface == PHY_INTERFACE_MODE_QSGMII;
 

diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
index cd6a53e..c029688 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman_memac.c
+++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
@@ -443,7 +443,10 @@ static int init(struct memac_regs __iomem *regs, struct memac_cfg *cfg,
                break;
        default:
                tmp |= IF_MODE_GMII;
-               if (phy_if == PHY_INTERFACE_MODE_RGMII)
+               if (phy_if == PHY_INTERFACE_MODE_RGMII ||
+                   phy_if == PHY_INTERFACE_MODE_RGMII_ID ||
+                   phy_if == PHY_INTERFACE_MODE_RGMII_RXID ||
+                   phy_if == PHY_INTERFACE_MODE_RGMII_TXID)
                        tmp |= IF_MODE_RGMII | IF_MODE_RGMII_AUTO;
        }
        iowrite32be(tmp, &regs->if_mode);