[PATCH 1/2] arm64: dts: rockchip: rk3568: add reset-names for combphy
Chukun Pan
amadeus at jmu.edu.cn
Thu Jan 2 19:30:16 PST 2025
Hi,
> The other patch in this series:
> arm64: dts: rockchip: rk3568: add reset-names for combphy
> is missing in v6.13-rc5, which will break pcie2 of rk3568
> because the phy driver has changed.
I don't know why the dts patch hasn't been merged into the mainline yet.
Maybe the merge window is different. Can you test the following patch?
```
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
@@ -325,6 +325,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");
+ /* fallback to old behaviour */
+ if (IS_ERR_OR_NULL(priv->phy_rst))
+ 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");
```
Thanks,
Chukun
--
2.25.1
More information about the Linux-rockchip
mailing list