From 3fbafa3e99f6cf4372f304a4e343abb575d41802 Mon Sep 17 00:00:00 2001 From: Douglas Anderson Date: Thu, 31 Mar 2016 13:07:33 -0700 Subject: [PATCH] ARM64: dts: rk3399: the USB 2.0 vbus GPIO is board specific A GPIO was put in rk3399.dtsi that doesn't belong there. Specifically this GPIO isn't the same for all rk3399 boards. I presume it belongs in rk3399-tb.dts, so move it there. Change-Id: I0b3272655da565eb6b348a33401f7517224db5fa Fixes: 3ed499f07cf7 ("ARM64: dts: rockchip: rk3399: add usb2.0 phy node") Signed-off-by: Douglas Anderson --- arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi index d21bc61eb4d0..ab522668b174 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi @@ -532,6 +532,10 @@ status = "okay"; }; +&usb2phy { + vbus_drv-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; +}; + &usb_host0_echi { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index e6137c57359e..d66d9254308d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -322,10 +322,9 @@ status = "disabled"; }; - usb2phy { + usb2phy: usb2phy { compatible = "rockchip,rk3399-usb-phy"; rockchip,grf = <&grf>; - vbus_drv-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; #address-cells = <1>; #size-cells = <0>; -- 2.34.1