Signed-off-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
---
.../stmicro/stmmac/dwmac-intel-plat.c | 35 +++++--------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
index d352a14f9d48..8cc22f11072e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
@@ -14,6 +14,7 @@
#include "dwmac4.h"
#include "stmmac.h"
#include "stmmac_platform.h"
+#include "stmmac_plat_lib.h"
struct intel_dwmac {
struct device *dev;
@@ -31,32 +32,14 @@ struct intel_dwmac_data {
static void kmb_eth_fix_mac_speed(void *priv, unsigned int speed, unsigned int mode)
{
struct intel_dwmac *dwmac = priv;
- unsigned long rate;
- int ret;
-
- rate = clk_get_rate(dwmac->tx_clk);
-
- switch (speed) {
- case SPEED_1000:
- rate = 125000000;
- break;
-
- case SPEED_100:
- rate = 25000000;
- break;
-
- case SPEED_10:
- rate = 2500000;
- break;
-
- default:
- dev_err(dwmac->dev, "Invalid speed\n");
- break;
- }
-
- ret = clk_set_rate(dwmac->tx_clk, rate);
- if (ret)
- dev_err(dwmac->dev, "Failed to configure tx clock rate\n");
+ int err;
+
+ err = dwmac_set_tx_clk_gmii(dwmac->tx_clk, speed);
+ if (err == -ENOTSUPP)
+ dev_err(dwmac->dev, "invalid speed %dMbps\n", speed);
+ else if (err)
+ dev_err(dwmac->dev, "failed to set tx rate for speed %dMbps: %pe\n",
+ speed, ERR_PTR(err));
}
static const struct intel_dwmac_data kmb_data = {
--
2.30.2
