arm64: dts: rk3368-android: enable rga

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
index 2ec56b0a2ccbe4f874a77a663c7cbe9bffd6a858..90219c3e2c4af3373b52b970387408773e5620b4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
@@ -44,7 +44,7 @@
 #include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/sensor-dev.h>
 #include "rk3399.dtsi"
-#include "rk3399-android.dtsi"
+#include "rk3399-android-6.0.dtsi"
 #include "rk3399-opp.dtsi"
 
 / {
@@ -53,7 +53,7 @@
 
        vdd_log: vdd-log {
                compatible = "pwm-regulator";
-               pwms = <&pwm2 0 25000 0>;
+               pwms = <&pwm2 0 25000 1>;
                rockchip,pwm_id= <2>;
                rockchip,pwm_voltage = <900000>;
                regulator-name = "vdd_log";
@@ -98,22 +98,6 @@
                };
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_s3>;
-               audio-supply = <&vcc1v8_s3>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc1v8_s3>;
-       };
-
-       pmu-io-domains {
-               compatible = "rockchip,rk3399-pmu-io-voltage-domain";
-               rockchip,grf = <&pmugrf>;
-               pmu1830-supply = <&vcc_1v8>;
-       };
-
        dw_hdmi_audio: dw-hdmi-audio {
                status = "okay";
                compatible = "rockchip,dw-hdmi-audio";
@@ -517,6 +501,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_s3>;
+       audio-supply = <&vcc1v8_s3>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc1v8_s3>;
+};
+
 &threshold {
        temperature = <85000>; /* millicelsius */
 };
@@ -684,6 +677,11 @@
        mali-supply = <&vdd_gpu>;
 };
 
+&pmu_io_domains {
+       status = "okay";
+       pmu1830-supply = <&vcc_1v8>;
+};
+
 &pinctrl {
        sdio-pwrseq {
                wifi_enable_h: wifi-enable-h {