* [PATCH net-next 4/6] net: stmmac: rk: use dwmac_set_tx_clk_gmii()
@ 2023-09-11 15:28 Russell King (Oracle)
0 siblings, 0 replies; 2+ messages in thread
From: Russell King (Oracle) @ 2023-09-11 15:28 UTC (permalink / raw)
To: Alexandre Torgue, Jose Abreu
Cc: Alexei Starovoitov, bpf, Daniel Borkmann, David S. Miller,
Emil Renner Berthing, Eric Dumazet, Fabio Estevam, Jakub Kicinski,
Jesper Dangaard Brouer, John Fastabend, linux-arm-kernel,
linux-stm32, Maxime Coquelin, netdev, NXP Linux Team, Paolo Abeni,
Pengutronix Kernel Team, Samin Guo, Sascha Hauer, Shawn Guo
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-rk.c | 61 ++++++-------------
1 file changed, 17 insertions(+), 44 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index d920a50dd16c..30172ca3bd06 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -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)
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH net-next 4/6] net: stmmac: rk: use dwmac_set_tx_clk_gmii()
2023-09-11 15:28 [PATCH net-next 0/6] net: stmmac: add and use library for setting clock Russell King (Oracle)
@ 2023-09-11 15:29 ` Russell King (Oracle)
0 siblings, 0 replies; 2+ messages in thread
From: Russell King (Oracle) @ 2023-09-11 15:29 UTC (permalink / raw)
To: Alexandre Torgue, Jose Abreu
Cc: Alexei Starovoitov, bpf, Daniel Borkmann, David S. Miller,
Emil Renner Berthing, Eric Dumazet, Fabio Estevam, Jakub Kicinski,
Jesper Dangaard Brouer, John Fastabend, linux-arm-kernel,
linux-stm32, Maxime Coquelin, netdev, NXP Linux Team, Paolo Abeni,
Pengutronix Kernel Team, Samin Guo, Sascha Hauer, Shawn Guo
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-rk.c | 61 ++++++-------------
1 file changed, 17 insertions(+), 44 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index d920a50dd16c..30172ca3bd06 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -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)
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-11 15:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-11 15:28 [PATCH net-next 4/6] net: stmmac: rk: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
-- strict thread matches above, loose matches on Subject: below --
2023-09-11 15:28 [PATCH net-next 0/6] net: stmmac: add and use library for setting clock Russell King (Oracle)
2023-09-11 15:29 ` [PATCH net-next 4/6] net: stmmac: rk: use dwmac_set_tx_clk_gmii() Russell King (Oracle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).