From a5360c7ddfeac2aa6cdcf437b7e20b986d943375 Mon Sep 17 00:00:00 2001
From: Eirik Schultz <schultzern@gmail.com>
Date: Fri, 17 Jan 2020 15:43:19 +0100
Subject: [PATCH] Revert "devicetree: Don't specify vbus gpio in factory dts"

This reverts commit 5c76066147837274124f25afdce5432eb0efa269.
---
 arch/arm/boot/dts/zero-gravitas-factory.dts | 2 +-
 arch/arm/boot/dts/zero-gravitas.dts         | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/zero-gravitas-factory.dts b/arch/arm/boot/dts/zero-gravitas-factory.dts
index c6fb4ea0d670..4d7cf11b7ebe 100644
--- a/arch/arm/boot/dts/zero-gravitas-factory.dts
+++ b/arch/arm/boot/dts/zero-gravitas-factory.dts
@@ -42,7 +42,7 @@
 			regulator-name = "usb_otg1_vbus";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
-			/*gpio = <&gpio4 15 0>;*/
+			gpio = <&gpio4 15 0>;
 			enable-active-high;
 			vin-supply = <&swbst_reg>;
 		};
diff --git a/arch/arm/boot/dts/zero-gravitas.dts b/arch/arm/boot/dts/zero-gravitas.dts
index e787b303973e..f51edfdedf8a 100644
--- a/arch/arm/boot/dts/zero-gravitas.dts
+++ b/arch/arm/boot/dts/zero-gravitas.dts
@@ -1,10 +1,6 @@
 #include "zero-gravitas-factory.dts"
 
-&reg_usb_otg1_vbus {
-	gpio = <&gpio4 15 0>;
-};
-
 &usbotg1 {
-	vbus-supply = <&reg_usb_otg1_vbus>;
+        vbus-supply = <&reg_usb_otg1_vbus>;
 };