net: dsa: b53: Configure RGMII for 531x5 and MII for 5325

Call b53_adjust_531x5_rgmii() and b53_adjust_5325_mii() from
b53_phylink_mac_config() when we have a fixed PHY in preparation for removing
b53_adjust_link(). Also move b53_adjust_63xx_rgmii() to
b53_phylink_mac_config() where it logically belongs.

Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20240423183339.1368511-6-florian.fainelli@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 6277ab7dcb7f172d0ba0b4ae2e63b69a27756a78..18b87e903943e8ddc9025fb15a658be99bb06894 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1438,6 +1438,20 @@ static void b53_phylink_mac_config(struct dsa_switch *ds, int port,
                                   unsigned int mode,
                                   const struct phylink_link_state *state)
 {
+       phy_interface_t interface = state->interface;
+       struct b53_device *dev = ds->priv;
+
+       if (is63xx(dev) && port >= B53_63XX_RGMII0)
+               b53_adjust_63xx_rgmii(ds, port, interface);
+
+       if (mode == MLO_AN_FIXED) {
+               if (is531x5(dev) && phy_interface_mode_is_rgmii(interface))
+                       b53_adjust_531x5_rgmii(ds, port, interface);
+
+               /* configure MII port if necessary */
+               if (is5325(dev))
+                       b53_adjust_5325_mii(ds, port);
+       }
 }
 
 static void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,
@@ -1468,9 +1482,6 @@ static void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,
 {
        struct b53_device *dev = ds->priv;
 
-       if (is63xx(dev) && port >= B53_63XX_RGMII0)
-               b53_adjust_63xx_rgmii(ds, port, interface);
-
        if (mode == MLO_AN_PHY)
                return;