[PATCH] arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S

[PATCH] arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S

[Justin Klaassen]

The u2phy1_host should always have the same status as usb_host1_ehci,
otherwise the ehci driver may be initialized for a disabled usb port.

Signed-off-by: Justin Klaassen <justin@tidylabs.net>
---
 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
index b1c9bd0e63ef..8d94d9f91a5c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
@@ -115,7 +115,7 @@ &u2phy0_host {
 };
 
 &u2phy1_host {
-	status = "disabled";
+	phy-supply = <&vdd_5v>;
 };
 
 &uart0 {
-- 
2.47.1

Re: [PATCH] arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S

[Dragan Simic]

Hello Justin,

Thanks for the patch!  Please, see a few comments below.

On 2025-02-24 18:09, Justin Klaassen wrote:
> The u2phy1_host should always have the same status as usb_host1_ehci,
> otherwise the ehci driver may be initialized for a disabled usb port.
> 
> Signed-off-by: Justin Klaassen <justin@tidylabs.net>
> ---
>  arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
> b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
> index b1c9bd0e63ef..8d94d9f91a5c 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
> @@ -115,7 +115,7 @@ &u2phy0_host {
>  };
> 
>  &u2phy1_host {
> -	status = "disabled";
> +	phy-supply = <&vdd_5v>;
>  };
> 
>  &uart0 {

Indeed, the rk3399-nanopi4.dtsi file, which rk3399-nanopi-r4s.dtsi
extends, enables u2phy1_host, usb_host1_ehci and usb_host1_ohci,
so disabling u2phy1_host in rk3399-nanopi-r4s.dtsi makes no sense.

After checking the NanoPi R4S schematic, I can confirm that the
phy-supply references the right regulator.  There are some strange
things in the schematic, but they're unrelated to this patch.

However, there should be a v2 of this patch with the proper Fixes
and CC: stable tags, so this bugfix also gets propagated into the
long-term kernels.  Please, feel free to also include

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

[PATCH v2] arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S

[Justin Klaassen]

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>
---
v1 -> v2: Updated commit message, added Fixes: and Cc: stable tags

 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
index b1c9bd0e63ef..8d94d9f91a5c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
@@ -115,7 +115,7 @@ &u2phy0_host {
 };
 
 &u2phy1_host {
-	status = "disabled";
+	phy-supply = <&vdd_5v>;
 };
 
 &uart0 {
-- 
2.47.1

Re: [PATCH v2] arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S

[Heiko Stuebner]

On Tue, 25 Feb 2025 17:03:58 +0000, Justin Klaassen wrote:
> 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.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S
      commit: 38f4aa34a5f737ea8588dac320d884cc2e762c03

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>