From 187b3f9e65c0a919ce47f88dba1ceeca30807570 Mon Sep 17 00:00:00 2001
From: Eberhard Stoll <eberhard.stoll@kontron.de>
Date: Wed, 3 Nov 2021 18:42:58 +0100
Subject: [PATCH] stm32mp-t1000: Sync dts with CubeMX files
- activate crc, cryp, hash, rng for M4
- remove rtc pins
- update compatibility string
---
fdts/stm32mp-som-t1000.dtsi | 4 ++++
fdts/stm32mp-t1000.dts | 2 +-
fdts/stm32mp157c-t1000-som-minimal-mx.dts | 13 +++++--------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/fdts/stm32mp-som-t1000.dtsi b/fdts/stm32mp-som-t1000.dtsi
index c515fce31..dcf47a64b 100644
--- a/fdts/stm32mp-som-t1000.dtsi
+++ b/fdts/stm32mp-som-t1000.dtsi
@@ -222,7 +222,11 @@
/*"Secured" peripherals*/
DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_UNLOCK)
/*"Mcu Isolation" peripherals*/
+ DECPROT(STM32MP1_ETZPC_CRC2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
+ DECPROT(STM32MP1_ETZPC_CRYP2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
DECPROT(STM32MP1_ETZPC_DMA2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
+ DECPROT(STM32MP1_ETZPC_HASH2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
+ DECPROT(STM32MP1_ETZPC_RNG2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
/* Restriction: following IDs are not managed - please to use User-Section if needed:
STM32MP1_ETZPC_SRAMx_ID, STM32MP1_ETZPC_RETRAM_ID, STM32MP1_ETZPC_BKPSRAM_ID*/
diff --git a/fdts/stm32mp-t1000.dts b/fdts/stm32mp-t1000.dts
index 8731c6497..b05a72559 100644
--- a/fdts/stm32mp-t1000.dts
+++ b/fdts/stm32mp-t1000.dts
@@ -34,5 +34,5 @@
/* Model identification */
/ {
model = "stm32mp-t1000 (tf-a)";
- compatible = "ex,stm32mp-t1000", "st,stm32mp157";
+ compatible = "ktn,stm32mp-t1000", "st,stm32mp157";
};
diff --git a/fdts/stm32mp157c-t1000-som-minimal-mx.dts b/fdts/stm32mp157c-t1000-som-minimal-mx.dts
index 9861b42ca..257f2d316 100644
--- a/fdts/stm32mp157c-t1000-som-minimal-mx.dts
+++ b/fdts/stm32mp157c-t1000-som-minimal-mx.dts
@@ -74,12 +74,6 @@
};
};
- rtc_pins_mx: rtc_mx-0 {
- pins {
- pinmux = <STM32_PINMUX('C', 13, ANALOG)>; /* RTC_LSCO */
- };
- };
-
sdmmc1_pins_mx: sdmmc1_mx-0 {
pins1 {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
@@ -184,6 +178,7 @@
CLK_SAI3_DISABLED
CLK_SAI4_DISABLED
CLK_RNG1_CSI
+ CLK_RNG2_CSI
CLK_LPTIM1_DISABLED
CLK_LPTIM23_DISABLED
CLK_LPTIM45_DISABLED
@@ -240,7 +235,11 @@
/*"Secured" peripherals*/
DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_UNLOCK)
/*"Mcu Isolation" peripherals*/
+ DECPROT(STM32MP1_ETZPC_CRC2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
+ DECPROT(STM32MP1_ETZPC_CRYP2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
DECPROT(STM32MP1_ETZPC_DMA2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
+ DECPROT(STM32MP1_ETZPC_HASH2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
+ DECPROT(STM32MP1_ETZPC_RNG2_ID, DECPROT_MCU_ISOLATION, DECPROT_UNLOCK)
/*Restriction: following IDs are not managed - please to use User-Section if needed:
STM32MP1_ETZPC_SRAMx_ID, STM32MP1_ETZPC_RETRAM_ID, STM32MP1_ETZPC_BKPSRAM_ID*/
@@ -292,8 +291,6 @@
};
&rtc{
- pinctrl-names = "default";
- pinctrl-0 = <&rtc_pins_mx>;
status = "okay";
secure-status = "okay";
--
GitLab