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 <[email protected]>
> ---Reviewed-by: Sebastian Reichel <[email protected]> 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 >
signature.asc
Description: PGP signature
