]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: stmmac: dwmac-socfpga: Use the socfpga_sgmii_config() helper
authorMaxime Chevallier <maxime.chevallier@bootlin.com>
Tue, 24 Mar 2026 09:20:57 +0000 (10:20 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 27 Mar 2026 01:19:41 +0000 (18:19 -0700)
Use the existing socfpga_sgmii_config() helper in
socfpga_dwmac_fix_mac_speed(), instead of re-coding the register access.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/20260324092102.687082-3-maxime.chevallier@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

index 42da73b92cebb03989114229f78befab0ca1c8b0..ed6448c0ad2a58e125e59892c12a7a3b3c7c9240 100644 (file)
@@ -95,8 +95,7 @@ static void socfpga_dwmac_fix_mac_speed(void *bsp_priv,
        u32 val;
 
        if (sgmii_adapter_base)
-               writew(SGMII_ADAPTER_DISABLE,
-                      sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG);
+               socfpga_sgmii_config(dwmac, false);
 
        if (splitter_base) {
                val = readl(splitter_base + EMAC_SPLITTER_CTRL_REG);
@@ -121,8 +120,7 @@ static void socfpga_dwmac_fix_mac_speed(void *bsp_priv,
        if ((priv->plat->phy_interface == PHY_INTERFACE_MODE_SGMII ||
             priv->plat->phy_interface == PHY_INTERFACE_MODE_1000BASEX) &&
             sgmii_adapter_base)
-               writew(SGMII_ADAPTER_ENABLE,
-                      sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG);
+               socfpga_sgmii_config(dwmac, true);
 }
 
 static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *dev)