Merge tag 'mips-pull-2019-11-16' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / arch / arm / dts / rk3036-sdk.dts

diff --git a/arch/arm/dts/rk3036-sdk.dts b/arch/arm/dts/rk3036-sdk.dts
index a83badb59cbca2b511e40d03cc3a1fa412d95fef..3493150df9271d0f0ce3979c0b9940bb9651c0e9 100644 (file)
--- a/arch/arm/dts/rk3036-sdk.dts
+++ b/arch/arm/dts/rk3036-sdk.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 /dts-v1/;
@@ -16,10 +15,25 @@
                stdout-path = &uart2;
        };
 
-       usb_control {
-               compatible = "rockchip,rk3036-usb-control";
-               host_drv_gpio = <&gpio2 23 GPIO_ACTIVE_LOW>;
-               otg_drv_gpio = <&gpio0 26 GPIO_ACTIVE_LOW>;
+       vcc5v0_otg: vcc5v0-otg-drv {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc5v0_otg";
+               gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&otg_vbus_drv>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+       };
+
+       vcc5v0_host: vcc5v0-host-drv {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc5v0_host";
+               gpio = <&gpio2 23 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&host_vbus_drv>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
        };
 };
 
@@ -36,11 +50,25 @@
 };
 
 &usb_host {
+       vbus-supply = <&vcc5v0_host>;
        status = "okay";
 };
 
 &usb_otg {
+       vbus-supply = <&vcc5v0_otg>;
        status = "okay";
+};
 
-       dr_mode = "host";
+&pinctrl {
+       usb_otg {
+               otg_vbus_drv: host-vbus-drv {
+                       rockchip,pins = <0 26 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
+       usb_host {
+               host_vbus_drv: host-vbus-drv {
+                       rockchip,pins = <2 23 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
 };