diff --git a/drivers/watchdog/Kconfig.mcux b/drivers/watchdog/Kconfig.mcux index c4b5a4d7fdd..32ccd4c7822 100644 --- a/drivers/watchdog/Kconfig.mcux +++ b/drivers/watchdog/Kconfig.mcux @@ -14,7 +14,7 @@ config WDT_MCUX_WDOG config WDT_MCUX_WDOG32 bool "MCUX WDOG32 driver" default y - depends on DT_HAS_NXP_KINETIS_WDOG32_ENABLED + depends on DT_HAS_NXP_WDOG32_ENABLED depends on CLOCK_CONTROL help Enable the mcux wdog32 driver. diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c index ed710ddc188..d38fe0e122e 100644 --- a/drivers/watchdog/wdt_mcux_wdog32.c +++ b/drivers/watchdog/wdt_mcux_wdog32.c @@ -7,7 +7,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define DT_DRV_COMPAT nxp_kinetis_wdog32 +#define DT_DRV_COMPAT nxp_wdog32 #include #include diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi index e43ce594278..a87c07a5f63 100644 --- a/dts/arm/nxp/nxp_ke1xf.dtsi +++ b/dts/arm/nxp/nxp_ke1xf.dtsi @@ -295,7 +295,7 @@ }; wdog: watchdog@40052000 { - compatible = "nxp,kinetis-wdog32"; + compatible = "nxp,wdog32"; reg = <0x40052000 0x1000>; interrupts = <22 0>; clocks = <&lpo>; diff --git a/dts/arm/nxp/nxp_ke1xz.dtsi b/dts/arm/nxp/nxp_ke1xz.dtsi index 7c40a9adbc2..483125065e7 100644 --- a/dts/arm/nxp/nxp_ke1xz.dtsi +++ b/dts/arm/nxp/nxp_ke1xz.dtsi @@ -227,7 +227,7 @@ }; wdog: watchdog@40052000 { - compatible = "nxp,kinetis-wdog32"; + compatible = "nxp,wdog32"; reg = <0x40052000 0x1000>; interrupts = <28 0>; clocks = <&lpo>; diff --git a/dts/arm/nxp/nxp_mcxw71.dtsi b/dts/arm/nxp/nxp_mcxw71.dtsi index 43def8935ae..a128d4925e4 100644 --- a/dts/arm/nxp/nxp_mcxw71.dtsi +++ b/dts/arm/nxp/nxp_mcxw71.dtsi @@ -264,7 +264,7 @@ }; wdog0: watchdog@1a000 { - compatible = "nxp,kinetis-wdog32"; + compatible = "nxp,wdog32"; reg = <0x1a000 16>; interrupts = <23 0>; clocks = <&scg SCG_K4_SYSOSC_CLK 0x68>; @@ -274,7 +274,7 @@ }; wdog1: watchdog@1b000 { - compatible = "nxp,kinetis-wdog32"; + compatible = "nxp,wdog32"; reg = <0x1b000 16>; interrupts = <24 0>; clocks = <&scg SCG_K4_SYSOSC_CLK 0x6c>; diff --git a/dts/arm/nxp/nxp_s32k1xx.dtsi b/dts/arm/nxp/nxp_s32k1xx.dtsi index 8668b3aed20..bc0cbd0720f 100644 --- a/dts/arm/nxp/nxp_s32k1xx.dtsi +++ b/dts/arm/nxp/nxp_s32k1xx.dtsi @@ -129,7 +129,7 @@ }; wdog: watchdog@40052000 { - compatible = "nxp,kinetis-wdog32"; + compatible = "nxp,wdog32"; reg = <0x40052000 0x1000>; interrupts = <22 0>; clocks = <&clock NXP_S32_LPO_128K_CLK>; diff --git a/dts/bindings/watchdog/nxp,kinetis-wdog32.yaml b/dts/bindings/watchdog/nxp,wdog32.yaml similarity index 84% rename from dts/bindings/watchdog/nxp,kinetis-wdog32.yaml rename to dts/bindings/watchdog/nxp,wdog32.yaml index a28f54f8bad..8599162e897 100644 --- a/dts/bindings/watchdog/nxp,kinetis-wdog32.yaml +++ b/dts/bindings/watchdog/nxp,wdog32.yaml @@ -1,9 +1,9 @@ # Copyright (c) 2019 Vestas Wind Systems A/S # SPDX-License-Identifier: Apache-2.0 -description: Kinetis watchdog (WDOG32) +description: NXP watchdog (WDOG32) -compatible: "nxp,kinetis-wdog32" +compatible: "nxp,wdog32" include: base.yaml diff --git a/samples/subsys/task_wdt/src/main.c b/samples/subsys/task_wdt/src/main.c index a366b3683eb..6b5202fee61 100644 --- a/samples/subsys/task_wdt/src/main.c +++ b/samples/subsys/task_wdt/src/main.c @@ -33,8 +33,8 @@ #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(espressif_esp32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(silabs_gecko_wdog) #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(silabs_gecko_wdog) -#elif DT_HAS_COMPAT_STATUS_OKAY(nxp_kinetis_wdog32) -#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nxp_kinetis_wdog32) +#elif DT_HAS_COMPAT_STATUS_OKAY(nxp_wdog32) +#define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nxp_wdog32) #elif DT_HAS_COMPAT_STATUS_OKAY(microchip_xec_watchdog) #define WDT_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(microchip_xec_watchdog) #else diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c index 353d189db54..a78e9600a42 100644 --- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c +++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c @@ -82,8 +82,8 @@ #define WDT_NODE DT_INST(0, espressif_esp32_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(silabs_gecko_wdog) #define WDT_NODE DT_INST(0, silabs_gecko_wdog) -#elif DT_HAS_COMPAT_STATUS_OKAY(nxp_kinetis_wdog32) -#define WDT_NODE DT_INST(0, nxp_kinetis_wdog32) +#elif DT_HAS_COMPAT_STATUS_OKAY(nxp_wdog32) +#define WDT_NODE DT_INST(0, nxp_wdog32) #elif DT_HAS_COMPAT_STATUS_OKAY(microchip_xec_watchdog) #define WDT_NODE DT_INST(0, microchip_xec_watchdog) #elif DT_HAS_COMPAT_STATUS_OKAY(nuvoton_npcx_watchdog)