Skip to content

Commit 4ba36f2

Browse files
lstnlrlubos
authored andcommitted
[nrf fromtree] nrfs: added audiopll service
Added configuration for new audio PLL service. Pull in new service implementation in new hal nordic. Signed-off-by: Łukasz Stępnicki <lukasz.stepnicki@nordicsemi.no> (cherry picked from commit 2bac5eec848d9479cb0ab17e36444f7ddf89e617)
1 parent e109db3 commit 4ba36f2

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

modules/hal_nordic/nrfs/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ if(CONFIG_NRFS)
2222
zephyr_library_sources(${HELPERS_DIR}/dvfs_oppoint.c)
2323

2424
if(CONFIG_NRFS_LOCAL_DOMAIN)
25+
zephyr_library_sources_ifdef(CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_audiopll.c)
2526
zephyr_library_sources_ifdef(CONFIG_NRFS_CLOCK_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_clock.c)
2627
zephyr_library_sources_ifdef(CONFIG_NRFS_DIAG_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_diag.c)
2728
zephyr_library_sources_ifdef(CONFIG_NRFS_DVFS_SERVICE_ENABLED ${SRC_DIR}/services/nrfs_dvfs.c)

modules/hal_nordic/nrfs/Kconfig

+8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ config HAS_NRFS
77
menu "nRF Services"
88
depends on HAS_NRFS
99

10+
config NRFS_HAS_AUDIOPLL_SERVICE
11+
bool
12+
1013
config NRFS_HAS_CLOCK_SERVICE
1114
bool
1215

@@ -133,6 +136,11 @@ config NRFS_SWEXT_SERVICE_ENABLED
133136
depends on NRFS_HAS_SWEXT_SERVICE
134137
default y
135138

139+
config NRFS_AUDIOPLL_SERVICE_ENABLED
140+
bool "Audio PLL service"
141+
depends on NRFS_HAS_AUDIOPLL_SERVICE
142+
default y if SOC_NRF54H20_CPUAPP
143+
136144
endmenu
137145

138146
rsource "backends/Kconfig"

modules/hal_nordic/nrfs/nrfs_config.h

+4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
#define NRFS_SWEXT_SERVICE_ENABLED
5757
#endif
5858

59+
#ifdef CONFIG_NRFS_AUDIOPLL_SERVICE_ENABLED
60+
#define NRFS_AUDIOPLL_SERVICE_ENABLED
61+
#endif
62+
5963
#ifdef CONFIG_SOC_POSIX
6064
#define NRFS_UNIT_TESTS_ENABLED
6165
#endif

soc/nordic/nrf54h/Kconfig

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
2323
select HAS_NORDIC_DMM
2424
select HAS_NORDIC_RAM_CTRL
2525
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
26+
select NRFS_HAS_AUDIOPLL_SERVICE
2627
select NRFS_HAS_CLOCK_SERVICE
2728
select NRFS_HAS_DVFS_SERVICE
2829
select NRFS_HAS_GDFS_SERVICE
@@ -49,6 +50,7 @@ config SOC_NRF54H20_CPURAD_COMMON
4950
select CPU_HAS_FPU
5051
select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
5152
select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
53+
select NRFS_HAS_AUDIOPLL_SERVICE
5254
select NRFS_HAS_CLOCK_SERVICE
5355
select NRFS_HAS_GDFS_SERVICE
5456
select NRFS_HAS_GDPWR_SERVICE

west.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ manifest:
193193
groups:
194194
- hal
195195
- name: hal_nordic
196-
revision: 35bf3ca665122ddfe8c0c38cec8f19deef2ff62d
196+
revision: 7440d573d36953b80cb6fb6438b147acb21bf753
197197
path: modules/hal/nordic
198198
groups:
199199
- hal

0 commit comments

Comments
 (0)