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

net: stmmac: rk: combine clk_mac_speed rate setting functions 



rk3568_set_gmac_speed() and rv1126_set_clk_mac_speed() are now
identical. Combine these so we have a single copy of this code.

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/E1uPk34-004CFZ-3y@rmk-PC.armlinux.org.uk


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

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

+23 −42
Original line number Diff line number Diff line
@@ -153,6 +153,25 @@ static int rk_set_reg_speed_rmii(struct rk_priv_data *bsp_priv, 
				speed);

}



static void rk_set_clk_mac_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;

	long rate;

	int ret;



	rate = rgmii_clock(speed);

	if (rate < 0) {

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

		return;

	}



	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);

}



#define HIWORD_UPDATE(val, mask, shift) \

		((val) << (shift) | (mask) << ((shift) + 16))
@@ -1113,30 +1132,11 @@ static void rk3568_set_to_rmii(struct rk_priv_data *bsp_priv) 
	regmap_write(bsp_priv->grf, con1, RK3568_GMAC_PHY_INTF_SEL_RMII);

}



static void rk3568_set_gmac_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;

	long rate;

	int ret;



	rate = rgmii_clock(speed);

	if (rate < 0) {

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

		return;

	}



	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 rk3568_ops = {

	.set_to_rgmii = rk3568_set_to_rgmii,

	.set_to_rmii = rk3568_set_to_rmii,

	.set_rgmii_speed = rk3568_set_gmac_speed,

	.set_rmii_speed = rk3568_set_gmac_speed,

	.set_rgmii_speed = rk_set_clk_mac_speed,

	.set_rmii_speed = rk_set_clk_mac_speed,

	.regs_valid = true,

	.regs = {

		0xfe2a0000, /* gmac0 */
@@ -1496,30 +1496,11 @@ static void rv1126_set_to_rmii(struct rk_priv_data *bsp_priv) 
		     RV1126_GMAC_PHY_INTF_SEL_RMII);

}



static void rv1126_set_clk_mac_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;

	long rate;

	int ret;



	rate = rgmii_clock(speed);

	if (rate < 0) {

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

		return;

	}



	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 rv1126_ops = {

	.set_to_rgmii = rv1126_set_to_rgmii,

	.set_to_rmii = rv1126_set_to_rmii,

	.set_rgmii_speed = rv1126_set_clk_mac_speed,

	.set_rmii_speed = rv1126_set_clk_mac_speed,

	.set_rgmii_speed = rk_set_clk_mac_speed,

	.set_rmii_speed = rk_set_clk_mac_speed,

};



static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat)