net: dsa: sja1105: Convert to mdiobus_c45_read
authorAndrew Lunn <andrew@lunn.ch>
Sat, 30 Apr 2022 17:30:36 +0000 (19:30 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Mon, 2 May 2022 11:21:38 +0000 (13:21 +0200)
Stop using the helpers to construct a special phy address which
indicates C45. Instead use the C45 accessors, which will call the
busses C45 specific read/write API.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/dsa/sja1105/sja1105_main.c

index b33841c..72b6fc1 100644 (file)
@@ -2252,14 +2252,13 @@ int sja1105_static_config_reload(struct sja1105_private *priv,
         * change it through the dynamic interface later.
         */
        for (i = 0; i < ds->num_ports; i++) {
-               u32 reg_addr = mdiobus_c45_addr(MDIO_MMD_VEND2, MDIO_CTRL1);
-
                speed_mbps[i] = sja1105_port_speed_to_ethtool(priv,
                                                              mac[i].speed);
                mac[i].speed = priv->info->port_speed[SJA1105_SPEED_AUTO];
 
                if (priv->xpcs[i])
-                       bmcr[i] = mdiobus_read(priv->mdio_pcs, i, reg_addr);
+                       bmcr[i] = mdiobus_c45_read(priv->mdio_pcs, i,
+                                                  MDIO_MMD_VEND2, MDIO_CTRL1);
        }
 
        /* No PTP operations can run right now */