net: stmmac: meson: switch to use set_clk_tx_rate() hook

Switch from using the fix_mac_speed() hook to set_clk_tx_rate() to
manage the transmit clock.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1tna0z-0052tN-O1@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
index b115b7873cefa906717e776828974e514580545b..07c504d07604c88ef8fa051cebcc6ad1532f376e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -22,9 +22,10 @@ struct meson_dwmac {
        void __iomem    *reg;
 };
 
-static void meson6_dwmac_fix_mac_speed(void *priv, int speed, unsigned int mode)
+static int meson6_dwmac_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
+                                       phy_interface_t interface, int speed)
 {
-       struct meson_dwmac *dwmac = priv;
+       struct meson_dwmac *dwmac = bsp_priv;
        unsigned int val;
 
        val = readl(dwmac->reg);
@@ -39,6 +40,8 @@ static void meson6_dwmac_fix_mac_speed(void *priv, int speed, unsigned int mode)
        }
 
        writel(val, dwmac->reg);
+
+       return 0;
 }
 
 static int meson6_dwmac_probe(struct platform_device *pdev)
@@ -65,7 +68,7 @@ static int meson6_dwmac_probe(struct platform_device *pdev)
                return PTR_ERR(dwmac->reg);
 
        plat_dat->bsp_priv = dwmac;
-       plat_dat->fix_mac_speed = meson6_dwmac_fix_mac_speed;
+       plat_dat->set_clk_tx_rate = meson6_dwmac_set_clk_tx_rate;
 
        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
 }