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

net: stmmac: rk: combine rv1126 set_*_speed() methods 



Just like rk3568, there is no need to have separate RGMII and RMII
methods to set clk_mac_speed() as rgmii_clock() can be used to return
the clock rate for both RGMII and RMII interface modes. Combine these
two methods.

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/E1uPk2z-004CFT-0e@rmk-PC.armlinux.org.uk


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

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

+4 −29
Original line number Diff line number Diff line
@@ -1496,7 +1496,7 @@ static void rv1126_set_to_rmii(struct rk_priv_data *bsp_priv) 
		     RV1126_GMAC_PHY_INTF_SEL_RMII);

}



static void rv1126_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)

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;
@@ -1505,32 +1505,7 @@ static void rv1126_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed) 


	rate = rgmii_clock(speed);

	if (rate < 0) {

		dev_err(dev, "unknown speed value for RGMII 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 void rv1126_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 long rate;

	int ret;



	switch (speed) {

	case 10:

		rate = 2500000;

		break;

	case 100:

		rate = 25000000;

		break;

	default:

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

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

		return;

	}
@@ -1543,8 +1518,8 @@ static void rv1126_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) 
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_rgmii_speed,

	.set_rmii_speed = rv1126_set_rmii_speed,

	.set_rgmii_speed = rv1126_set_clk_mac_speed,

	.set_rmii_speed = rv1126_set_clk_mac_speed,

};



static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat)