113 lines
4.1 KiB
Diff
113 lines
4.1 KiB
Diff
From 32c7bc0747bbd8ee4ee32026d36a24be56117d96 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Wed, 19 Mar 2025 21:44:08 +0000
|
|
Subject: [PATCH] net: stmmac: dwmac-rk: Add integrated_phy_powerdown operation
|
|
|
|
Rockchip RK3528 (and RV1106) has a different integrated PHY compared to
|
|
the integrated PHY on RK3228/RK3328. Current powerup/down operation is
|
|
not compatible with the integrated PHY found in these newer SoCs.
|
|
|
|
Add a new integrated_phy_powerdown operation and change the call chain
|
|
for integrated_phy_powerup to prepare support for the integrated PHY
|
|
found in these newer SoCs.
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Link: https://patch.msgid.link/20250319214415.3086027-5-jonas@kwiboo.se
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
.../net/ethernet/stmicro/stmmac/dwmac-rk.c | 26 +++++++++++--------
|
|
1 file changed, 15 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
|
@@ -33,6 +33,7 @@ struct rk_gmac_ops {
|
|
void (*set_clock_selection)(struct rk_priv_data *bsp_priv, bool input,
|
|
bool enable);
|
|
void (*integrated_phy_powerup)(struct rk_priv_data *bsp_priv);
|
|
+ void (*integrated_phy_powerdown)(struct rk_priv_data *bsp_priv);
|
|
bool php_grf_required;
|
|
bool regs_valid;
|
|
u32 regs[];
|
|
@@ -104,11 +105,8 @@ struct rk_priv_data {
|
|
#define RK_GRF_CON2_MACPHY_ID HIWORD_UPDATE(0x1234, 0xffff, 0)
|
|
#define RK_GRF_CON3_MACPHY_ID HIWORD_UPDATE(0x35, 0x3f, 0)
|
|
|
|
-static void rk_gmac_integrated_phy_powerup(struct rk_priv_data *priv)
|
|
+static void rk_gmac_integrated_ephy_powerup(struct rk_priv_data *priv)
|
|
{
|
|
- if (priv->ops->integrated_phy_powerup)
|
|
- priv->ops->integrated_phy_powerup(priv);
|
|
-
|
|
regmap_write(priv->grf, RK_GRF_MACPHY_CON0, RK_MACPHY_CFG_CLK_50M);
|
|
regmap_write(priv->grf, RK_GRF_MACPHY_CON0, RK_GMAC2PHY_RMII_MODE);
|
|
|
|
@@ -129,7 +127,7 @@ static void rk_gmac_integrated_phy_power
|
|
}
|
|
}
|
|
|
|
-static void rk_gmac_integrated_phy_powerdown(struct rk_priv_data *priv)
|
|
+static void rk_gmac_integrated_ephy_powerdown(struct rk_priv_data *priv)
|
|
{
|
|
regmap_write(priv->grf, RK_GRF_MACPHY_CON0, RK_MACPHY_DISABLE);
|
|
if (priv->phy_reset)
|
|
@@ -423,6 +421,8 @@ static void rk3228_integrated_phy_poweru
|
|
{
|
|
regmap_write(priv->grf, RK3228_GRF_CON_MUX,
|
|
RK3228_GRF_CON_MUX_GMAC_INTEGRATED_PHY);
|
|
+
|
|
+ rk_gmac_integrated_ephy_powerup(priv);
|
|
}
|
|
|
|
static const struct rk_gmac_ops rk3228_ops = {
|
|
@@ -430,7 +430,8 @@ static const struct rk_gmac_ops rk3228_o
|
|
.set_to_rmii = rk3228_set_to_rmii,
|
|
.set_rgmii_speed = rk3228_set_rgmii_speed,
|
|
.set_rmii_speed = rk3228_set_rmii_speed,
|
|
- .integrated_phy_powerup = rk3228_integrated_phy_powerup,
|
|
+ .integrated_phy_powerup = rk3228_integrated_phy_powerup,
|
|
+ .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown,
|
|
};
|
|
|
|
#define RK3288_GRF_SOC_CON1 0x0248
|
|
@@ -715,6 +716,8 @@ static void rk3328_integrated_phy_poweru
|
|
{
|
|
regmap_write(priv->grf, RK3328_GRF_MACPHY_CON1,
|
|
RK3328_MACPHY_RMII_MODE);
|
|
+
|
|
+ rk_gmac_integrated_ephy_powerup(priv);
|
|
}
|
|
|
|
static const struct rk_gmac_ops rk3328_ops = {
|
|
@@ -722,7 +725,8 @@ static const struct rk_gmac_ops rk3328_o
|
|
.set_to_rmii = rk3328_set_to_rmii,
|
|
.set_rgmii_speed = rk3328_set_rgmii_speed,
|
|
.set_rmii_speed = rk3328_set_rmii_speed,
|
|
- .integrated_phy_powerup = rk3328_integrated_phy_powerup,
|
|
+ .integrated_phy_powerup = rk3328_integrated_phy_powerup,
|
|
+ .integrated_phy_powerdown = rk_gmac_integrated_ephy_powerdown,
|
|
};
|
|
|
|
#define RK3366_GRF_SOC_CON6 0x0418
|
|
@@ -2070,16 +2074,16 @@ static int rk_gmac_powerup(struct rk_pri
|
|
|
|
pm_runtime_get_sync(dev);
|
|
|
|
- if (bsp_priv->integrated_phy)
|
|
- rk_gmac_integrated_phy_powerup(bsp_priv);
|
|
+ if (bsp_priv->integrated_phy && bsp_priv->ops->integrated_phy_powerup)
|
|
+ bsp_priv->ops->integrated_phy_powerup(bsp_priv);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void rk_gmac_powerdown(struct rk_priv_data *gmac)
|
|
{
|
|
- if (gmac->integrated_phy)
|
|
- rk_gmac_integrated_phy_powerdown(gmac);
|
|
+ if (gmac->integrated_phy && gmac->ops->integrated_phy_powerdown)
|
|
+ gmac->ops->integrated_phy_powerdown(gmac);
|
|
|
|
pm_runtime_put_sync(&gmac->pdev->dev);
|
|
|