net: stmmac: ipq806x: 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/E1tna0u-0052tH-KQ@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
index 7f4b9c1cc32b71adaba7531a3ce6e6cca2601847..0a9c137cc4e638322e7c5b3d11aaf74b5e869674 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
@@ -260,11 +260,12 @@ static int ipq806x_gmac_of_parse(struct ipq806x_gmac *gmac)
        return PTR_ERR_OR_ZERO(gmac->qsgmii_csr);
 }
 
-static void ipq806x_gmac_fix_mac_speed(void *priv, int speed, unsigned int mode)
+static int ipq806x_gmac_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
+                                       phy_interface_t interface, int speed)
 {
-       struct ipq806x_gmac *gmac = priv;
+       struct ipq806x_gmac *gmac = bsp_priv;
 
-       ipq806x_gmac_set_speed(gmac, speed);
+       return ipq806x_gmac_set_speed(gmac, speed);
 }
 
 static int
@@ -478,7 +479,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)
 
        plat_dat->has_gmac = true;
        plat_dat->bsp_priv = gmac;
-       plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed;
+       plat_dat->set_clk_tx_rate = ipq806x_gmac_set_clk_tx_rate;
        plat_dat->multicast_filter_bins = 0;
        plat_dat->tx_fifo_size = 8192;
        plat_dat->rx_fifo_size = 8192;