target/rockchip: refresh kernel patches

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
This commit is contained in:
Liangbin Lian 2025-12-29 14:15:53 +08:00
parent 1708d26e3e
commit ad478a21aa
6 changed files with 10 additions and 10 deletions

View File

@ -156,7 +156,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
#define RK3568_GRF_GMAC0_CON0 0x0380
#define RK3568_GRF_GMAC0_CON1 0x0384
#define RK3568_GRF_GMAC1_CON0 0x0388
@@ -1913,6 +2044,7 @@ static const struct of_device_id rk_gmac
@@ -1914,6 +2045,7 @@ static const struct of_device_id rk_gmac
{ .compatible = "rockchip,rk3366-gmac", .data = &rk3366_ops },
{ .compatible = "rockchip,rk3368-gmac", .data = &rk3368_ops },
{ .compatible = "rockchip,rk3399-gmac", .data = &rk3399_ops },

View File

@ -179,7 +179,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* sys_grf */
#define RK3588_GRF_GMAC_CON7 0X031c
#define RK3588_GRF_GMAC_CON8 0X0320
@@ -2046,6 +2201,7 @@ static const struct of_device_id rk_gmac
@@ -2047,6 +2202,7 @@ static const struct of_device_id rk_gmac
{ .compatible = "rockchip,rk3399-gmac", .data = &rk3399_ops },
{ .compatible = "rockchip,rk3528-gmac", .data = &rk3528_ops },
{ .compatible = "rockchip,rk3568-gmac", .data = &rk3568_ops },

View File

@ -17,7 +17,7 @@ Subject: [PATCH] phy/rockchip-naneng-combphy: supports rk3528
struct combphy_reg pipe_clk_25m;
struct combphy_reg pipe_clk_100m;
struct combphy_reg pipe_phymode_sel;
@@ -381,6 +382,107 @@ static int rockchip_combphy_probe(struct
@@ -383,6 +384,107 @@ static int rockchip_combphy_probe(struct
return PTR_ERR_OR_ZERO(phy_provider);
}
@ -125,7 +125,7 @@ Subject: [PATCH] phy/rockchip-naneng-combphy: supports rk3528
static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv)
{
const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg;
@@ -775,6 +877,10 @@ static const struct rockchip_combphy_cfg
@@ -787,6 +889,10 @@ static const struct rockchip_combphy_cfg
static const struct of_device_id rockchip_combphy_of_match[] = {
{

View File

@ -67,7 +67,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
struct rockchip_combphy_priv;
@@ -689,6 +703,266 @@ static const struct rockchip_combphy_cfg
@@ -701,6 +715,266 @@ static const struct rockchip_combphy_cfg
.combphy_cfg = rk3568_combphy_cfg,
};
@ -334,7 +334,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static int rk3588_combphy_cfg(struct rockchip_combphy_priv *priv)
{
const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg;
@@ -885,6 +1159,10 @@ static const struct of_device_id rockchi
@@ -897,6 +1171,10 @@ static const struct of_device_id rockchi
.data = &rk3568_combphy_cfgs,
},
{

View File

@ -11,7 +11,7 @@ Change-Id: I29f72b36defa3d5b29a00a574073a790c19289d9
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -2156,6 +2156,8 @@ static void rk_gmac_remove(struct platfo
@@ -2157,6 +2157,8 @@ static void rk_gmac_remove(struct platfo
stmmac_dvr_remove(&pdev->dev);
rk_gmac_powerdown(bsp_priv);

View File

@ -54,7 +54,7 @@ Subject: [PATCH] drivers/dwmac-rk: supports rockchip dwmac tool
struct rk_priv_data;
struct rk_gmac_ops {
void (*set_to_rgmii)(struct rk_priv_data *bsp_priv,
@@ -2093,6 +2097,39 @@ static void rk_fix_speed(void *priv, uns
@@ -2094,6 +2098,39 @@ static void rk_fix_speed(void *priv, uns
}
}
@ -94,7 +94,7 @@ Subject: [PATCH] drivers/dwmac-rk: supports rockchip dwmac tool
static int rk_gmac_probe(struct platform_device *pdev)
{
struct plat_stmmacenet_data *plat_dat;
@@ -2139,6 +2176,12 @@ static int rk_gmac_probe(struct platform
@@ -2140,6 +2177,12 @@ static int rk_gmac_probe(struct platform
if (ret)
goto err_gmac_powerdown;
@ -107,7 +107,7 @@ Subject: [PATCH] drivers/dwmac-rk: supports rockchip dwmac tool
return 0;
err_gmac_powerdown:
@@ -2156,6 +2199,9 @@ static void rk_gmac_remove(struct platfo
@@ -2157,6 +2200,9 @@ static void rk_gmac_remove(struct platfo
stmmac_dvr_remove(&pdev->dev);
rk_gmac_powerdown(bsp_priv);