Hi, Am Freitag, 3. Januar 2025, 04:30:16 CET schrieb Chukun Pan: > > 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. because it was christmas ;-) . > Maybe the merge window is different. Can you test the following patch? But in any case, the driver _must_ stay compatible with old devicetrees. I.e. requiring a DT update is a general no-go. > ``` > --- 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); > + This looks like a reasonable fallback > if (IS_ERR(priv->phy_rst)) > return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n"); Heiko
