From 6ad924ab3b6b2a4d8c73a9871d0e94245cce6fcf Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sat, 20 Jun 2020 01:41:22 +0200
Subject: [PATCH 1/3] Add regulator needed for usage of USB

---
 arch/arm/dts/rk3399-pinebook-pro.dts | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
index 294d21bf45..6214887a1c 100644
--- a/arch/arm/dts/rk3399-pinebook-pro.dts
+++ b/arch/arm/dts/rk3399-pinebook-pro.dts
@@ -207,6 +207,16 @@
 		};
 	};
 
+	vcc3v3_s0: vcc3v3-s0-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&lcdvcc_en>;
+		regulator-name = "vcc3v3_s0";
+		regulator-always-on;
+	};
+
 	/* 5 V USB power supply */
 	vcc5v0_usb: pa_5v: vcc5v0-usb-regulator {
 		compatible = "regulator-fixed";
@@ -610,8 +620,8 @@
 				};
 			};
 
-			vcc3v3_s0: SWITCH_REG2 {
-				regulator-name = "vcc3v3_s0";
+			unused: SWITCH_REG2 {
+				regulator-name = "SWITCH_REG2";
 				regulator-always-on;
 				regulator-boot-on;
 
@@ -872,6 +882,11 @@
 			rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
+		/* Shared between LCD and usb */
+		lcdvcc_en: lcdvcc-en {
+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
 		vcc5v0_host_en_pin: vcc5v0-host-en-pin {
 			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
@@ -1054,10 +1069,12 @@
 };
 
 &usb_host1_ehci {
+	phy-supply = <&vcc3v3_s0>;
 	status = "okay";
 };
 
 &usb_host1_ohci {
+	phy-supply = <&vcc3v3_s0>;
 	status = "okay";
 };
 
-- 
2.27.0

