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 <jonas@kwiboo.se>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index e07b549c767f3ad45aab3f1ebcf8eb20160911f3..ddc177344ebd837556ea1bbf291d3ea1d2961b8e 100644 (file)
--- 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";
 };