From: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Date: Wed, 17 May 2023 07:48:29 +0000 (+0200)
Subject: ARM: dts: stm32: Update Cortex-M4 reset declarations on stm32mp15
X-Git-Tag: v6.5-rc1~141^2~4^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c994fcf52284ac4cdeee1633373d69e05e30b23;p=tomoyo%2Ftomoyo-test1.git

ARM: dts: stm32: Update Cortex-M4 reset declarations on stm32mp15

Since the introduction of the SCMI for the management
of the MCU hold boot in OP-TEE, management of the hold boot by SMC call
is deprecated.
- Clean the st,syscfg-tz  which allows to determine if the trust
zone is enable.
- Add reset-names properties to be able to differentiate the MCU reset and
  the MCU HOLD BOOT.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
---

diff --git a/arch/arm/boot/dts/stm32mp151.dtsi b/arch/arm/boot/dts/stm32mp151.dtsi
index 664825418c32..a98ae58e2c1c 100644
--- a/arch/arm/boot/dts/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/stm32mp151.dtsi
@@ -1823,8 +1823,8 @@
 			      <0x30000000 0x40000>,
 			      <0x38000000 0x10000>;
 			resets = <&rcc MCU_R>;
+			reset-names = "mcu_rst";
 			st,syscfg-holdboot = <&rcc 0x10C 0x1>;
-			st,syscfg-tz = <&rcc 0x000 0x1>;
 			st,syscfg-pdds = <&pwr_mcu 0x0 0x1>;
 			st,syscfg-rsc-tbl = <&tamp 0x144 0xFFFFFFFF>;
 			st,syscfg-m4-state = <&tamp 0x148 0xFFFFFFFF>;