Commit c5cddcdb authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: rk: simplify px30_set_rmii_speed() 



px30_set_rmii_speed() doesn't need to be as verbose as it is - it
merely needs the values for the register and clock rate which depend
on the speed, and then call the appropriate functions. Rewrite the
function to make it so.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1uPk3E-004CFl-BZ@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3930c2cc

drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c

+14 −15
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ static void px30_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) 
{

	struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED].clk;

	struct device *dev = &bsp_priv->pdev->dev;

	unsigned int con1;

	long rate;

	int ret;



	if (!clk_mac_speed) {
@@ -258,25 +260,22 @@ static void px30_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) 
	}



	if (speed == 10) {

		regmap_write(bsp_priv->grf, PX30_GRF_GMAC_CON1,

			     PX30_GMAC_SPEED_10M);



		ret = clk_set_rate(clk_mac_speed, 2500000);

		if (ret)

			dev_err(dev, "%s: set clk_mac_speed rate 2500000 failed: %d\n",

				__func__, ret);

		con1 = PX30_GMAC_SPEED_10M;

		rate = 2500000;

	} else if (speed == 100) {

		regmap_write(bsp_priv->grf, PX30_GRF_GMAC_CON1,

			     PX30_GMAC_SPEED_100M);



		ret = clk_set_rate(clk_mac_speed, 25000000);

		if (ret)

			dev_err(dev, "%s: set clk_mac_speed rate 25000000 failed: %d\n",

				__func__, ret);



		con1 = PX30_GMAC_SPEED_100M;

		rate = 25000000;

	} else {

		dev_err(dev, "unknown speed value for RMII! speed=%d", speed);

		return;

	}



	regmap_write(bsp_priv->grf, PX30_GRF_GMAC_CON1, con1);



	ret = clk_set_rate(clk_mac_speed, rate);

	if (ret)

		dev_err(dev, "%s: set clk_mac_speed rate %ld failed: %d\n",

			__func__, rate, ret);

}



static const struct rk_gmac_ops px30_ops = {