summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Karlman <[email protected]>2026-03-09 21:37:06 +0000
committerKever Yang <[email protected]>2026-06-08 21:21:52 +0800
commit3d294c01858f738e4bf52f90c111fc8e601e7819 (patch)
tree7f979492b998ba1d9f5c45ee0c5532e9b8384c70
parentc97c7d5caadc6d2d87764162171d1a1bdc206803 (diff)
rockchip: rk3588-rock-5b: Remove USB-C controller from u-boot.dtsi
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, including the temporary used dr_mode and maximum-speed props of the usb_host0_xhci node. Only usbc0 status = "okay" is kept ensuring USB-C power delivery continues to work as intended. Signed-off-by: Jonas Karlman <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Reviewed-by: Kever Yang <[email protected]>
-rw-r--r--arch/arm/dts/rk3588-rock-5b-u-boot.dtsi43
1 files changed, 1 insertions, 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 e07b549c767..ddc177344eb 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";
};