Skip to content

Commit 5f010e5

Browse files
committed
[nrf fromlist] drivers: clock_control: Separated nrf hfclkaudio shim from nrf clock shim.
Separated clock_control_nrf_hfclkaudio shim from clock_control_nrf shim. Upstream PR #: 99290 Signed-off-by: Michal Frankiewicz <[email protected]>
1 parent 10559af commit 5f010e5

File tree

18 files changed

+431
-23
lines changed

18 files changed

+431
-23
lines changed

drivers/audio/dmic_nrfx_pdm.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ BUILD_ASSERT((DMIC_NRFX_AUDIO_CLOCK_FREQ == NRF_AUXPLL_FREQ_DIV_AUDIO_48K) ||
3232
#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
3333
#else
3434
#define DMIC_NRFX_CLOCK_FREQ MHZ(32)
35-
#define DMIC_NRFX_AUDIO_CLOCK_FREQ DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
36-
DT_PROP_OR(DT_NODELABEL(clock), hfclkaudio_frequency, 0))
35+
#define DMIC_NRFX_AUDIO_CLOCK_FREQ \
36+
DT_PROP_OR(DT_NODELABEL(aclk), clock_frequency, \
37+
DT_PROP_OR(DT_NODELABEL(hfclkaudio), hfclkaudio_frequency, 0))
3738
#endif
3839

3940
struct dmic_nrfx_pdm_drv_data {
@@ -537,13 +538,13 @@ static const struct _dmic_ops dmic_ops = {
537538
BUILD_ASSERT(PDM_CLK_SRC(inst) != ACLK || NRF_PDM_HAS_SELECTABLE_CLOCK, \
538539
"Clock source ACLK is not available."); \
539540
BUILD_ASSERT(PDM_CLK_SRC(inst) != ACLK || \
540-
DT_NODE_HAS_PROP(DT_NODELABEL(clock), hfclkaudio_frequency) || \
541+
DT_NODE_HAS_PROP(DT_NODELABEL(hfclkaudio), hfclkaudio_frequency) || \
541542
DT_NODE_HAS_PROP(DT_NODELABEL(aclk), clock_frequency) || \
542543
DT_NODE_HAS_PROP(NODE_AUDIOPLL, frequency) || \
543544
DT_NODE_HAS_PROP(NODE_AUDIO_AUXPLL, nordic_frequency), \
544545
"Clock source ACLK requires one following defined frequency " \
545546
"properties: " \
546-
"hfclkaudio-frequency in the nordic,nrf-clock node, " \
547+
"hfclkaudio-frequency in the nordic,nrf-clock-hfclkaudio node, " \
547548
"clock-frequency in the aclk node, " \
548549
"frequency in the audiopll node, " \
549550
"nordic-frequency in the audio_auxpll node"); \

drivers/clock_control/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_HFCLK clock_cont
6464
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_XO clock_control_nrf_xo.c)
6565
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_LFCLK clock_control_nrf_lfclk.c)
6666
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_HFCLK192M clock_control_nrf_hfclk192m.c)
67+
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_XO24M clock_control_nrf_hfclkaudio.c)
6768
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_XO24M clock_control_nrf_xo24m.c)
6869
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NRF_COMMON clock_control_nrf_common.c)
6970
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BOUFFALOLAB_BL60X clock_control_bl60x.c)

drivers/clock_control/Kconfig.nrf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,12 @@ config CLOCK_CONTROL_NRF_HFCLK192M
350350
select CLOCK_CONTROL_NRF_COMMON
351351
default y
352352

353+
config CLOCK_CONTROL_NRF_HFCLKAUDIO
354+
bool "NRF HFCLKAUDIO driver support"
355+
depends on DT_HAS_NORDIC_NRF_CLOCK_HFCLKAUDIO_ENABLED
356+
select CLOCK_CONTROL_NRF_COMMON
357+
default y
358+
353359
config CLOCK_CONTROL_NRF_XO24M
354360
bool "NRF XO242M driver support"
355361
depends on DT_HAS_NORDIC_NRF_CLOCK_XO24M_ENABLED

0 commit comments

Comments
 (0)