From: wenping.zhang Date: Thu, 20 Oct 2016 10:26:45 +0000 (+0800) Subject: arm64: dts: rk3399-sapphire: add vbus-5v gpio control in fusb302 node. X-Git-Tag: firefly_0821_release~1368 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb3e42dc8cf5e1e0431535a2fbe2a39dfac91d39;p=firefly-linux-kernel-4.4.55.git arm64: dts: rk3399-sapphire: add vbus-5v gpio control in fusb302 node. We should also Disable vbus-5v gpio control in retulator node,otherwise vbus-5v will always power on. Change-Id: Icb42f687866174398917ced3e53a3e876ea37b86 Signed-off-by: wenping.zhang --- diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 905687518a57..5d2afc63f257 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -158,7 +158,6 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&host_vbus_drv>; regulator-name = "vcc5v0_host"; @@ -483,6 +482,7 @@ reg = <0x22>; pinctrl-names = "default"; pinctrl-0 = <&fusb0_int>; + vbus-5v-gpios = <&gpio4 25 GPIO_ACTIVE_HIGH>; int-n-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; status = "okay"; };