boards: mr_canhubk3: enable SWT watchdog

Enable the Software Watchdog Timer instance on this board. Now that SWT is enabled for this board and made the default watchdog, sample.task_wdt.no_hw_fallback can be removed as is no longer needed. Signed-off-by: Manuel Argüelles <[email protected]>
zephyrproject-rtos · Aug 3, 2024 · 832261d · 832261d
1 parent b8928df
commit 832261d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 29 deletions.
diff --git a/boards/nxp/mr_canhubk3/doc/index.rst b/boards/nxp/mr_canhubk3/doc/index.rst
@@ -56,6 +56,7 @@ LPI2C         on-chip     i2c
 ADC SAR       on-chip     adc
 LPSPI         on-chip     spi
 WDT           FS26 SBC    watchdog
+SWT           on-chip     watchdog
 EMAC          on-chip     ethernet
                           mdio
 eMIOS         on-chip     pwm

diff --git a/boards/nxp/mr_canhubk3/mr_canhubk3.dts b/boards/nxp/mr_canhubk3/mr_canhubk3.dts
@@ -37,7 +37,7 @@
 		led2 = &user_led1_blue;
 		sw0 = &user_button_1;
 		sw1 = &user_button_2;
-		watchdog0 = &fs26_wdt;
+		watchdog0 = &swt0;
 		/* For pwm test suites */
 		pwm-0 = &emios0_pwm;
 		pwm-1 = &flexio0_pwm;

diff --git a/dts/arm/nxp/nxp_s32k344_m7.dtsi b/dts/arm/nxp/nxp_s32k344_m7.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 NXP
+ * Copyright 2023-2024 NXP
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -874,6 +874,15 @@
 			func-reset-threshold = <0>;
 			dest-reset-threshold = <0>;
 		};
+
+		swt0: watchdog@40270000 {
+			compatible = "nxp,s32-swt";
+			reg = <0x40270000 0x4000>;
+			interrupts = <42 0>;
+			clocks = <&clock NXP_S32_SIRC_CLK>;
+			service-mode = "fixed";
+			status = "okay";
+		};
 	};
 };
 

diff --git a/samples/subsys/task_wdt/boards/mr_canhubk3.overlay b/samples/subsys/task_wdt/boards/mr_canhubk3.overlay
diff --git a/samples/subsys/task_wdt/prj_no_hw_fallback.conf b/samples/subsys/task_wdt/prj_no_hw_fallback.conf
diff --git a/samples/subsys/task_wdt/sample.yaml b/samples/subsys/task_wdt/sample.yaml
@@ -25,7 +25,3 @@ tests:
   sample.task_wdt:
     integration_platforms:
       - nucleo_g474re
-  sample.task_wdt.no_hw_fallback:
-    extra_args: CONF_FILE="prj_no_hw_fallback.conf"
-    platform_allow:
-      - mr_canhubk3
diff --git a/tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml b/tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml
@@ -8,6 +8,7 @@ tests:
       - s32z2xxdc2/s32z270/rtu1
       - s32z2xxdc2@D/s32z270/rtu0
       - s32z2xxdc2@D/s32z270/rtu1
+      - mr_canhubk3
     tags:
       - drivers
       - watchdog