diff --git a/modules/hal_nordic/nrfs/CMakeLists.txt b/modules/hal_nordic/nrfs/CMakeLists.txt index cf738fe5bf2..d94c2da32a8 100644 --- a/modules/hal_nordic/nrfs/CMakeLists.txt +++ b/modules/hal_nordic/nrfs/CMakeLists.txt @@ -22,6 +22,7 @@ if(CONFIG_NRFS) zephyr_library_sources(${HELPERS_DIR}/dvfs_oppoint.c) if(CONFIG_NRFS_LOCAL_DOMAIN) + zephyr_library_sources_ifdef(CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_audiopll.c) zephyr_library_sources_ifdef(CONFIG_NRFS_CLOCK_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_clock.c) zephyr_library_sources_ifdef(CONFIG_NRFS_DIAG_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_diag.c) zephyr_library_sources_ifdef(CONFIG_NRFS_DVFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_dvfs.c) diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig index 0684ec222be..f5d4e92f94d 100644 --- a/modules/hal_nordic/nrfs/Kconfig +++ b/modules/hal_nordic/nrfs/Kconfig @@ -7,6 +7,9 @@ config HAS_NRFS menu "nRF Services" depends on HAS_NRFS +config NRFS_HAS_AUDIOPLL_SERVICE + bool + config NRFS_HAS_CLOCK_SERVICE bool @@ -133,6 +136,11 @@ config NRFS_SWEXT_SERVICE_ENABLED depends on NRFS_HAS_SWEXT_SERVICE default y +config NRFS_AUDIOPLL_SERVICE_ENABLED + bool "Audio PLL service" + depends on NRFS_HAS_AUDIOPLL_SERVICE + default y if SOC_NRF54H20_CPUAPP + endmenu rsource "backends/Kconfig" diff --git a/modules/hal_nordic/nrfs/nrfs_config.h b/modules/hal_nordic/nrfs/nrfs_config.h index da3cc1ada1b..9d1a9b7b6b3 100644 --- a/modules/hal_nordic/nrfs/nrfs_config.h +++ b/modules/hal_nordic/nrfs/nrfs_config.h @@ -56,6 +56,10 @@ #define NRFS_SWEXT_SERVICE_ENABLED #endif +#ifdef CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED +#define NRFS_AUDIOPLL_SERVICE_ENABLED +#endif + #ifdef CONFIG_SOC_POSIX #define NRFS_UNIT_TESTS_ENABLED #endif diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig index fa4ca5eb9bc..842e0e33807 100644 --- a/soc/nordic/nrf54h/Kconfig +++ b/soc/nordic/nrf54h/Kconfig @@ -23,6 +23,7 @@ config SOC_NRF54H20_CPUAPP_COMMON select HAS_NORDIC_DMM select HAS_NORDIC_RAM_CTRL select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE + select NRFS_HAS_AUDIOPLL_SERVICE select NRFS_HAS_CLOCK_SERVICE select NRFS_HAS_DVFS_SERVICE select NRFS_HAS_GDFS_SERVICE @@ -49,6 +50,7 @@ config SOC_NRF54H20_CPURAD_COMMON select CPU_HAS_FPU select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE + select NRFS_HAS_AUDIOPLL_SERVICE select NRFS_HAS_CLOCK_SERVICE select NRFS_HAS_GDFS_SERVICE select NRFS_HAS_GDPWR_SERVICE diff --git a/west.yml b/west.yml index 1a1c565d27e..c4af3fb25c3 100644 --- a/west.yml +++ b/west.yml @@ -193,7 +193,7 @@ manifest: groups: - hal - name: hal_nordic - revision: 35bf3ca665122ddfe8c0c38cec8f19deef2ff62d + revision: 7440d573d36953b80cb6fb6438b147acb21bf753 path: modules/hal/nordic groups: - hal