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

@@ -24,6 +24,11 @@ fiq-debugger {
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 
 	reserved-memory {

arch/arm64/boot/dts/rockchip/rk1808.dtsi

@@ -240,14 +240,6 @@ soc-bus4 {
 		};
 	};
 
-	firmware {
-		optee: optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-			status = "disabled";
-		};
-	};
-
 	gmac_clkin: external-gmac-clock {
 		compatible = "fixed-clock";
 		clock-frequency = <125000000>;

arch/arm64/boot/dts/rockchip/rk3328-android.dtsi

@@ -23,6 +23,11 @@ fiq-debugger {
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 
 	reserved-memory {

arch/arm64/boot/dts/rockchip/rk3368-android.dtsi

@@ -99,6 +99,11 @@ system-heap {
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 
 	rga@ff920000 {

arch/arm64/boot/dts/rockchip/rk3399-android.dtsi

@@ -135,6 +135,11 @@ hdmi_dp_sound: hdmi-dp-sound {
 
 	firmware {
 		firmware_android: android {};
+
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
 	};
 };
 

arch/arm64/boot/dts/rockchip/rk3568-android.dtsi

@@ -29,6 +29,13 @@ fiq-debugger {
 		status = "okay";
 	};
 
+	firmware {
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
+
 	debug: debug@fd904000 {
 		compatible = "rockchip,debug";
 		reg = <0x0 0xfd904000 0x0 0x1000>,

arch/arm64/boot/dts/rockchip/rk3568.dtsi

@@ -266,11 +266,6 @@ route_rgb: route-rgb {
 	};
 
 	firmware {
-		optee: optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-
 		scmi: scmi {
 			compatible = "arm,scmi-smc";
 			shmem = <&scmi_shmem>;

arch/arm64/boot/dts/rockchip/rk3588-android.dtsi

@@ -22,6 +22,13 @@ fiq-debugger {
 		status = "okay";
 	};
 
+	firmware {
+		optee: optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
+
 	debug: debug@81004000 {
 		compatible = "rockchip,debug";
 		reg = <0x0 0x81004000 0x0 0x1000>,

arch/arm64/boot/dts/rockchip/rk3588s.dtsi

@@ -162,11 +162,6 @@ display_subsystem: display-subsystem {
 	};
 
 	firmware {
-		optee: optee {
-			compatible = "linaro,optee-tz";
-			method = "smc";
-		};
-
 		scmi: scmi {
 			compatible = "arm,scmi-smc";
 			shmem = <&scmi_shmem>;