From ee212c73066babb4ca2f3f7003e0d54b2fbf2465 Mon Sep 17 00:00:00 2001
From: Ding Wei <leo.ding@rock-chips.com>
Date: Tue, 28 Dec 2021 09:53:43 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3588: Enable rkvdec2 refer nodes for
 evb/nvr

Change-Id: I80ad52cc975796f79c96f24a2b4958c3427461ec
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
---
 arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi  | 12 ++++++
 .../rk3588-nvr-demo-v10-ipc-4x-linux.dts      | 12 ++++++
 arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi  | 12 ++++++
 arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi | 16 ++++++--
 .../boot/dts/rockchip/rk3588s-tablet.dtsi     | 40 +++++++++++++++++++
 5 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
index 73330d259f61..d54c8626922a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
@@ -953,6 +953,10 @@
 	status = "okay";
 };
 
+&rkvdec_ccu {
+	status = "okay";
+};
+
 &rkvdec0 {
 	status = "okay";
 };
@@ -961,6 +965,14 @@
 	status = "okay";
 };
 
+&rkvdec1 {
+	status = "okay";
+};
+
+&rkvdec1_mmu {
+	status = "okay";
+};
+
 &rkvenc_ccu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo-v10-ipc-4x-linux.dts b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo-v10-ipc-4x-linux.dts
index 687a22a6fe71..beedd6358ba9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo-v10-ipc-4x-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo-v10-ipc-4x-linux.dts
@@ -132,6 +132,10 @@
 	status = "disabled";
 };
 
+&rkvdec_ccu {
+	status = "disabled";
+};
+
 &rkvdec0 {
 	status = "disabled";
 };
@@ -140,6 +144,14 @@
 	status = "disabled";
 };
 
+&rkvdec1 {
+	status = "disabled";
+};
+
+&rkvdec1_mmu {
+	status = "disabled";
+};
+
 &sata0 {
 	status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi
index 15a0f8d90ec6..ab9063d70df7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi
@@ -197,6 +197,10 @@
 	status = "okay";
 };
 
+&rkvdec_ccu {
+	status = "okay";
+};
+
 &rkvdec0 {
 	status = "okay";
 };
@@ -205,6 +209,14 @@
 	status = "okay";
 };
 
+&rkvdec1 {
+	status = "okay";
+};
+
+&rkvdec1_mmu {
+	status = "okay";
+};
+
 &rkvenc_ccu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
index 5cc1bbf24214..00e256eefada 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
@@ -918,10 +918,6 @@
 	status = "okay";
 };
 
-&rkvdec_ccu {
-	status = "okay";
-};
-
 &rga3_core0 {
 	status = "okay";
 };
@@ -952,6 +948,10 @@
 	status = "okay";
 };
 
+&rkvdec_ccu {
+	status = "okay";
+};
+
 &rkvdec0 {
 	status = "okay";
 };
@@ -960,6 +960,14 @@
 	status = "okay";
 };
 
+&rkvdec1 {
+	status = "okay";
+};
+
+&rkvdec1_mmu {
+	status = "okay";
+};
+
 &rkvenc_ccu {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi
index 5ce908e99c4d..ea6afb1e1202 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi
@@ -759,6 +759,10 @@
 	status = "okay";
 };
 
+&jpege_ccu {
+	status = "okay";
+};
+
 &jpege0 {
 	status = "okay";
 };
@@ -767,6 +771,30 @@
 	status = "okay";
 };
 
+&jpege1 {
+	status = "okay";
+};
+
+&jpege1_mmu {
+	status = "okay";
+};
+
+&jpege2 {
+	status = "okay";
+};
+
+&jpege2_mmu {
+	status = "okay";
+};
+
+&jpege3 {
+	status = "okay";
+};
+
+&jpege3_mmu {
+	status = "okay";
+};
+
 &mpp_srv {
 	status = "okay";
 };
@@ -973,6 +1001,10 @@
 	status = "okay";
 };
 
+&rkvdec_ccu {
+	status = "okay";
+};
+
 &rkvdec0 {
 	status = "okay";
 };
@@ -981,6 +1013,14 @@
 	status = "okay";
 };
 
+&rkvdec1 {
+	status = "okay";
+};
+
+&rkvdec1_mmu {
+	status = "okay";
+};
+
 &rkvenc_ccu {
 	status = "okay";
 };