[PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[Jonas Karlman]

The commit 12049db76437 ("rockchip: rk3588-rock-5b: Add USB-C controller
to u-boot.dtsi") added the USB-C controller node to the ROCK 5B board
u-boot.dtsi, this and related usb nodes are now part of upstream DT.

Remove the upstream USB-C controller related DT nodes from u-boot.dtsi,
keep usbc0 status = "okay" to keep USB-C power delivery working.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 43 +------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index e07b549c767f..ddc177344ebd 100644
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -19,33 +19,6 @@
 	bootph-some-ram;
 };
 
-&i2c4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c4m1_xfer>;
-	status = "okay";
-
-	usbc0: usb-typec@22 {
-		compatible = "fcs,fusb302";
-		reg = <0x22>;
-		interrupt-parent = <&gpio3>;
-		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
-		pinctrl-names = "default";
-		status = "okay";
-
-		usb_con: connector {
-			compatible = "usb-c-connector";
-			label = "USB-C";
-			data-role = "dual";
-			power-role = "sink";
-			try-power-role = "sink";
-			op-sink-microwatt = <1000000>;
-			sink-pdos =
-				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
-				<PDO_VAR(5000, 20000, 5000)>;
-		};
-	};
-};
-
 &saradc {
 	bootph-pre-ram;
 	vdd-microvolts = <1800000>;
@@ -63,20 +36,6 @@
 	};
 };
 
-&u2phy0 {
-	status = "okay";
-};
-
-&u2phy0_otg {
-	status = "okay";
-};
-
-&usbdp_phy0 {
-	status = "okay";
-};
-
-&usb_host0_xhci {
-	dr_mode = "peripheral";
-	maximum-speed = "high-speed";
+&usbc0 {
 	status = "okay";
 };
-- 
2.52.0

Re: [PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 2120 bytes --]

Hi,

On Mon, Jan 26, 2026 at 09:55:59PM +0000, Jonas Karlman wrote:
> The commit 12049db76437 ("rockchip: rk3588-rock-5b: Add USB-C controller
> to u-boot.dtsi") added the USB-C controller node to the ROCK 5B board
> u-boot.dtsi, this and related usb nodes are now part of upstream DT.
> 
> Remove the upstream USB-C controller related DT nodes from u-boot.dtsi,
> keep usbc0 status = "okay" to keep USB-C power delivery working.
> 
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Greetings,

-- Sebastian

>  arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 43 +------------------------
>  1 file changed, 1 insertion(+), 42 deletions(-)
> 
> diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> index e07b549c767f..ddc177344ebd 100644
> --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> @@ -19,33 +19,6 @@
>  	bootph-some-ram;
>  };
>  
> -&i2c4 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2c4m1_xfer>;
> -	status = "okay";
> -
> -	usbc0: usb-typec@22 {
> -		compatible = "fcs,fusb302";
> -		reg = <0x22>;
> -		interrupt-parent = <&gpio3>;
> -		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
> -		pinctrl-names = "default";
> -		status = "okay";
> -
> -		usb_con: connector {
> -			compatible = "usb-c-connector";
> -			label = "USB-C";
> -			data-role = "dual";
> -			power-role = "sink";
> -			try-power-role = "sink";
> -			op-sink-microwatt = <1000000>;
> -			sink-pdos =
> -				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
> -				<PDO_VAR(5000, 20000, 5000)>;
> -		};
> -	};
> -};
> -
>  &saradc {
>  	bootph-pre-ram;
>  	vdd-microvolts = <1800000>;
> @@ -63,20 +36,6 @@
>  	};
>  };
>  
> -&u2phy0 {
> -	status = "okay";
> -};
> -
> -&u2phy0_otg {
> -	status = "okay";
> -};
> -
> -&usbdp_phy0 {
> -	status = "okay";
> -};
> -
> -&usb_host0_xhci {
> -	dr_mode = "peripheral";
> -	maximum-speed = "high-speed";
> +&usbc0 {
>  	status = "okay";
>  };
> -- 
> 2.52.0
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[Quentin Schulz]

Hi Jonas,

On 1/26/26 10:55 PM, Jonas Karlman wrote:

[...]

> -&usb_host0_xhci {
> -	dr_mode = "peripheral";
> -	maximum-speed = "high-speed";

This is not set anymore after this patch is applied (dr_mode = otg and 
no maximum-speed). Please keep this part as is and if actually fine to 
remove, have a separate commit motivating the removal.

Cheers,
Quentin

Re: [PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[Jonas Karlman]

Hi Quentin,

On 2/13/2026 6:17 PM, Quentin Schulz wrote:
> Hi Jonas,
> 
> On 1/26/26 10:55 PM, Jonas Karlman wrote:
> 
> [...]
> 
>> -&usb_host0_xhci {
>> -	dr_mode = "peripheral";
>> -	maximum-speed = "high-speed";
> 
> This is not set anymore after this patch is applied (dr_mode = otg and 
> no maximum-speed). Please keep this part as is and if actually fine to 
> remove, have a separate commit motivating the removal.

I disagree, these props may differ but the function they result in for
U-Boot is the same, i.e. ums and rockusb commands can be used before and
after this patch.

The board u-boot.dtsi included something minimal required to have ums
and rockusb working, this can fully be replaced with upstream DT and
U-Boot functionality stay the same. Something I think current commit
message is already covering.

Regards,
Jonas

> Cheers,
> Quentin

Re: [PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[Quentin Schulz]

Hi Jonas,

On 2/13/26 6:42 PM, Jonas Karlman wrote:
> Hi Quentin,
> 
> On 2/13/2026 6:17 PM, Quentin Schulz wrote:
>> Hi Jonas,
>>
>> On 1/26/26 10:55 PM, Jonas Karlman wrote:
>>
>> [...]
>>
>>> -&usb_host0_xhci {
>>> -	dr_mode = "peripheral";
>>> -	maximum-speed = "high-speed";
>>
>> This is not set anymore after this patch is applied (dr_mode = otg and
>> no maximum-speed). Please keep this part as is and if actually fine to
>> remove, have a separate commit motivating the removal.
> 
> I disagree, these props may differ but the function they result in for
> U-Boot is the same, i.e. ums and rockusb commands can be used before and
> after this patch.
> 
> The board u-boot.dtsi included something minimal required to have ums
> and rockusb working, this can fully be replaced with upstream DT and
> U-Boot functionality stay the same. Something I think current commit
> message is already covering.
> 

I read the commit log as "code is already in upstream DTS so remove 
duplicated code", which isn't true as two properties aren't 
making/haven't made it.

At the very least, highlight those two changes and justify why it's fine 
not to have them anymore.

Can we enter SPL_DFU mode with dr_mode = otg? (I assume we could in the 
past?) You are the one who added those two properties in 2024 and it 
also wasn't really motivated back then, so why maximum-speed as well? 
And why is it fine to remove now?

Cheers,
Quentin

Re: [PATCH] rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi

[Kever Yang]

On 2026/1/27 05:55, Jonas Karlman wrote:
> The commit 12049db76437 ("rockchip: rk3588-rock-5b: Add USB-C controller
> to u-boot.dtsi") added the USB-C controller node to the ROCK 5B board
> u-boot.dtsi, this and related usb nodes are now part of upstream DT.
>
> Remove the upstream USB-C controller related DT nodes from u-boot.dtsi,
> keep usbc0 status = "okay" to keep USB-C power delivery working.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 43 +------------------------
>   1 file changed, 1 insertion(+), 42 deletions(-)
>
> diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> index e07b549c767f..ddc177344ebd 100644
> --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> @@ -19,33 +19,6 @@
>   	bootph-some-ram;
>   };
>   
> -&i2c4 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2c4m1_xfer>;
> -	status = "okay";
> -
> -	usbc0: usb-typec@22 {
> -		compatible = "fcs,fusb302";
> -		reg = <0x22>;
> -		interrupt-parent = <&gpio3>;
> -		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
> -		pinctrl-names = "default";
> -		status = "okay";
> -
> -		usb_con: connector {
> -			compatible = "usb-c-connector";
> -			label = "USB-C";
> -			data-role = "dual";
> -			power-role = "sink";
> -			try-power-role = "sink";
> -			op-sink-microwatt = <1000000>;
> -			sink-pdos =
> -				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
> -				<PDO_VAR(5000, 20000, 5000)>;
> -		};
> -	};
> -};
> -
>   &saradc {
>   	bootph-pre-ram;
>   	vdd-microvolts = <1800000>;
> @@ -63,20 +36,6 @@
>   	};
>   };
>   
> -&u2phy0 {
> -	status = "okay";
> -};
> -
> -&u2phy0_otg {
> -	status = "okay";
> -};
> -
> -&usbdp_phy0 {
> -	status = "okay";
> -};
> -
> -&usb_host0_xhci {
> -	dr_mode = "peripheral";
> -	maximum-speed = "high-speed";
> +&usbc0 {
>   	status = "okay";
>   };