On 2024-12-30 16:42, Greg Kroah-Hartman wrote:
> 6.12-stable review patch. If anyone has any objections, please let me know.
It probably comes a bit late, but this patch broke usb and pcie on
rk356x. The other commit from the same series, commit 8b9c12757f91
("arm64: dts: rockchip: add reset-names for combphy on rk3568"), also
needs to be backported.
Regards
Aurelien
> ------------------
>
> From: Chukun Pan <amadeus@xxxxxxxxxx>
>
> commit fbcbffbac994aca1264e3c14da96ac9bfd90466e upstream.
>
> 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@xxxxxxxxx>
> Cc: Michael Zimmermann <sigmaepsilon92@xxxxxxxxx>
> Signed-off-by: Chukun Pan <amadeus@xxxxxxxxxx>
> Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>
> Tested-by: FUKAUMI Naoki <naoki@xxxxxxxxx>
> Link: https://lore.kernel.org/r/20241122073006.99309-2-amadeus@xxxxxxxxxx
> Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> 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");
>
>
>
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurelien@xxxxxxxxxxx http://aurel32.net
