net: mvpp2: improve Networking Complex Control register naming

GENCONF_CTRL0_PORTX naming improved.
Non functional change.

Signed-off-by: Stefan Chulski <stefanc@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index da87152..373ede3 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -673,9 +673,9 @@
 #define     GENCONF_PORT_CTRL1_EN(p)                   BIT(p)
 #define     GENCONF_PORT_CTRL1_RESET(p)                        (BIT(p) << 28)
 #define GENCONF_CTRL0                                  0x1120
-#define     GENCONF_CTRL0_PORT0_RGMII                  BIT(0)
-#define     GENCONF_CTRL0_PORT1_RGMII_MII              BIT(1)
-#define     GENCONF_CTRL0_PORT1_RGMII                  BIT(2)
+#define     GENCONF_CTRL0_PORT2_RGMII                  BIT(0)
+#define     GENCONF_CTRL0_PORT3_RGMII_MII              BIT(1)
+#define     GENCONF_CTRL0_PORT3_RGMII                  BIT(2)
 
 /* Various constants */
 

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index bc98f52..d167cfd 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -1494,9 +1494,9 @@ static void mvpp22_gop_init_rgmii(struct mvpp2_port *port)
 
        regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val);
        if (port->gop_id == 2)
-               val |= GENCONF_CTRL0_PORT0_RGMII;
+               val |= GENCONF_CTRL0_PORT2_RGMII;
        else if (port->gop_id == 3)
-               val |= GENCONF_CTRL0_PORT1_RGMII_MII;
+               val |= GENCONF_CTRL0_PORT3_RGMII_MII;
        regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val);
 }
 
@@ -1513,9 +1513,9 @@ static void mvpp22_gop_init_sgmii(struct mvpp2_port *port)
        if (port->gop_id > 1) {
                regmap_read(priv->sysctrl_base, GENCONF_CTRL0, &val);
                if (port->gop_id == 2)
-                       val &= ~GENCONF_CTRL0_PORT0_RGMII;
+                       val &= ~GENCONF_CTRL0_PORT2_RGMII;
                else if (port->gop_id == 3)
-                       val &= ~GENCONF_CTRL0_PORT1_RGMII_MII;
+                       val &= ~GENCONF_CTRL0_PORT3_RGMII_MII;
                regmap_write(priv->sysctrl_base, GENCONF_CTRL0, val);
        }
 }