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 <dianders@chromium.org>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tb.dtsi
index d21bc61eb4d081f06a1296b29c483813a3ea3e72..ab522668b17459cdd30c392fe96ae75a8872a148 100644 (file)
--- 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 e6137c57359e9b9ab3d460282d7cec6c47fee3e6..d66d9254308d132a54c64c521c45e9e800db9c8e 100644 (file)
--- 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>;