phy: mvebu-cp110-comphy: convert to use eth phy mode and submode

Convert mvebu-cp110-comphy PHY driver to use recently introduced
PHY_MODE_ETHERNET and phy_set_mode_ext().

Cc: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Maxime Chevallier <maxime.chevallier@bootlin.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 7a37a37e3fb347d90679db2ca16231597ba9afad..731793a87e4327231902304a5dce7b390ed76e29 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -1165,28 +1165,13 @@ static void mvpp22_gop_setup_irq(struct mvpp2_port *port)
  */
 static int mvpp22_comphy_init(struct mvpp2_port *port)
 {
-       enum phy_mode mode;
        int ret;
 
        if (!port->comphy)
                return 0;
 
-       switch (port->phy_interface) {
-       case PHY_INTERFACE_MODE_SGMII:
-       case PHY_INTERFACE_MODE_1000BASEX:
-               mode = PHY_MODE_SGMII;
-               break;
-       case PHY_INTERFACE_MODE_2500BASEX:
-               mode = PHY_MODE_2500SGMII;
-               break;
-       case PHY_INTERFACE_MODE_10GKR:
-               mode = PHY_MODE_10GKR;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       ret = phy_set_mode(port->comphy, mode);
+       ret = phy_set_mode_ext(port->comphy, PHY_MODE_ETHERNET,
+                              port->phy_interface);
        if (ret)
                return ret;
 

diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
index 79b52c39c5b4779dc7431a89f276e67141c8e543..2b4462a28a58b83907455964431dc65914914ffb 100644 (file)
--- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
+++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
@@ -9,6 +9,7 @@
 #include <linux/iopoll.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
+#include <linux/phy.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
@@ -116,41 +117,43 @@
 
 struct mvebu_comhy_conf {
        enum phy_mode mode;
+       int submode;
        unsigned lane;
        unsigned port;
        u32 mux;
 };
 
-#define MVEBU_COMPHY_CONF(_lane, _port, _mode, _mux)   \
+#define MVEBU_COMPHY_CONF(_lane, _port, _submode, _mux)        \
        {                                               \
                .lane = _lane,                          \
                .port = _port,                          \
-               .mode = _mode,                          \
+               .mode = PHY_MODE_ETHERNET,              \
+               .submode = _submode,                    \
                .mux = _mux,                            \
        }
 
 static const struct mvebu_comhy_conf mvebu_comphy_cp110_modes[] = {
        /* lane 0 */
-       MVEBU_COMPHY_CONF(0, 1, PHY_MODE_SGMII, 0x1),
-       MVEBU_COMPHY_CONF(0, 1, PHY_MODE_2500SGMII, 0x1),
+       MVEBU_COMPHY_CONF(0, 1, PHY_INTERFACE_MODE_SGMII, 0x1),
+       MVEBU_COMPHY_CONF(0, 1, PHY_INTERFACE_MODE_2500BASEX, 0x1),
        /* lane 1 */
-       MVEBU_COMPHY_CONF(1, 2, PHY_MODE_SGMII, 0x1),
-       MVEBU_COMPHY_CONF(1, 2, PHY_MODE_2500SGMII, 0x1),
+       MVEBU_COMPHY_CONF(1, 2, PHY_INTERFACE_MODE_SGMII, 0x1),
+       MVEBU_COMPHY_CONF(1, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1),
        /* lane 2 */
-       MVEBU_COMPHY_CONF(2, 0, PHY_MODE_SGMII, 0x1),
-       MVEBU_COMPHY_CONF(2, 0, PHY_MODE_2500SGMII, 0x1),
-       MVEBU_COMPHY_CONF(2, 0, PHY_MODE_10GKR, 0x1),
+       MVEBU_COMPHY_CONF(2, 0, PHY_INTERFACE_MODE_SGMII, 0x1),
+       MVEBU_COMPHY_CONF(2, 0, PHY_INTERFACE_MODE_2500BASEX, 0x1),
+       MVEBU_COMPHY_CONF(2, 0, PHY_INTERFACE_MODE_10GKR, 0x1),
        /* lane 3 */
-       MVEBU_COMPHY_CONF(3, 1, PHY_MODE_SGMII, 0x2),
-       MVEBU_COMPHY_CONF(3, 1, PHY_MODE_2500SGMII, 0x2),
+       MVEBU_COMPHY_CONF(3, 1, PHY_INTERFACE_MODE_SGMII, 0x2),
+       MVEBU_COMPHY_CONF(3, 1, PHY_INTERFACE_MODE_2500BASEX, 0x2),
        /* lane 4 */
-       MVEBU_COMPHY_CONF(4, 0, PHY_MODE_SGMII, 0x2),
-       MVEBU_COMPHY_CONF(4, 0, PHY_MODE_2500SGMII, 0x2),
-       MVEBU_COMPHY_CONF(4, 0, PHY_MODE_10GKR, 0x2),
-       MVEBU_COMPHY_CONF(4, 1, PHY_MODE_SGMII, 0x1),
+       MVEBU_COMPHY_CONF(4, 0, PHY_INTERFACE_MODE_SGMII, 0x2),
+       MVEBU_COMPHY_CONF(4, 0, PHY_INTERFACE_MODE_2500BASEX, 0x2),
+       MVEBU_COMPHY_CONF(4, 0, PHY_INTERFACE_MODE_10GKR, 0x2),
+       MVEBU_COMPHY_CONF(4, 1, PHY_INTERFACE_MODE_SGMII, 0x1),
        /* lane 5 */
-       MVEBU_COMPHY_CONF(5, 2, PHY_MODE_SGMII, 0x1),
-       MVEBU_COMPHY_CONF(5, 2, PHY_MODE_2500SGMII, 0x1),
+       MVEBU_COMPHY_CONF(5, 2, PHY_INTERFACE_MODE_SGMII, 0x1),
+       MVEBU_COMPHY_CONF(5, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1),
 };
 
 struct mvebu_comphy_priv {
@@ -163,10 +166,12 @@ struct mvebu_comphy_lane {
        struct mvebu_comphy_priv *priv;
        unsigned id;
        enum phy_mode mode;
+       int submode;
        int port;
 };
 
-static int mvebu_comphy_get_mux(int lane, int port, enum phy_mode mode)
+static int mvebu_comphy_get_mux(int lane, int port,
+                               enum phy_mode mode, int submode)
 {
        int i, n = ARRAY_SIZE(mvebu_comphy_cp110_modes);
 
@@ -177,7 +182,8 @@ static int mvebu_comphy_get_mux(int lane, int port, enum phy_mode mode)
        for (i = 0; i < n; i++) {
                if (mvebu_comphy_cp110_modes[i].lane == lane &&
                    mvebu_comphy_cp110_modes[i].port == port &&
-                   mvebu_comphy_cp110_modes[i].mode == mode)
+                   mvebu_comphy_cp110_modes[i].mode == mode &&
+                   mvebu_comphy_cp110_modes[i].submode == submode)
                        break;
        }
 
@@ -187,8 +193,7 @@ static int mvebu_comphy_get_mux(int lane, int port, enum phy_mode mode)
        return mvebu_comphy_cp110_modes[i].mux;
 }
 
-static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane,
-                                            enum phy_mode mode)
+static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane)
 {
        struct mvebu_comphy_priv *priv = lane->priv;
        u32 val;
@@ -206,14 +211,14 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane,
                 MVEBU_COMPHY_SERDES_CFG0_HALF_BUS |
                 MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0xf) |
                 MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0xf));
-       if (mode == PHY_MODE_10GKR)
+       if (lane->submode == PHY_INTERFACE_MODE_10GKR)
                val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0xe) |
                       MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0xe);
-       else if (mode == PHY_MODE_2500SGMII)
+       else if (lane->submode == PHY_INTERFACE_MODE_2500BASEX)
                val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0x8) |
                       MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0x8) |
                       MVEBU_COMPHY_SERDES_CFG0_HALF_BUS;
-       else if (mode == PHY_MODE_SGMII)
+       else if (lane->submode == PHY_INTERFACE_MODE_SGMII)
                val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0x6) |
                       MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0x6) |
                       MVEBU_COMPHY_SERDES_CFG0_HALF_BUS;
@@ -243,7 +248,7 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane,
        /* refclk selection */
        val = readl(priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id));
        val &= ~MVEBU_COMPHY_MISC_CTRL0_REFCLK_SEL;
-       if (mode == PHY_MODE_10GKR)
+       if (lane->submode == PHY_INTERFACE_MODE_10GKR)
                val |= MVEBU_COMPHY_MISC_CTRL0_ICP_FORCE;
        writel(val, priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id));
 
@@ -261,8 +266,7 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane,
        writel(val, priv->base + MVEBU_COMPHY_LOOPBACK(lane->id));
 }
 
-static int mvebu_comphy_init_plls(struct mvebu_comphy_lane *lane,
-                                 enum phy_mode mode)
+static int mvebu_comphy_init_plls(struct mvebu_comphy_lane *lane)
 {
        struct mvebu_comphy_priv *priv = lane->priv;
        u32 val;
@@ -303,13 +307,13 @@ static int mvebu_comphy_init_plls(struct mvebu_comphy_lane *lane,
        return 0;
 }
 
-static int mvebu_comphy_set_mode_sgmii(struct phy *phy, enum phy_mode mode)
+static int mvebu_comphy_set_mode_sgmii(struct phy *phy)
 {
        struct mvebu_comphy_lane *lane = phy_get_drvdata(phy);
        struct mvebu_comphy_priv *priv = lane->priv;
        u32 val;
 
-       mvebu_comphy_ethernet_init_reset(lane, mode);
+       mvebu_comphy_ethernet_init_reset(lane);
 
        val = readl(priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id));
        val &= ~MVEBU_COMPHY_RX_CTRL1_CLK8T_EN;
@@ -330,7 +334,7 @@ static int mvebu_comphy_set_mode_sgmii(struct phy *phy, enum phy_mode mode)
        val |= MVEBU_COMPHY_GEN1_S0_TX_EMPH(0x1);
        writel(val, priv->base + MVEBU_COMPHY_GEN1_S0(lane->id));
 
-       return mvebu_comphy_init_plls(lane, PHY_MODE_SGMII);
+       return mvebu_comphy_init_plls(lane);
 }
 
 static int mvebu_comphy_set_mode_10gkr(struct phy *phy)
@@ -339,7 +343,7 @@ static int mvebu_comphy_set_mode_10gkr(struct phy *phy)
        struct mvebu_comphy_priv *priv = lane->priv;
        u32 val;
 
-       mvebu_comphy_ethernet_init_reset(lane, PHY_MODE_10GKR);
+       mvebu_comphy_ethernet_init_reset(lane);
 
        val = readl(priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id));
        val |= MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL |
@@ -469,7 +473,7 @@ static int mvebu_comphy_set_mode_10gkr(struct phy *phy)
        val |= MVEBU_COMPHY_EXT_SELV_RX_SAMPL(0x1a);
        writel(val, priv->base + MVEBU_COMPHY_EXT_SELV(lane->id));
 
-       return mvebu_comphy_init_plls(lane, PHY_MODE_10GKR);
+       return mvebu_comphy_init_plls(lane);
 }
 
 static int mvebu_comphy_power_on(struct phy *phy)
@@ -479,7 +483,8 @@ static int mvebu_comphy_power_on(struct phy *phy)
        int ret, mux;
        u32 val;
 
-       mux = mvebu_comphy_get_mux(lane->id, lane->port, lane->mode);
+       mux = mvebu_comphy_get_mux(lane->id, lane->port,
+                                  lane->mode, lane->submode);
        if (mux < 0)
                return -ENOTSUPP;
 
@@ -492,12 +497,12 @@ static int mvebu_comphy_power_on(struct phy *phy)
        val |= mux << MVEBU_COMPHY_SELECTOR_PHY(lane->id);
        regmap_write(priv->regmap, MVEBU_COMPHY_SELECTOR, val);
 
-       switch (lane->mode) {
-       case PHY_MODE_SGMII:
-       case PHY_MODE_2500SGMII:
-               ret = mvebu_comphy_set_mode_sgmii(phy, lane->mode);
+       switch (lane->submode) {
+       case PHY_INTERFACE_MODE_SGMII:
+       case PHY_INTERFACE_MODE_2500BASEX:
+               ret = mvebu_comphy_set_mode_sgmii(phy);
                break;
-       case PHY_MODE_10GKR:
+       case PHY_INTERFACE_MODE_10GKR:
                ret = mvebu_comphy_set_mode_10gkr(phy);
                break;
        default:
@@ -517,10 +522,17 @@ static int mvebu_comphy_set_mode(struct phy *phy,
 {
        struct mvebu_comphy_lane *lane = phy_get_drvdata(phy);
 
-       if (mvebu_comphy_get_mux(lane->id, lane->port, mode) < 0)
+       if (mode != PHY_MODE_ETHERNET)
+               return -EINVAL;
+
+       if (submode == PHY_INTERFACE_MODE_1000BASEX)
+               submode = PHY_INTERFACE_MODE_SGMII;
+
+       if (mvebu_comphy_get_mux(lane->id, lane->port, mode, submode) < 0)
                return -EINVAL;
 
        lane->mode = mode;
+       lane->submode = submode;
        return 0;
 }