net: stmmac: starfive: convert to use phy_interface

dwmac-starfive uses RMII or RGMII interface modes without any PCS,
and selects the dwmac core accordingly using a register field with
the same bit encoding as the core's phy_intf_sel_i signals.

None of the DTS files set "mac-mode", so mac_interface will be
identical to phy_interface.

Convert dwmac-starfive to use phy_interface when determining the
interface mode rather than mac_interface. Also convert the error
prints to use phy_modes() so that we get a meaningful string rather
than a number for the interface mode.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uytpa-00000006H2X-3GWx@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
index 2013d7477eb761473107254b1ecbf5c5e957be3d..6938dd2a79b772fb27509f5ba4928556d7e84995 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
@@ -38,7 +38,7 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
        unsigned int mode;
        int err;
 
-       switch (plat_dat->mac_interface) {
+       switch (plat_dat->phy_interface) {
        case PHY_INTERFACE_MODE_RMII:
                mode = STARFIVE_DWMAC_PHY_INFT_RMII;
                break;
@@ -51,8 +51,8 @@ static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
                break;
 
        default:
-               dev_err(dwmac->dev, "unsupported interface %d\n",
-                       plat_dat->mac_interface);
+               dev_err(dwmac->dev, "unsupported interface %s\n",
+                       phy_modes(plat_dat->phy_interface));
                return -EINVAL;
        }