[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20250106100001.1344418-2-amadeus@jmu.edu.cn>
Date: Mon, 6 Jan 2025 18:00:01 +0800
From: Chukun Pan <amadeus@....edu.cn>
To: Vinod Koul <vkoul@...nel.org>
Cc: Heiko Stuebner <heiko@...ech.de>,
Philipp Zabel <p.zabel@...gutronix.de>,
Kishon Vijay Abraham I <kishon@...nel.org>,
Jianfeng Liu <liujianfeng1994@...il.com>,
linux-arm-kernel@...ts.infradead.org,
linux-rockchip@...ts.infradead.org,
linux-phy@...ts.infradead.org,
linux-kernel@...r.kernel.org,
Chukun Pan <amadeus@....edu.cn>
Subject: [PATCH v2 1/1] phy: rockchip: naneng-combphy: compatible reset with old DT
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@...il.com>
Signed-off-by: Chukun Pan <amadeus@....edu.cn>
---
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 a1532ef8bbe9..8c3ce57f8915 100644
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
@@ -324,7 +324,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.25.1
Powered by blists - more mailing lists