mirror of
https://github.com/immortalwrt/immortalwrt
synced 2025-01-09 04:29:03 +08:00
rockchip: refresh patches
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
parent
ae5a4ecbe1
commit
1ceaac207b
@ -1,37 +0,0 @@
|
|||||||
From fbcbffbac994aca1264e3c14da96ac9bfd90466e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chukun Pan <amadeus@jmu.edu.cn>
|
|
||||||
Date: Fri, 22 Nov 2024 15:30:06 +0800
|
|
||||||
Subject: [PATCH] phy: rockchip: naneng-combphy: fix phy reset
|
|
||||||
|
|
||||||
Currently, the USB port via combophy on the RK3528/RK3588 SoC is broken.
|
|
||||||
|
|
||||||
usb usb8-port1: Cannot enable. Maybe the USB cable is bad?
|
|
||||||
|
|
||||||
This is due to the combphy of RK3528/RK3588 SoC has multiple resets, but
|
|
||||||
only "phy resets" need assert and deassert, "apb resets" don't need.
|
|
||||||
So change the driver to only match the phy resets, which is also what
|
|
||||||
the vendor kernel does.
|
|
||||||
|
|
||||||
Fixes: 7160820d742a ("phy: rockchip: add naneng combo phy for RK3568")
|
|
||||||
Cc: FUKAUMI Naoki <naoki@radxa.com>
|
|
||||||
Cc: Michael Zimmermann <sigmaepsilon92@gmail.com>
|
|
||||||
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
|
|
||||||
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
|
|
||||||
Tested-by: FUKAUMI Naoki <naoki@radxa.com>
|
|
||||||
Link: https://lore.kernel.org/r/20241122073006.99309-2-amadeus@jmu.edu.cn
|
|
||||||
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
|
|
||||||
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
|
|
||||||
@@ -309,7 +309,7 @@ static int rockchip_combphy_parse_dt(str
|
|
||||||
|
|
||||||
priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk");
|
|
||||||
|
|
||||||
- priv->phy_rst = devm_reset_control_array_get_exclusive(dev);
|
|
||||||
+ priv->phy_rst = devm_reset_control_get(dev, "phy");
|
|
||||||
if (IS_ERR(priv->phy_rst))
|
|
||||||
return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n");
|
|
||||||
|
|
@ -63,7 +63,7 @@ Link: https://lore.kernel.org/r/20231023032251.164775-1-luben.tuikov@amd.com
|
|||||||
ring->sched_score, ring->name,
|
ring->sched_score, ring->name,
|
||||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
|
||||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
|
||||||
@@ -327,8 +327,8 @@ void amdgpu_job_stop_all_jobs_on_sched(s
|
@@ -326,8 +326,8 @@ void amdgpu_job_stop_all_jobs_on_sched(s
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Signal all jobs not yet scheduled */
|
/* Signal all jobs not yet scheduled */
|
||||||
|
@ -35,7 +35,7 @@ Signed-off-by: jensen <jensenhuang@friendlyarm.com>
|
|||||||
|
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
@@ -7541,7 +7541,7 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -7542,7 +7542,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||||
#ifdef STMMAC_VLAN_TAG_USED
|
#ifdef STMMAC_VLAN_TAG_USED
|
||||||
/* Both mac100 and gmac support receive VLAN tag detection */
|
/* Both mac100 and gmac support receive VLAN tag detection */
|
||||||
ndev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX;
|
ndev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
@@ -7367,6 +7367,7 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -7368,6 +7368,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||||
{
|
{
|
||||||
struct net_device *ndev = NULL;
|
struct net_device *ndev = NULL;
|
||||||
struct stmmac_priv *priv;
|
struct stmmac_priv *priv;
|
||||||
@ -8,7 +8,7 @@
|
|||||||
u32 rxq;
|
u32 rxq;
|
||||||
int i, ret = 0;
|
int i, ret = 0;
|
||||||
|
|
||||||
@@ -7375,6 +7376,9 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -7376,6 +7377,9 @@ int stmmac_dvr_probe(struct device *devi
|
||||||
if (!ndev)
|
if (!ndev)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user