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 (file)
index 0000000..1248f86
--- /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 <justin@tidylabs.net>
+Date: Tue, 25 Feb 2025 17:03:58 +0000
+Subject: arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S
+
+From: Justin Klaassen <justin@tidylabs.net>
+
+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 <justin@tidylabs.net>
+Reviewed-by: Dragan Simic <dsimic@manjaro.org>
+Link: https://lore.kernel.org/r/20250225170420.3898-1-justin@tidylabs.net
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 d57c15d65d054ca9bc3f2fad236123bed6019645..50d1fa85694ff20c5900ab5a6719d9e1965e3df4 100644 (file)
--- 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