From: Greg Kroah-Hartman Date: Tue, 25 Mar 2025 11:51:48 +0000 (-0400) Subject: 5.15-stable patches X-Git-Tag: v6.1.132~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=820d2d94bc2e4c87c39a24111add071f0ab2b7e0;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: arm64-dts-rockchip-fix-u2phy1_host-status-for-nanopi-r4s.patch --- diff --git a/queue-5.15/arm64-dts-rockchip-fix-u2phy1_host-status-for-nanopi-r4s.patch b/queue-5.15/arm64-dts-rockchip-fix-u2phy1_host-status-for-nanopi-r4s.patch new file mode 100644 index 0000000000..1248f862ef --- /dev/null +++ b/queue-5.15/arm64-dts-rockchip-fix-u2phy1_host-status-for-nanopi-r4s.patch @@ -0,0 +1,38 @@ +From 38f4aa34a5f737ea8588dac320d884cc2e762c03 Mon Sep 17 00:00:00 2001 +From: Justin Klaassen +Date: Tue, 25 Feb 2025 17:03:58 +0000 +Subject: arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S + +From: Justin Klaassen + +commit 38f4aa34a5f737ea8588dac320d884cc2e762c03 upstream. + +The u2phy1_host should always have the same status as usb_host1_ehci +and usb_host1_ohci, otherwise the EHCI and OHCI drivers may be +initialized for a disabled usb port. + +Per the NanoPi R4S schematic, the phy-supply for u2phy1_host is set to +the vdd_5v regulator. + +Fixes: db792e9adbf8 ("rockchip: rk3399: Add support for FriendlyARM NanoPi R4S") +Cc: stable@vger.kernel.org +Signed-off-by: Justin Klaassen +Reviewed-by: Dragan Simic +Link: https://lore.kernel.org/r/20250225170420.3898-1-justin@tidylabs.net +Signed-off-by: Heiko Stuebner +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +@@ -117,7 +117,7 @@ + }; + + &u2phy1_host { +- status = "disabled"; ++ phy-supply = <&vdd_5v>; + }; + + &uart0 { diff --git a/queue-5.15/series b/queue-5.15/series index d57c15d65d..50d1fa8569 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -105,3 +105,4 @@ soc-qcom-pdr-fix-the-potential-deadlock.patch drm-radeon-fix-uninitialized-size-issue-in-radeon_vce_cs_parse.patch drm-amdgpu-fix-jpeg-video-caps-max-size-for-navi1x-and-raven.patch mptcp-fix-data-stream-corruption-in-the-address-announcement.patch +arm64-dts-rockchip-fix-u2phy1_host-status-for-nanopi-r4s.patch