From a791135553d0e4aa022f573ab3340745a3fbe4ee Mon Sep 17 00:00:00 2001
From: Algea Cao <algea.cao@rock-chips.com>
Date: Mon, 8 Nov 2021 15:04:30 +0800
Subject: [PATCH] arm64: dts: rockchip: Enable rk3588s/rk3588 evb vop

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie4f47461f3c135a21da17f2af5fda7df4dc0d91f
---
 arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi  | 8 ++++++++
 arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi | 8 ++++++++
 arch/arm64/boot/dts/rockchip/rk3588s.dtsi     | 3 +++
 3 files changed, 19 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
index cf5e5accc5e3..335254f64672 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi
@@ -975,3 +975,11 @@
 &usbdrd_dwc3_1 {
 	status = "okay";
 };
+
+&vop {
+	status = "okay";
+};
+
+&vop_mmu {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
index 55f1ed6722f6..cc6d4204eb14 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
@@ -947,3 +947,11 @@
 &usbhost_dwc3_0 {
 	status = "okay";
 };
+
+&vop {
+	status = "okay";
+};
+
+&vop_mmu {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 77bff22ad43c..ccaa50cf4d76 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -1262,6 +1262,9 @@
 			      "dclk_vp3";
 		iommus = <&vop_mmu>;
 		power-domains = <&power RK3588_PD_VOP>;
+		rockchip,grf = <&sys_grf>;
+		rockchip,vop-grf = <&vop_grf>;
+		rockchip,vo1-grf = <&vo1_grf>;
 		status = "disabled";
 
 		vop_out: ports {