arm64: dts: rockchip: keep vbus always on for usb2.0 host of rk3399

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-evb.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index 48e3ba577ceebf46c8343e087d2d2503321aff30..759babc4d468cd3f305ba2dbf384eb009c402373 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -42,6 +42,7 @@
 
 #include <dt-bindings/pwm/pwm.h>
 #include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
 
 / {
        compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
@@ -62,6 +63,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "vcc5v0_host";
+               regulator-always-on;
        };
 
        backlight: backlight {
@@ -117,23 +119,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
-       pmu-io-domains {
-               compatible = "rockchip,rk3399-pmu-io-voltage-domain";
-               rockchip,grf = <&pmugrf>;
-
-               pmu1830-supply = <&vcc1v8_pmu>;
-       };
-
        es8316-sound {
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
@@ -320,38 +305,6 @@
        downdifferential = <40>;
 };
 
-&dmc_opp_table {
-       opp00 {
-               opp-hz = /bits/ 64 <200000000>;
-               opp-microvolt = <900000>;
-       };
-       opp01 {
-               opp-hz = /bits/ 64 <300000000>;
-               opp-microvolt = <900000>;
-       };
-       opp02 {
-               opp-hz = /bits/ 64 <400000000>;
-               opp-microvolt = <900000>;
-       };
-       opp03 {
-               opp-hz = /bits/ 64 <528000000>;
-               opp-microvolt = <900000>;
-       };
-       opp04 {
-               opp-hz = /bits/ 64 <600000000>;
-               opp-microvolt = <900000>;
-       };
-       opp05 {
-               opp-hz = /bits/ 64 <666000000>;
-               opp-microvolt = <900000>;
-               opp-suspend;
-       };
-       opp06 {
-               opp-hz = /bits/ 64 <800000000>;
-               opp-microvolt = <900000>;
-       };
-};
-
 &sdhci {
        bus-width = <8>;
        mmc-hs400-1_8v;
@@ -426,6 +379,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &pcie_phy {
        status = "disabled";
 };
@@ -600,3 +562,17 @@
                };
        };
 };
+
+&pvtm {
+       status = "okay";
+};
+
+&pmu_pvtm {
+       status = "okay";
+};
+
+&pmu_io_domains {
+       status = "okay";
+       pmu1830-supply = <&vcc1v8_pmu>;
+};
+