From 9855e0c16e5c8383d3af0200b17df3293c02606c Mon Sep 17 00:00:00 2001
From: Caesar Wang <wxt@rock-chips.com>
Date: Thu, 7 May 2020 14:39:05 +0800
Subject: [PATCH] arm64: dts: rockchip: update vcodec dts for rk3399 linux

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I9ce2b1322c0c7b5d1f2a52eb164366e1c084c6e2
---
 .../rockchip/rk3399-evb-ind-lpddr4-linux.dts  |  8 -----
 .../arm64/boot/dts/rockchip/rk3399-linux.dtsi | 29 ++++++++++++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
index 89d06fa0cd12..37ad6a62941b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-linux.dts
@@ -175,14 +175,6 @@
 	status = "okay";
 };
 
-&iep {
-	status = "okay";
-};
-
-&iep_mmu {
-	status = "okay";
-};
-
 &mipi_dphy_rx0 {
 	status = "okay";
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
index b1361da6c5fe..531c5597519e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
@@ -152,19 +152,34 @@
 	};
 };
 
-/* HACK: keep MALI version on linux */
-&gpu_power_model {
-	// for DDK r14.
-	voltage = <900>;
-	frequency = <500>;
-	static-power = <300>;
-	dynamic-power = <396>;
+&iep {
+	status = "okay";
+};
+
+&iep_mmu {
+	status = "okay";
+};
+
+&mpp_srv {
+	status = "okay";
 };
 
 &pvtm {
 	status = "okay";
 };
 
+&vdpu {
+	status = "okay";
+};
+
+&vepu {
+	status = "okay";
+};
+
+&vpu_mmu {
+	status = "okay";
+};
+
 &pinctrl {
 	isp {
 		cif_clkout: cif-clkout {