arm64: dts: rockchip: cleanup rk3399-android.dtsi

default enable rkvdec and vpu.
rga is default on, remove duplicate configuration.

Change-Id: I8375b2202a81977238e8120e1c2d60f2130844b5
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index ecf3e93dd3c08a0f9d05b3836b60aab8c1f47da7..b83b6656616135eac64d8292480ab3f528f6ae56 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -305,10 +305,18 @@
        #sound-dai-cells = <0>;
 };
 
+&rkvdec {
+       status = "okay";
+};
+
 &usbdrd_dwc3_0 {
        dr_mode = "otg";
 };
 
+&vpu {
+       status = "okay";
+};
+
 &pinctrl {
        isp {
                cif_clkout: cif-clkout {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts
index 47cdb21c4d39d759dd067aaddb87038fe9099ee1..e2520019378c734490616a5e8fbf75b65e4262e7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android-6.0.dts
@@ -526,10 +526,6 @@
        mali-supply = <&vdd_gpu>;
 };
 
-&rga {
-       status = "okay";
-};
-
 &tsadc {
        /* tshut mode 0:CRU 1:GPIO */
        rockchip,hw-tshut-mode = <1>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi
index caabb097cacbeec66fe33e6af6aa4e8423c29697..29244ab0fa767d99ccea9824f25682d61bd23fc3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-android-6.0.dtsi
@@ -525,10 +525,6 @@
        mali-supply = <&vdd_gpu>;
 };
 
-&rga {
-       status = "okay";
-};
-
 &threshold {
        temperature = <85000>;
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index 3c2ca90d1524d7eea9e6cda51f017ecc7d291acd..f24d5f00437e26ef433efc519de33584b95e4523 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -519,10 +519,6 @@
        mali-supply = <&vdd_gpu>;
 };
 
-&rga {
-       status = "okay";
-};
-
 &threshold {
        temperature = <85000>;
 };
@@ -826,14 +822,6 @@
        pmu1830-supply = <&vcc_1v8>;
 };
 
-&vpu {
-       status = "okay";
-};
-
-&rkvdec {
-       status = "okay";
-};
-
 &rockchip_suspend {
        status = "okay";
        rockchip,sleep-debug-en = <0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts
index 55ca4d213698f585023d832f84c0952eac8740ee..0525be2fb53a8dcfc926f7b9374c2f9c72795fca 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android-edp.dts
@@ -103,10 +103,3 @@
        status = "okay";
 };
 
-&vpu {
-       status = "okay";
-};
-
-&rkvdec {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts
index 9c234e5af3bf8e88ff04f93636d3e2a9cfe377ee..16053c3bcd73ebf15a1713e21a01dbd5ca016f73 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-6.0.dts
@@ -778,10 +778,6 @@
        mali-supply = <&vdd_gpu>;
 };
 
-&rga {
-       status = "okay";
-};
-
 &spi1 {
        status = "disabled";
        max-freq = <50000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 28906815a93c1f1196662880cfc62b5c8034abb2..d7e49795dc96fbb79860c99bb5b13d4bf8d093d3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -770,14 +770,6 @@
        status = "okay";
 };
 
-&vpu {
-       status = "okay";
-};
-
-&rkvdec {
-       status = "okay";
-};
-
 &cpu_l0 {
        cpu-supply = <&vdd_cpu_l>;
 };
@@ -807,10 +799,6 @@
        mali-supply = <&vdd_gpu>;
 };
 
-&rga {
-       status = "okay";
-};
-
 &spi1 {
        status = "disabled";
        max-freq = <50000000>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
index 77f0f5d7422d759111215fbc3613537a1febf831..f76876d79f50cf3821b42df8a7450aa82ab0e2c8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
@@ -162,11 +162,3 @@
                        <0xb5   KEY_BACKSPACE>;
        };
 };
-
-&vpu {
-       status = "okay";
-};
-
-&rkvdec {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
index af567a089595e47f3cea8e864b1127fe96093e7d..d4d609f3449f4e70beaff4d7000819e3853738c9 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
@@ -120,11 +120,3 @@
 &route_edp {
        status = "okay";
 };
-
-&vpu {
-       status = "okay";
-};
-
-&rkvdec {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
index a9acf0bcbd2873d6d7d954f0304c0ca30dc60b56..a87119543322aa0e9927cc73ff6fc61ad4f7b657 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
@@ -859,19 +859,11 @@
        status = "okay";
 };
 
-&rkvdec {
-       status = "okay";
-};
-
 &route_edp {
        status = "okay";
        logo,mode = "center";
 };
 
-&rga {
-       status = "okay";
-};
-
 &saradc {
        status = "okay";
 };
@@ -1017,10 +1009,6 @@
        status = "okay";
 };
 
-&vpu {
-       status = "okay";
-};
-
 &pinctrl {
        sdio-pwrseq {
                wifi_enable_h: wifi-enable-h {