From 5c76066147837274124f25afdce5432eb0efa269 Mon Sep 17 00:00:00 2001 From: Lars Ivar Miljeteig Date: Fri, 14 Dec 2018 12:05:33 +0100 Subject: [PATCH] devicetree: Don't specify vbus gpio in factory dts The test application controls the OTG pin itself, not via the usb OTG driver. A change between kern 4.1 and 4.9 causes the regulator to take the gpio pin even if there are no references to it. This commit removes the vbus gpio from the driver, so that the test application works again. --- arch/arm/boot/dts/zero-gravitas-factory.dts | 2 +- arch/arm/boot/dts/zero-gravitas.dts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/zero-gravitas-factory.dts b/arch/arm/boot/dts/zero-gravitas-factory.dts index 4d7cf11b7ebe..c6fb4ea0d670 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 f51edfdedf8a..e787b303973e 100644 --- a/arch/arm/boot/dts/zero-gravitas.dts +++ b/arch/arm/boot/dts/zero-gravitas.dts @@ -1,6 +1,10 @@ #include "zero-gravitas-factory.dts" -&usbotg1 { - vbus-supply = <®_usb_otg1_vbus>; +®_usb_otg1_vbus { + gpio = <&gpio4 15 0>; +}; + +&usbotg1 { + vbus-supply = <®_usb_otg1_vbus>; };