[PATCH 0/3] ARM/arm64: dts: stm32: align watchdog DT support accross STM32MP15 platforms

[PATCH 0/3] ARM/arm64: dts: stm32: align watchdog DT support accross STM32MP15 platforms

[Antonio Borneo]

This series updates STM32MP watchdog DT descriptions to keep them aligned
with the actual secure/non-secure watchdog integration used on each
platform family.

Two watchdog access models are used:
- On ST STM32MP15 non-SCMI boards, IWDG1 is exposed as a non-secure
  watchdog. In that case Linux must register the watchdog device and keep
  it pinged once it has been started by the boot chain.
- On ST SCMI-based STM32MP15 boards, the watchdog is handled through
  secure world services and exposed to Linux through the ARM SMC watchdog
  interface.


Amelie Delaunay (2):
  ARM: dts: stm32: enable iwdg1 on STM32MP15 ST boards
  ARM: dts: stm32: enable ARM SMC watchdog on STM32MP15 SCMI boards

Antonio Borneo (1):
  ARM: dts: stm32: move ARM SMC watchdog to STM32MP151 SoC

 arch/arm/boot/dts/st/stm32mp15-scmi.dtsi       |  4 ++++
 arch/arm/boot/dts/st/stm32mp151.dtsi           | 15 +++++++++++++++
 arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts  |  5 +++++
 arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts  |  5 +++++
 arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts  |  5 +++++
 arch/arm/boot/dts/st/stm32mp157c-ed1.dts       |  5 +++++
 arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts  |  5 +++++
 arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi |  7 -------
 arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi      |  5 +++++
 9 files changed, 49 insertions(+), 7 deletions(-)


base-commit: f831584128ac2a36fb4fa62fe106793d08c2dbf1
-- 
2.34.1

[PATCH 1/3] ARM: dts: stm32: enable iwdg1 on STM32MP15 ST boards

[Antonio Borneo]

From: Amelie Delaunay <amelie.delaunay@foss.st.com>

On ST STM32MP15 boards where IWDG1 is exposed as a non-secure watchdog,
Linux must register and periodically ping it once started by the
boot chain. Add the missing IWDG1 DT node to the STM32MP151 SoC device
tree and enable it on ST non-SCMI boards that use the non-secure
watchdog configuration.

Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
Signed-off-by: Antonio Borneo <antonio.borneo@foss.st.com>
---
 arch/arm/boot/dts/st/stm32mp15-scmi.dtsi  | 4 ++++
 arch/arm/boot/dts/st/stm32mp151.dtsi      | 9 +++++++++
 arch/arm/boot/dts/st/stm32mp157c-ed1.dts  | 5 +++++
 arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 5 +++++
 4 files changed, 23 insertions(+)

diff --git a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
index 98552fe45d4e0..cc9521b105262 100644
--- a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
@@ -64,6 +64,10 @@ scmi_usb33: regulator@2 {
 	};
 };
 
+&iwdg1 {
+	status = "disabled";
+};
+
 &reg11 {
 	status = "disabled";
 };
diff --git a/arch/arm/boot/dts/st/stm32mp151.dtsi b/arch/arm/boot/dts/st/stm32mp151.dtsi
index e7fec8b49ae16..25f111c8aa7a4 100644
--- a/arch/arm/boot/dts/st/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp151.dtsi
@@ -570,6 +570,15 @@ usbphyc_port1: usb-phy@1 {
 			};
 		};
 
+		iwdg1: watchdog@5c003000 {
+			compatible = "st,stm32mp1-iwdg";
+			reg = <0x5c003000 0x400>;
+			interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&rcc IWDG1>, <&rcc CK_LSI>;
+			clock-names = "pclk", "lsi";
+			status = "disabled";
+		};
+
 		rtc: rtc@5c004000 {
 			compatible = "st,stm32mp1-rtc";
 			reg = <0x5c004000 0x400>;
diff --git a/arch/arm/boot/dts/st/stm32mp157c-ed1.dts b/arch/arm/boot/dts/st/stm32mp157c-ed1.dts
index 49dd555cc228c..dfe726b481629 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ed1.dts
@@ -331,6 +331,11 @@ &ipcc {
 	status = "okay";
 };
 
+&iwdg1 {
+	timeout-sec = <32>;
+	status = "okay";
+};
+
 &iwdg2 {
 	timeout-sec = <32>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
index 1a07ae09afb2a..e8e75e59f4c98 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
@@ -511,6 +511,11 @@ &ipcc {
 	status = "okay";
 };
 
+&iwdg1 {
+	timeout-sec = <32>;
+	status = "okay";
+};
+
 &iwdg2 {
 	timeout-sec = <32>;
 	status = "okay";
-- 
2.34.1

[PATCH 2/3] ARM: dts: stm32: move ARM SMC watchdog to STM32MP151 SoC

[Antonio Borneo]

All the boards where IWDG1 is secured and monitored through OP-TEE
require Linux to control the secure watchdog through SMC calls.

Move the node arm,smc-wdt in the SoC file.

Signed-off-by: Antonio Borneo <antonio.borneo@foss.st.com>
---
 arch/arm/boot/dts/st/stm32mp151.dtsi           | 6 ++++++
 arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/st/stm32mp151.dtsi b/arch/arm/boot/dts/st/stm32mp151.dtsi
index 25f111c8aa7a4..f0b8c8f617bc5 100644
--- a/arch/arm/boot/dts/st/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp151.dtsi
@@ -31,6 +31,12 @@ arm-pmu {
 		interrupt-parent = <&intc>;
 	};
 
+	arm_wdt: watchdog {
+		compatible = "arm,smc-wdt";
+		arm,smc-id = <0xbc000000>;
+		status = "disabled";
+	};
+
 	psci {
 		compatible = "arm,psci-1.0";
 		method = "smc";
diff --git a/arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi b/arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi
index 172347769e025..27ea5e79efc66 100644
--- a/arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi
@@ -13,13 +13,6 @@ optee@de000000 {
 			no-map;
 		};
 	};
-
-	arm_wdt: watchdog {
-		compatible = "arm,smc-wdt";
-		arm,smc-id = <0xbc000000>;
-		status = "disabled";
-	};
-
 };
 
 &adc {
-- 
2.34.1

[PATCH 3/3] ARM: dts: stm32: enable ARM SMC watchdog on STM32MP15 SCMI boards

[Antonio Borneo]

From: Amelie Delaunay <amelie.delaunay@foss.st.com>

On STM32MP15 SCMI boards, IWDG1 is secured and monitored through
OP-TEE.
Enable the arm,smc-wdt node on ST SCMI board variants so Linux can
control the secure watchdog through SMC calls.

Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
Signed-off-by: Antonio Borneo <antonio.borneo@foss.st.com>
---
 arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 5 +++++
 arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 5 +++++
 arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 5 +++++
 arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
index 53e40e2f776b7..345c5694abf50 100644
--- a/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
@@ -21,6 +21,11 @@ optee@de000000 {
 	};
 };
 
+&arm_wdt {
+	timeout-sec = <32>;
+	status = "okay";
+};
+
 &cpu0 {
 	clocks = <&scmi_clk CK_SCMI_MPU>;
 };
diff --git a/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts b/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
index 0790ed426ebc0..8e32fa89c8a1b 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
@@ -21,6 +21,11 @@ optee@de000000 {
 	};
 };
 
+&arm_wdt {
+	timeout-sec = <32>;
+	status = "okay";
+};
+
 &cpu0 {
 	clocks = <&scmi_clk CK_SCMI_MPU>;
 };
diff --git a/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
index 0a3894aff4aea..ac4d411005032 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
@@ -21,6 +21,11 @@ optee@fe000000 {
 	};
 };
 
+&arm_wdt {
+	timeout-sec = <32>;
+	status = "okay";
+};
+
 &cpu0 {
 	clocks = <&scmi_clk CK_SCMI_MPU>;
 };
diff --git a/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts b/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
index c2b6efb1cbb74..6b26d87f7edef 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
@@ -21,6 +21,11 @@ optee@fe000000 {
 	};
 };
 
+&arm_wdt {
+	timeout-sec = <32>;
+	status = "okay";
+};
+
 &cpu0 {
 	clocks = <&scmi_clk CK_SCMI_MPU>;
 };
-- 
2.34.1

Re: [PATCH 0/3] ARM/arm64: dts: stm32: align watchdog DT support accross STM32MP15 platforms

[Antonio Borneo]

On Wed, 2026-10-07 at 17:13 +0200, Antonio Borneo wrote:
> This series updates STM32MP watchdog DT descriptions to keep them aligned
> with the actual secure/non-secure watchdog integration used on each
> platform family.
> 
> Two watchdog access models are used:
> - On ST STM32MP15 non-SCMI boards, IWDG1 is exposed as a non-secure
>   watchdog. In that case Linux must register the watchdog device and keep
>   it pinged once it has been started by the boot chain.
> - On ST SCMI-based STM32MP15 boards, the watchdog is handled through
>   secure world services and exposed to Linux through the ARM SMC watchdog
>   interface.
> 
> 
> Amelie Delaunay (2):
>   ARM: dts: stm32: enable iwdg1 on STM32MP15 ST boards
>   ARM: dts: stm32: enable ARM SMC watchdog on STM32MP15 SCMI boards
> 
> Antonio Borneo (1):
>   ARM: dts: stm32: move ARM SMC watchdog to STM32MP151 SoC
> 
>  arch/arm/boot/dts/st/stm32mp15-scmi.dtsi       |  4 ++++
>  arch/arm/boot/dts/st/stm32mp151.dtsi           | 15 +++++++++++++++
>  arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts  |  5 +++++
>  arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts  |  5 +++++
>  arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts  |  5 +++++
>  arch/arm/boot/dts/st/stm32mp157c-ed1.dts       |  5 +++++
>  arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts  |  5 +++++
>  arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi |  7 -------
>  arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi      |  5 +++++
>  9 files changed, 49 insertions(+), 7 deletions(-)
> 
> 
> base-commit: f831584128ac2a36fb4fa62fe106793d08c2dbf1

Please discard this series. I will send a V2 asap.

Sorry for the noise!

Antonio Borneo