diff --git a/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi b/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi index b776f2380d3..31292bdf728 100644 --- a/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi +++ b/boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi @@ -83,6 +83,10 @@ * replace &os_timer with &systick */ &os_timer { + status = "disabled"; +}; + +&systick { status = "okay"; }; diff --git a/drivers/timer/Kconfig.mcux_lptmr b/drivers/timer/Kconfig.mcux_lptmr index 6182611f744..851c49ebbfb 100644 --- a/drivers/timer/Kconfig.mcux_lptmr +++ b/drivers/timer/Kconfig.mcux_lptmr @@ -9,7 +9,6 @@ config MCUX_LPTMR_TIMER depends on DT_HAS_NXP_KINETIS_LPTMR_ENABLED || \ MCUX_KINETIS_LPTMR depends on !COUNTER_MCUX_LPTMR - depends on PM select SYSTEM_TIMER_HAS_DISABLE_SUPPORT help This module implements a kernel device driver for the NXP MCUX Low diff --git a/soc/nxp/mcx/mcxnx4x/Kconfig.defconfig b/soc/nxp/mcx/mcxnx4x/Kconfig.defconfig index d5ef60d2578..cf464656374 100644 --- a/soc/nxp/mcx/mcxnx4x/Kconfig.defconfig +++ b/soc/nxp/mcx/mcxnx4x/Kconfig.defconfig @@ -12,18 +12,12 @@ config ROM_START_OFFSET config ZTEST_NO_YIELD default y if (PM && ZTEST) -if MCUX_OS_TIMER +config MCUX_LPTMR_TIMER + default n if (DT_HAS_NXP_OS_TIMER_ENABLED || DT_HAS_ARM_ARMV8M_SYSTICK_ENABLED) config SYS_CLOCK_HW_CYCLES_PER_SEC - default 1000000 - -endif # MCUX_OS_TIMER - -if CORTEX_M_SYSTICK - -config SYS_CLOCK_HW_CYCLES_PER_SEC - default 150000000 - -endif # CORTEX_M_SYSTICK + default 1000000 if MCUX_OS_TIMER + default 16000 if MCUX_LPTMR_TIMER + default 150000000 if CORTEX_M_SYSTICK endif # SOC_SERIES_MCXNX4X