arm: dts: stm32: Align stm32mp15xx-*-scmi-u-boot.dtsi file

Update "secure" version of STM32 boards based on SCMI when RCC_TZCR.TZEN=1
stm32mp15xx-*-scmi-u-boot.dtsi with latest patches on files
stm32mp15xx-*-u-boot.dtsi.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
index cff3f49948e4afd4901f9826513c98008b16b466..2623cebf21a4cc1153fe3319c0583f37e7edec4c 100644 (file)
--- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
@@ -12,6 +12,7 @@
                i2c3 = &i2c4;
                usb0 = &usbotg_hs;
        };
+
        config {
                u-boot,boot-led = "heartbeat";
                u-boot,error-led = "error";

diff --git a/arch/arm/dts/stm32mp157c-dk2-scmi-u-boot.dtsi b/arch/arm/dts/stm32mp157c-dk2-scmi-u-boot.dtsi
index 5a8fc15ab2b761c32b880bb81481c974cec839e5..ae93497cd5a88656625415fbb27177daf105de72 100644 (file)
--- a/arch/arm/dts/stm32mp157c-dk2-scmi-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-dk2-scmi-u-boot.dtsi
@@ -4,3 +4,10 @@
  */
 
 #include "stm32mp157a-dk1-scmi-u-boot.dtsi"
+
+/ {
+       fwu-mdata {
+               compatible = "u-boot,fwu-mdata-gpt";
+               fwu-mdata-store = <&sdmmc1>;
+       };
+};

diff --git a/arch/arm/dts/stm32mp157c-ev1-scmi-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-scmi-u-boot.dtsi
index 71a94f9130a6f4fcd520e3500d69c2c572052e8a..eef717946b5fb77cd97ba68c2f6bab75e9a2d777 100644 (file)
--- a/arch/arm/dts/stm32mp157c-ev1-scmi-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ev1-scmi-u-boot.dtsi
@@ -14,4 +14,44 @@
                spi0 = &qspi;
                usb0 = &usbotg_hs;
        };
+
+       fwu-mdata {
+               compatible = "u-boot,fwu-mdata-gpt";
+               fwu-mdata-store = <&sdmmc1>;
+       };
+};
+
+&flash0 {
+       bootph-pre-ram;
+};
+
+&qspi {
+       bootph-pre-ram;
+};
+
+&qspi_clk_pins_a {
+       bootph-pre-ram;
+       pins {
+               bootph-pre-ram;
+       };
+};
+
+&qspi_bk1_pins_a {
+       bootph-pre-ram;
+       pins1 {
+               bootph-pre-ram;
+       };
+       pins2 {
+               bootph-pre-ram;
+       };
+};
+
+&qspi_bk2_pins_a {
+       bootph-pre-ram;
+       pins1 {
+               bootph-pre-ram;
+       };
+       pins2 {
+               bootph-pre-ram;
+       };
 };