Fixes for 6.1

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/phy-rockchip-naneng-combphy-compatible-reset-with-ol.patch b/queue-6.1/phy-rockchip-naneng-combphy-compatible-reset-with-ol.patch
new file mode 100644 (file)
index 0000000..81465bf
--- /dev/null
+++ b/queue-6.1/phy-rockchip-naneng-combphy-compatible-reset-with-ol.patch
@@ -0,0 +1,42 @@
+From b50911dbc4657148ce7c5beb1435b2b9d46643e9 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 6 Jan 2025 18:00:01 +0800
+Subject: phy: rockchip: naneng-combphy: compatible reset with old DT
+
+From: Chukun Pan <amadeus@jmu.edu.cn>
+
+[ Upstream commit 3126ea9be66b53e607f87f067641ba724be24181 ]
+
+The device tree of RK3568 did not specify reset-names before.
+So add fallback to old behaviour to be compatible with old DT.
+
+Fixes: fbcbffbac994 ("phy: rockchip: naneng-combphy: fix phy reset")
+Cc: Jianfeng Liu <liujianfeng1994@gmail.com>
+Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
+Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
+Link: https://lore.kernel.org/r/20250106100001.1344418-2-amadeus@jmu.edu.cn
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+index d97a7164c4964..2c73cc8dd1edb 100644
+--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
++++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+@@ -299,7 +299,10 @@ static int rockchip_combphy_parse_dt(struct device *dev, struct rockchip_combphy
+ 
+       priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk");
+ 
+-      priv->phy_rst = devm_reset_control_get(dev, "phy");
++      priv->phy_rst = devm_reset_control_get_exclusive(dev, "phy");
++      /* fallback to old behaviour */
++      if (PTR_ERR(priv->phy_rst) == -ENOENT)
++              priv->phy_rst = devm_reset_control_array_get_exclusive(dev);
+       if (IS_ERR(priv->phy_rst))
+               return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n");
+ 
+-- 
+2.39.5
+

diff --git a/queue-6.1/series b/queue-6.1/series
index f20981853d10c1fe6748c7374c9222a71abb7a7d..3342a4f84e9a97597553a7b7edc36f7183956edd 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -144,3 +144,4 @@ mm-don-t-pin-zero_page-in-pin_user_pages.patch
 uprobes-reject-the-shared-zeropage-in-uprobe_write_o.patch
 io_uring-net-save-msg_control-for-compat.patch
 x86-cpu-fix-warm-boot-hang-regression-on-amd-sc1100-.patch
+phy-rockchip-naneng-combphy-compatible-reset-with-ol.patch