From 688e13588ae54c2c87096ba1fadea3b0d94f34cc Mon Sep 17 00:00:00 2001
From: Etienne Carriere <etienne.carriere@linaro.org>
Date: Tue, 27 Apr 2021 17:32:29 +0200
Subject: [PATCH] arm: dts: define OP-TEE resources for STM32MP1 ED1 and EV1

This change fixes EV1 configuration which lacked OP-TEE
reserved memory. This change also makes ED1 board ready
the host OP-TEE by enabling OP-TEE node and defining the
OP-TEE reserved memory for that board. This change defines
these resources in ED1 DTS file which is included in EV1 DTS
file.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
[jf: rebase onto v5.17]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
---
 arch/arm/boot/dts/stm32mp157c-ed1.dts | 9 +++++++++
 arch/arm/boot/dts/stm32mp157c-ev1.dts | 4 ----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 46b471d09c50c4..0242aab94b3634 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -70,6 +70,11 @@
 			reg = <0xe8000000 0x8000000>;
 			no-map;
 		};
+
+		optee_memory: optee@fe000000 {
+			reg = <0xfe000000 0x2000000>;
+			no-map;
+		};
 	};
 
 	aliases {
@@ -320,6 +325,10 @@
 	status = "okay";
 };
 
+&optee {
+	status = "okay";
+};
+
 &pwr_regulators {
 	vdd-supply = <&vdd>;
 	vdd_3v3_usbfs-supply = <&vdd_usb>;
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index d5d6d0e52db31d..e222d2d2cb4496 100644
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -397,7 +397,3 @@
 	st,tune-hs-rx-offset = <2>;
 	st,no-lsfs-sc;
 };
-
-&optee {
-	status = "okay";
-};