From eae316ebc9ffad98b93291ebaca71a15e74fed1d Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Fri, 24 May 2024 12:19:15 -0500 Subject: [PATCH] dts: bindings: Rename nxp,kinetis-lptmr compat Rename nxp,kinetis-lptmr compat to nxp,lptmr. Because of concerns over breaking downstream users, keep support for the old compatible temporarily and make it clear it should be changed. Signed-off-by: Declan Snyder --- drivers/counter/Kconfig.mcux_lptmr | 13 ++++++++++++- drivers/counter/counter_mcux_lptmr.c | 5 +++++ dts/bindings/counter/nxp,kinetis-lptmr.yaml | 8 ++++++++ .../nxp,lptmr.yaml} | 4 ++-- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 dts/bindings/counter/nxp,kinetis-lptmr.yaml rename dts/bindings/{rtc/nxp,kinetis-lptmr.yaml => counter/nxp,lptmr.yaml} (89%) diff --git a/drivers/counter/Kconfig.mcux_lptmr b/drivers/counter/Kconfig.mcux_lptmr index 98bf35dec5c..d6847a3ffbb 100644 --- a/drivers/counter/Kconfig.mcux_lptmr +++ b/drivers/counter/Kconfig.mcux_lptmr @@ -6,6 +6,17 @@ config COUNTER_MCUX_LPTMR bool "MCUX LPTMR driver" default y - depends on DT_HAS_NXP_KINETIS_LPTMR_ENABLED + depends on DT_HAS_NXP_LPTMR_ENABLED || \ + COUNTER_MCUX_KINETIS_LPTMR help Enable support for the MCUX Low Power Timer (LPTMR). + +config COUNTER_MCUX_KINETIS_LPTMR + bool "Deprecated DT compatible" + default y + depends on DT_HAS_NXP_KINETIS_LPTMR_ENABLED + select DEPRECATED + help + The compatible string "nxp,kinetis-lptmr" should + be swiched to "nxp,lptmr" in DT. The former will + be removed eventually. diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c index 4e1007d9b49..c24e60a2e06 100644 --- a/drivers/counter/counter_mcux_lptmr.c +++ b/drivers/counter/counter_mcux_lptmr.c @@ -4,7 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include +#if DT_HAS_COMPAT_STATUS_OKAY(nxp_kinetis_lptmr) #define DT_DRV_COMPAT nxp_kinetis_lptmr +#else +#define DT_DRV_COMPAT nxp_lptmr +#endif #include #include diff --git a/dts/bindings/counter/nxp,kinetis-lptmr.yaml b/dts/bindings/counter/nxp,kinetis-lptmr.yaml new file mode 100644 index 00000000000..0188b103b1c --- /dev/null +++ b/dts/bindings/counter/nxp,kinetis-lptmr.yaml @@ -0,0 +1,8 @@ +# Copyright 2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +description: Deprecated compatible for NXP LPTMR + +compatible: "nxp,kinetis-lptmr" + +include: nxp,lptmr.yaml diff --git a/dts/bindings/rtc/nxp,kinetis-lptmr.yaml b/dts/bindings/counter/nxp,lptmr.yaml similarity index 89% rename from dts/bindings/rtc/nxp,kinetis-lptmr.yaml rename to dts/bindings/counter/nxp,lptmr.yaml index f16451fc0a3..13e38d76302 100644 --- a/dts/bindings/rtc/nxp,kinetis-lptmr.yaml +++ b/dts/bindings/counter/nxp,lptmr.yaml @@ -1,9 +1,9 @@ # Copyright (c) 2020 Vestas Wind Systems A/S # SPDX-License-Identifier: Apache-2.0 -description: Kinetis LPTMR +description: NXP LPTMR -compatible: "nxp,kinetis-lptmr" +compatible: "nxp,lptmr" include: rtc.yaml