diff --git a/arch/arm/boot/dts/rk3506g-test1-v10-audio.dts b/arch/arm/boot/dts/rk3506g-test1-v10-audio.dts index 915fe72540ae..1b2ba7f11260 100644 --- a/arch/arm/boot/dts/rk3506g-test1-v10-audio.dts +++ b/arch/arm/boot/dts/rk3506g-test1-v10-audio.dts @@ -45,6 +45,15 @@ }; }; + extcon_usb: extcon-usb { + compatible = "linux,extcon-usb-gpio"; + vbus-gpio = <&gpio3 RK_PB2 GPIO_ACTIVE_LOW>; + id-gpio = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_extcon_vbus &usb_extcon_id>; + status = "okay"; + }; + fiq_debugger: fiq-debugger { compatible = "rockchip,fiq-debugger"; rockchip,serial-id = <0>; @@ -301,6 +310,21 @@ gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_otg0_en>; + vin-supply = <&vcc_sys>; + }; + + vcc5v0_otg1: vcc5v0-otg1-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_otg1"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_otg1_en>; + vin-supply = <&vcc_sys>; }; }; @@ -487,9 +511,21 @@ }; usb { + usb_extcon_id: usb-extcon-id { + rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + usb_extcon_vbus: usb-extcon-vbus { + rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + vcc5v0_otg0_en: vcc5v0-otg0-en { rockchip,pins = <3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; + + vcc5v0_otg1_en: vcc5v0-otg1-en { + rockchip,pins = <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; }; @@ -557,6 +593,28 @@ pinctrl-0 = <&rm_io16_spdif_tx>; }; +&u2phy_otg0 { + vbus-supply = <&vcc5v0_otg0>; + rockchip,gpio-vbus-det; + rockchip,gpio-id-det; + status = "okay"; +}; + +&u2phy_otg1 { + phy-supply = <&vcc5v0_otg1>; + status = "okay"; +}; + &usb20_otg0 { status = "okay"; }; + +&usb20_otg1 { + dr_mode = "host"; + status = "okay"; +}; + +&usb2phy { + extcon = <&extcon_usb>; + status = "okay"; +};