From 56b39ef00a20889ac386911be76608fbe463f094 Mon Sep 17 00:00:00 2001 From: Alice Guo Date: Mon, 2 Mar 2026 13:20:10 +0800 Subject: [PATCH] arm: imx9: Keep WDG3/WDG4 untouched for i.MX952 On i.MX952, WDG3 and WDG4 are not used for system reset. PSCI is used instead. Keep WDG3 and WDG4 in their default state rather than explicitly disabling them. Signed-off-by: Alice Guo --- arch/arm/mach-imx/imx9/scmi/soc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx9/scmi/soc.c b/arch/arm/mach-imx/imx9/scmi/soc.c index d426206215d..fbee435786c 100644 --- a/arch/arm/mach-imx/imx9/scmi/soc.c +++ b/arch/arm/mach-imx/imx9/scmi/soc.c @@ -786,8 +786,10 @@ static void gpio_reset(ulong gpio_base) int arch_cpu_init(void) { if (IS_ENABLED(CONFIG_SPL_BUILD)) { - disable_wdog((void __iomem *)WDG3_BASE_ADDR); - disable_wdog((void __iomem *)WDG4_BASE_ADDR); + if (!IS_ENABLED(CONFIG_IMX952)) { + disable_wdog((void __iomem *)WDG3_BASE_ADDR); + disable_wdog((void __iomem *)WDG4_BASE_ADDR); + } gpio_reset(GPIO2_BASE_ADDR); gpio_reset(GPIO3_BASE_ADDR);