]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arm: imx9: Keep WDG3/WDG4 untouched for i.MX952
authorAlice Guo <alice.guo@nxp.com>
Mon, 2 Mar 2026 05:20:10 +0000 (13:20 +0800)
committerFabio Estevam <festevam@gmail.com>
Mon, 16 Mar 2026 21:44:00 +0000 (18:44 -0300)
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 <alice.guo@nxp.com>
arch/arm/mach-imx/imx9/scmi/soc.c

index d426206215da77776e5ce0a26758792af1566c08..fbee435786cd69ae68ffc3a9018c6b7610265d95 100644 (file)
@@ -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);