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/20200317.014342~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F227800%2F1;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-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
index 9482f54cbd08..9811f7295209 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#ifdef RPI364
+#ifdef RPI364_OPTEE
 /memreserve/ 0x08000000 0x02000000;
 #endif
 
diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
index 10a2a4949f4c..362156298e80 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/ 0x08000000 0x02000000;
 #endif
 
diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
index 59d66fa63e9e..e8454ed4a6fe 100644
--- a/arch/arm/boot/dts/bcm2710.dtsi
+++ b/arch/arm/boot/dts/bcm2710.dtsi
@@ -27,7 +27,7 @@
 		       <&cpu3>, "clock-frequency:0";
 	};
 
-#ifdef RPI364
+#ifdef RPI364_OPTEE
 	firmware {
 		optee {
 			compatible = "linaro,optee-tz";
@@ -42,6 +42,7 @@
 #endif
 };
 
+#ifdef RPI364_OPTEE
 &cpu0 {
 	enable-method = "psci";
 };
@@ -57,3 +58,4 @@
 &cpu3 {
 	enable-method = "psci";
 };
+#endif