From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Wed, 5 Apr 2017 14:06:11 +0000 (+0200)
Subject: ARM: dts: rockchip: Setup usb vbus-supply on rk3288-rock2
X-Git-Tag: v4.13-rc1~168^2~23^2~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95b840afe420bb4152fde11473e7ce370b058c1b;p=karo-tx-linux.git

ARM: dts: rockchip: Setup usb vbus-supply on rk3288-rock2

Now that the rockchip usb phy has a vbus-supply property use that to
control the vbus regulator on rock2.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---

diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts
index a23a94811be8..8ed25e9f60bc 100644
--- a/arch/arm/boot/dts/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -125,10 +125,6 @@
 		gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&host_vbus_drv>;
-		/* Always on as the rockchip usb phy doesn't have a vbus-supply
-		 * property
-		 */
-		regulator-always-on;
 		regulator-name = "vcc_host";
 	};
 
@@ -279,6 +275,10 @@
 	status = "okay";
 };
 
+&usbphy1 {
+	vbus-supply = <&vcc_usb_host>;
+};
+
 &usb_host0_ehci {
 	status = "okay";
 };