From a42bf32b0899192ae16b92664583bd0a32938735 Mon Sep 17 00:00:00 2001
From: Elon Zhang <zhangzj@rock-chips.com>
Date: Wed, 13 Oct 2021 15:31:24 +0800
Subject: [PATCH] arm64: dts: rockchip: add optee node

Remove default optee node in SoC core devicetree because optee
is not an inherent component in SoC.

Add optee node to supply OP-TEE required properties for Android
products which need OP-TEE enable default.

Change-Id: I0754a3498c5e6d7b7db57bb35c42c3875afd27c9
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
---
 arch/arm64/boot/dts/rockchip/px30-android.dtsi   | 5 +++++
 arch/arm64/boot/dts/rockchip/rk1808.dtsi         | 8 --------
 arch/arm64/boot/dts/rockchip/rk3328-android.dtsi | 5 +++++
 arch/arm64/boot/dts/rockchip/rk3368-android.dtsi | 5 +++++
 arch/arm64/boot/dts/rockchip/rk3399-android.dtsi | 5 +++++
 arch/arm64/boot/dts/rockchip/rk3568-android.dtsi | 7 +++++++
 arch/arm64/boot/dts/rockchip/rk3568.dtsi         | 5 -----
 arch/arm64/boot/dts/rockchip/rk3588-android.dtsi | 7 +++++++
 arch/arm64/boot/dts/rockchip/rk3588s.dtsi        | 5 -----
 9 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi
index aecb6344f01f..45ec392075d6 100644
--- a/arch/arm64/boot/dts/rockchip/px30-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi
@@ -24,6 +24,11 @@
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 
 	reserved-memory {
diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi
index 3469abac4f34..16d8fabe20f2 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi
@@ -240,14 +240,6 @@
 		};
 	};
 
-	firmware {
-		optee: optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-			status = "disabled";
-		};
-	};
-
 	gmac_clkin: external-gmac-clock {
 		compatible = "fixed-clock";
 		clock-frequency = <125000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi
index 809b6501b78f..73327ed01a80 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328-android.dtsi
@@ -23,6 +23,11 @@
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 
 	reserved-memory {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
index a3e0bbaaf7c5..6586b425520c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
@@ -99,6 +99,11 @@
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 
 	rga@ff920000 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index 76227dff8f9c..ad2a96b9daf4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -135,6 +135,11 @@
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi
index 55a1716dc569..157149476839 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-android.dtsi
@@ -29,6 +29,13 @@
 		status = "okay";
 	};
 
+	firmware {
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
+
 	debug: debug@fd904000 {
 		compatible = "rockchip,debug";
 		reg = <0x0 0xfd904000 0x0 0x1000>,
diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
index 2b912e8e959c..88f427c85487 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
@@ -266,11 +266,6 @@
 	};
 
 	firmware {
-		optee: optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-
 		scmi: scmi {
 			compatible = "arm,scmi-smc";
 			shmem = <&scmi_shmem>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-android.dtsi
index 6a5d66fcb991..78a08c001702 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-android.dtsi
@@ -22,6 +22,13 @@
 		status = "okay";
 	};
 
+	firmware {
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
+
 	debug: debug@81004000 {
 		compatible = "rockchip,debug";
 		reg = <0x0 0x81004000 0x0 0x1000>,
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 442939f37d6c..6bf4ff56f8f0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -162,11 +162,6 @@
 	};
 
 	firmware {
-		optee: optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-
 		scmi: scmi {
 			compatible = "arm,scmi-smc";
 			shmem = <&scmi_shmem>;