rockchip: dts: rk3328-evb: Move vcc5v0-host-xhci-drv to -u-boot.dtsi

USB 3.0 is only supported in U-boot, not in the Linux kernel where the
device tree files are ultimately synced from. While the xhci node was
moved, the external vbus regulator was not.

Move it as well.

Fixes: 2e91e2025c1b ("rockchip: rk3328: migrate u-boot node to -u-boot.dtsi")
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Tested-by: Loic Devulder <ldevulder@suse.com>
Tested-by: Peter Geis <pgwipeout@gmail.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi
index 4a82706..5679897 100644 (file)
--- a/arch/arm/dts/rk3328-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi
@@ -6,6 +6,17 @@
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-ddr3-666.dtsi"
 
+/{
+       vcc5v0_host_xhci: vcc5v0-host-xhci-drv {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>;
+               regulator-name = "vcc5v0_host_xhci";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+       };
+};
+
 &usb_host0_xhci {
        vbus-supply = <&vcc5v0_host_xhci>;
        status = "okay";

diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts
index a2ee838..e9bc849 100644 (file)
--- a/arch/arm/dts/rk3328-evb.dts
+++ b/arch/arm/dts/rk3328-evb.dts
@@ -38,15 +38,6 @@
                regulator-max-microvolt = <5000000>;
        };
 
-       vcc5v0_host_xhci: vcc5v0-host-xhci-drv {
-               compatible = "regulator-fixed";
-               enable-active-high;
-               regulator-name = "vcc5v0_host_xhci";
-               gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>;
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-       };
-
        vcc_phy: vcc-phy-regulator {
                compatible = "regulator-fixed";
                regulator-name = "vcc_phy";