From: Seung-Woo Kim <sw0312.kim@samsung.com>
Date: Mon, 16 Mar 2020 10:06:53 +0000 (+0900)
Subject: ARM: dts: bcm2710-rpi-3: Change build macro for optee
X-Git-Tag: submit/tizen_4.0/20200317.043751~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acb31af520456b5d75761505800c543ca8523f47;p=platform%2Fkernel%2Flinux-rpi3.git

ARM: dts: bcm2710-rpi-3: Change build macro for optee

Now, Tizen does not support optee by default. Change build macro
for optee related nodes in default case.

Change-Id: Ib925414ba6fd96099ca984cc8b665263812b9538
Ref: https://bugs.tizen.org/browse/TRE-2318
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
index f5277e10f7cb..cdd87668d649 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#ifdef RPI364
+#ifdef RPI364_OPTEE
 /memreserve/ 0x00000000 0x00001000;
 /memreserve/ 0x08000000 0x02000000;
 #endif
diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
index a15932a4e2ee..5cac3e42bd22 100644
--- a/arch/arm/boot/dts/bcm2710.dtsi
+++ b/arch/arm/boot/dts/bcm2710.dtsi
@@ -50,6 +50,7 @@
 	};
 
 #ifdef RPI364
+#ifdef RPI364_OPTEE
 	firmware {
 		optee {
 			compatible = "linaro,optee-tz";
@@ -61,6 +62,7 @@
 		compatible = "arm,psci-0.2";
 		method = "smc";
 	};
+#endif
 
 	cpus: cpus {
 		#address-cells = <1>;
@@ -78,7 +80,12 @@
 			compatible = "arm,cortex-a53", "arm,armv8";
 			reg = <0x1>;
 			clock-frequency = <1200000000>;
+#ifdef RPI364_OPTEE
 			enable-method = "psci";
+#else
+			enable-method = "spin-table";
+			cpu-release-addr = <0x0 0x000000e0>;
+#endif
 		};
 
 		v8_cpu2: cpu@2 {
@@ -86,7 +93,12 @@
 			compatible = "arm,cortex-a53", "arm,armv8";
 			reg = <0x2>;
 			clock-frequency = <1200000000>;
+#ifdef RPI364_OPTEE
 			enable-method = "psci";
+#else
+			enable-method = "spin-table";
+			cpu-release-addr = <0x0 0x000000e8>;
+#endif
 		};
 
 		v8_cpu3: cpu@3 {
@@ -94,7 +106,12 @@
 			compatible = "arm,cortex-a53", "arm,armv8";
 			reg = <0x3>;
 			clock-frequency = <1200000000>;
+#ifdef RPI364_OPTEE
 			enable-method = "psci";
+#else
+			enable-method = "spin-table";
+			cpu-release-addr = <0x0 0x000000f0>;
+#endif
 		};
 	};