From: Russell King (Oracle) Date: Thu, 6 Nov 2025 11:23:16 +0000 (+0000) Subject: net: stmmac: lpc18xx: use PHY_INTF_SEL_x directly X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb0533c7e63be03c1220f24bd00aeb2a4f0e3f78;p=thirdparty%2Fkernel%2Flinux.git net: stmmac: lpc18xx: use PHY_INTF_SEL_x directly Use the PHY_INTF_SEL_x values directly rather than the driver private LPC18XX_CREG_CREG6_ETHMODE_x definitions, and convert LPC18XX_CREG_CREG6_ETHMODE_MASK to use GENMASK(). Signed-off-by: Russell King (Oracle) Link: https://patch.msgid.link/E1vGy5E-0000000DhQ7-3cuy@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c index 66c309a7afb37..895d16dc0a4b5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c @@ -21,9 +21,7 @@ /* Register defines for CREG syscon */ #define LPC18XX_CREG_CREG6 0x12c -# define LPC18XX_CREG_CREG6_ETHMODE_MASK 0x7 -# define LPC18XX_CREG_CREG6_ETHMODE_MII PHY_INTF_SEL_GMII_MII -# define LPC18XX_CREG_CREG6_ETHMODE_RMII PHY_INTF_SEL_RMII +# define LPC18XX_CREG_CREG6_ETHMODE_MASK GENMASK(2, 0) static int lpc18xx_dwmac_probe(struct platform_device *pdev) { @@ -50,9 +48,9 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev) } if (plat_dat->phy_interface == PHY_INTERFACE_MODE_MII) { - ethmode = LPC18XX_CREG_CREG6_ETHMODE_MII; + ethmode = PHY_INTF_SEL_GMII_MII; } else if (plat_dat->phy_interface == PHY_INTERFACE_MODE_RMII) { - ethmode = LPC18XX_CREG_CREG6_ETHMODE_RMII; + ethmode = PHY_INTF_SEL_RMII; } else { dev_err(&pdev->dev, "Only MII and RMII mode supported\n"); return -EINVAL;