net: stmmac: rk: use dwmac_set_tx_clk_gmii()
Subsystems (6)
PATCH 4/6 net: stmmac: rk: use dwmac_set_tx_clk_gmii()
Signed-off-by Russell King (Oracle) <[email protected]>
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 61 ++++++------------- 1 file changed, 17 insertions(+), 44 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +17 -44
@@ -24,6 +24,7 @@#include <linux/pm_runtime.h> #include "stmmac_platform.h" +#include "stmmac_plat_lib.h" struct rk_priv_data ;struct rk_gmac_ops {
@@ -1081,28 +1082,14 @@ 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; -unsigned long rate; -int ret; - -switch (speed) { -case 10 : - rate =2500000 ; -break ; -case 100 : - rate =25000000 ; -break ; -case 1000 : - rate =125000000 ; -break ; -default : -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); +int err; + + err =dwmac_set_tx_clk_gmii (clk_mac_speed, speed); +if (err == -ENOTSUPP ) +dev_err (dev,"invalid speed %dMbps\n" , speed); +else if (err) +dev_err (dev,"failed to set tx rate for speed %dMbps: %pe\n" , + speed,ERR_PTR (err)); }static const struct rk_gmac_ops rk3568_ops = {
@@ -1387,28 +1374,14 @@ static void rv1126_set_rgmii_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 ; -case 1000 : - rate =125000000 ; -break ; -default : -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); +int err; + + err =dwmac_set_tx_clk_gmii (clk_mac_speed, speed); +if (err == -ENOTSUPP ) +dev_err (dev,"invalid speed %dMbps\n" , speed); +else if (err) +dev_err (dev,"failed to set tx rate for speed %dMbps: %pe\n" , + speed,ERR_PTR (err)); }static void rv1126_set_rmii_speed (struct rk_priv_data *bsp_priv,int speed)
Signature · 1 line
2.30.2