michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nrf: Rename "nordic,nrf-watchdog" compatible to "nordic,nrf-wdt"

Browse source 
For consistency with the scheme used for other nRF peripherals,
use the peripheral name that nRF Product Specifications use.
In this case, it is WDT, not WATCHDOG.

Also remove the requirement for the label property in the binding.
It is no longer needed.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2022-03-30 11:05:39 +02:00 • committed by Carles Cufí
commit bc26629ba8
15 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dts/arm/nordic/nrf51822.dtsi
View file

@ -211,7 +211,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf52805.dtsi
View file

@ -205,7 +205,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf52810.dtsi
View file

@ -201,7 +201,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf52811.dtsi
View file

@ -225,7 +225,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

4
dts/arm/nordic/nrf52820.dtsi
View file

@ -227,8 +227,8 @@
status = "okay"; status = "okay";
}; };
wdt0: wdt: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf52832.dtsi
View file

@ -244,7 +244,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf52833.dtsi
View file

@ -243,7 +243,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf52840.dtsi
View file

@ -238,7 +238,7 @@
}; };
wdt: wdt0: watchdog@40010000 { wdt: wdt0: watchdog@40010000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <16 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

4
dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
View file

@ -291,7 +291,7 @@ dppic: dppic@17000 {
}; };
wdt: wdt0: watchdog@18000 { wdt: wdt0: watchdog@18000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x18000 0x1000>; reg = <0x18000 0x1000>;
interrupts = <24 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <24 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";
@ -299,7 +299,7 @@ wdt: wdt0: watchdog@18000 {
}; };
wdt1: watchdog@19000 { wdt1: watchdog@19000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x19000 0x1000>; reg = <0x19000 0x1000>;
interrupts = <25 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <25 NRF_DEFAULT_IRQ_PRIORITY>;
status = "disabled"; status = "disabled";

2
dts/arm/nordic/nrf5340_cpunet.dtsi
View file

@ -93,7 +93,7 @@
}; };
wdt: wdt0: watchdog@4100b000 { wdt: wdt0: watchdog@4100b000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x4100b000 0x1000>; reg = <0x4100b000 0x1000>;
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

2
dts/arm/nordic/nrf9160_common.dtsi
View file

@ -364,7 +364,7 @@ power: power@5000 {
}; };
wdt: wdt0: watchdog@18000 { wdt: wdt0: watchdog@18000 {
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-wdt";
reg = <0x18000 0x1000>; reg = <0x18000 0x1000>;
interrupts = <24 NRF_DEFAULT_IRQ_PRIORITY>; interrupts = <24 NRF_DEFAULT_IRQ_PRIORITY>;
status = "okay"; status = "okay";

7
dts/bindings/watchdog/nordic,nrf-watchdog.yaml → dts/bindings/watchdog/nordic,nrf-wdt.yaml
View file

@ -1,9 +1,9 @@
# Copyright (c) 2018, Nordic Semiconductor ASA # Copyright (c) 2018, Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
description: Nordic Semiconductor nRF watchdog description: Nordic nRF family WDT (Watchdog Timer)
compatible: "nordic,nrf-watchdog" compatible: "nordic,nrf-wdt"
include: base.yaml include: base.yaml
@ -11,8 +11,5 @@ properties:
reg: reg:
required: true required: true
label:
required: true
interrupts: interrupts:
required: true required: true

4
samples/drivers/watchdog/src/main.c
View file

@ -26,13 +26,13 @@
#define WDT_MAX_WINDOW 100U #define WDT_MAX_WINDOW 100U
#elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_watchdog)
#define WDT_NODE DT_INST(0, st_stm32_watchdog) #define WDT_NODE DT_INST(0, st_stm32_watchdog)
#elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_wdt)
/* Nordic supports a callback, but it has 61.2 us to complete before /* Nordic supports a callback, but it has 61.2 us to complete before
* the reset occurs, which is too short for this sample to do anything * the reset occurs, which is too short for this sample to do anything
* useful. Explicitly disallow use of the callback. * useful. Explicitly disallow use of the callback.
*/ */
#define WDT_ALLOW_CALLBACK 0 #define WDT_ALLOW_CALLBACK 0
#define WDT_NODE DT_INST(0, nordic_nrf_watchdog) #define WDT_NODE DT_INST(0, nordic_nrf_wdt)
#elif DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_watchdog)
#define WDT_NODE DT_INST(0, espressif_esp32_watchdog) #define WDT_NODE DT_INST(0, espressif_esp32_watchdog)
#elif DT_HAS_COMPAT_STATUS_OKAY(silabs_gecko_wdog) #elif DT_HAS_COMPAT_STATUS_OKAY(silabs_gecko_wdog)

4
samples/subsys/task_wdt/src/main.c
View file

@ -27,8 +27,8 @@
#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(st_stm32_window_watchdog) #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(st_stm32_window_watchdog)
#elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_watchdog)
#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(st_stm32_watchdog) #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(st_stm32_watchdog)
#elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_wdt)
#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_nrf_watchdog) #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_nrf_wdt)
#elif DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_watchdog)
#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(espressif_esp32_watchdog) #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(espressif_esp32_watchdog)
#elif DT_HAS_COMPAT_STATUS_OKAY(silabs_gecko_wdog) #elif DT_HAS_COMPAT_STATUS_OKAY(silabs_gecko_wdog)

4
tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c
View file

@ -76,8 +76,8 @@
#elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_watchdog)
#define WDT_NODE DT_INST(0, st_stm32_watchdog) #define WDT_NODE DT_INST(0, st_stm32_watchdog)
#define TIMEOUTS 0 #define TIMEOUTS 0
#elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_wdt)
#define WDT_NODE DT_INST(0, nordic_nrf_watchdog) #define WDT_NODE DT_INST(0, nordic_nrf_wdt)
#define TIMEOUTS 2 #define TIMEOUTS 2
#elif DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(espressif_esp32_watchdog)
#define WDT_NODE DT_INST(0, espressif_esp32_watchdog) #define WDT_NODE DT_INST(0, espressif_esp32_watchdog)