diff --git a/arch/arm64/boot/dts/rockchip/OK3588-C-common.dtsi b/arch/arm64/boot/dts/rockchip/OK3588-C-common.dtsi
index f13ce47c6..a3eaffe60 100644
--- a/arch/arm64/boot/dts/rockchip/OK3588-C-common.dtsi
+++ b/arch/arm64/boot/dts/rockchip/OK3588-C-common.dtsi
@@ -846,71 +846,6 @@
status = "okay";
};
- usbc1: fusb302@22 {
- compatible = "fcs,fusb302";
- reg = <0x22>;
- interrupt-parent = <&gpio1>;
- interrupts = <RK_PB3 IRQ_TYPE_LEVEL_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <&usbc1_int>;
- vbus-supply = <&vbus5v0_typec1>;
- status = "okay";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- usbc1_role_sw: endpoint@0 {
- remote-endpoint = <&dwc3_1_role_switch>;
- };
- };
- };
-
- usb_con1: connector {
- compatible = "usb-c-connector";
- label = "USB-C";
- data-role = "dual";
- power-role = "dual";
- try-power-role = "sink";
- op-sink-microwatt = <1000000>;
- sink-pdos =
- <PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>;
- source-pdos =
- <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
-
- altmodes {
- #address-cells = <1>;
- #size-cells = <0>;
-
- altmode@0 {
- reg = <0>;
- svid = <0xff01>;
- vdo = <0xffffffff>;
- };
- };
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- usbc1_orien_sw: endpoint {
- remote-endpoint = <&usbdp_phy1_orientation_switch>;
- };
- };
-
- port@1 {
- reg = <1>;
- dp1_altmode_mux: endpoint {
- remote-endpoint = <&usbdp_phy1_dp_altmode_mux>;
- };
- };
- };
- };
- };
};
&i2c7 {
@@ -1260,8 +1195,8 @@
};
&u2phy1_otg {
- phy-supply = <&vcc5v0_sys>;
status = "okay";
+ phy-supply = <&vbus5v0_typec1>;
};
&u2phy2_host {
@@ -1339,25 +1274,7 @@
&usbdp_phy1 {
status = "okay";
- orientation-switch;
- rockchip,dp-lane-mux = <2 3>;
- svid = <0xff01>;
- sbu1-dc-gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
- sbu2-dc-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
-
- port {
- #address-cells = <1>;
- #size-cells = <0>;
- usbdp_phy1_orientation_switch: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&usbc1_orien_sw>;
- };
-
- usbdp_phy1_dp_altmode_mux: endpoint@1 {
- reg = <1>;
- remote-endpoint = <&dp1_altmode_mux>;
- };
- };
+ rockchip,dp-lane-mux = <0 1>;
};
&usbdp_phy1_dp {
@@ -1374,16 +1291,7 @@
&usbdrd_dwc3_1 {
status = "okay";
- dr_mode = "otg";
- usb-role-switch;
- port {
- #address-cells = <1>;
- #size-cells = <0>;
- dwc3_1_role_switch: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&usbc1_role_sw>;
- };
- };
+ dr_mode = "host";
};
&usbhost3_0 {