summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeung-Woo Kim <sw0312.kim@samsung.com>2020-03-16 19:06:53 +0900
committerSeung-Woo Kim <sw0312.kim@samsung.com>2020-03-16 19:46:12 +0900
commit7b5d8cdf1d0a99fb385677c15bbaa9851f7ac6d9 (patch)
treeb4f0b848aa511a7a14f075f6a6bdaab6456ef0e1
parentc88150b76a8cad111d2c6bcd0400c0e004627ee4 (diff)
downloadlinux-rpi3-7b5d8cdf1d0a99fb385677c15bbaa9851f7ac6d9.tar.gz
linux-rpi3-7b5d8cdf1d0a99fb385677c15bbaa9851f7ac6d9.tar.bz2
linux-rpi3-7b5d8cdf1d0a99fb385677c15bbaa9851f7ac6d9.zip
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>
-rw-r--r--arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts2
-rw-r--r--arch/arm/boot/dts/bcm2710-rpi-3-b.dts2
-rw-r--r--arch/arm/boot/dts/bcm2710.dtsi4
3 files changed, 5 insertions, 3 deletions
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