michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: mr_canhubk3: enable SWT watchdog

Browse source 
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 <manuel.arguelles@nxp.com>
This commit is contained in:
Manuel Argüelles 2024-07-18 09:19:38 +07:00 • committed by David Leach
commit 832261dbe5
7 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/nxp/mr_canhubk3/doc/index.rst
View file

@ -56,6 +56,7 @@ LPI2C on-chip i2c
ADC SAR on-chip adc ADC SAR on-chip adc
LPSPI on-chip spi LPSPI on-chip spi
WDT FS26 SBC watchdog WDT FS26 SBC watchdog
SWT on-chip watchdog
EMAC on-chip ethernet EMAC on-chip ethernet
mdio mdio
eMIOS on-chip pwm eMIOS on-chip pwm

2
boards/nxp/mr_canhubk3/mr_canhubk3.dts
View file

@ -37,7 +37,7 @@
led2 = &user_led1_blue; led2 = &user_led1_blue;
sw0 = &user_button_1; sw0 = &user_button_1;
sw1 = &user_button_2; sw1 = &user_button_2;
watchdog0 = &fs26_wdt; watchdog0 = &swt0;
/* For pwm test suites */ /* For pwm test suites */
pwm-0 = &emios0_pwm; pwm-0 = &emios0_pwm;
pwm-1 = &flexio0_pwm; pwm-1 = &flexio0_pwm;

11
dts/arm/nxp/nxp_s32k344_m7.dtsi
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2023 NXP * Copyright 2023-2024 NXP
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -874,6 +874,15 @@
func-reset-threshold = <0>; func-reset-threshold = <0>;
dest-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";
};
}; };
}; };

15
samples/subsys/task_wdt/boards/mr_canhubk3.overlay
View file

@ -1,15 +0,0 @@
/*
* Copyright 2023 NXP
*
* SPDX-License-Identifier: Apache-2.0
*/
/*
* FS26 watchdog cannot be used as hardware watchdog fallback on this SoC, since
* the SPI driver being used to communicate with the device, cannot transceive
* from interrupt context. In order to run this sample, FS26 must be started in
* DEBUG mode (see board documentation).
*/
&fs26_wdt {
status = "disabled";
};

8
samples/subsys/task_wdt/prj_no_hw_fallback.conf
View file

@ -1,8 +0,0 @@
CONFIG_LOG=y
CONFIG_LOG_MODE_IMMEDIATE=y
CONFIG_WATCHDOG=n
CONFIG_TASK_WDT=y
CONFIG_THREAD_NAME=y

4
samples/subsys/task_wdt/sample.yaml
View file

@ -25,7 +25,3 @@ tests:
sample.task_wdt: sample.task_wdt:
integration_platforms: integration_platforms:
- nucleo_g474re - nucleo_g474re
sample.task_wdt.no_hw_fallback:
extra_args: CONF_FILE="prj_no_hw_fallback.conf"
platform_allow:
- mr_canhubk3

1
tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml
View file

@ -8,6 +8,7 @@ tests:
- s32z2xxdc2/s32z270/rtu1 - s32z2xxdc2/s32z270/rtu1
- s32z2xxdc2@D/s32z270/rtu0 - s32z2xxdc2@D/s32z270/rtu0
- s32z2xxdc2@D/s32z270/rtu1 - s32z2xxdc2@D/s32z270/rtu1
- mr_canhubk3
tags: tags:
- drivers - drivers
- watchdog - watchdog